Changeset 27 for trunk/src/fortran

Timestamp:

Jul 19, 2005, 6:55:32 PM (19 years ago)

Author:

dkearney

Message:

made a temporary fix to the fortran api which now sends the contents of the
xml file to the python rappture parser instead of the file name. before
with sending the filename, we were getting weird segfaults inside of python.
this new approach seems to solve the problem. maybe this change should be
moved to the c api and not the fortran api, because we require those using
the c api to send the contents of the file still, where the fortran api can
just send the file name.

dsk - 20050719

File:

• trunk/src/fortran/rappture_fortran.c (modified) (2 diffs)

trunk/src/fortran/rappture_fortran.c

@@ -320 +320 @@
     char* inFilePath = NULL;
 
+    long int fileLength = 0;
+    char* fileContents = NULL;
+    FILE* fp = NULL;
+
     if (!rapptureStarted) {
         rp_init();
@@ -333 +337 @@
 
     if (rpClass) {
+
+        fp = fopen(inFilePath,"rb");
+        if (fp) {
+            fseek(fp, 0, SEEK_END);
+            fileLength = ftell(fp);
+            rewind(fp);
+        }
+        fileContents = (char*) calloc(fileLength,sizeof(char));
+        fread((void*)fileContents,sizeof(char),fileLength,fp);
+
         // create a RapptureIO object and store in dictionary
-        lib = createRapptureObj(rpClass, inFilePath);
+        // lib = createRapptureObj(rpClass, inFilePath);
+        lib = createRapptureObj(rpClass, fileContents);
 
         if (lib) {