Changeset 47 for trunk

Timestamp:

Aug 22, 2005, 9:07:04 AM (19 years ago)

Author:

dkearney

Message:

fixed python interface memory problem with py_decref() where i was decreffing a python object before i was finished using it.
this is a fix for shaikh's dgfet code not printing large amounts of data to the run.xml file.

Location:

trunk

Files:

• include/cee/rappture_interface.h (modified) (1 diff)
• src/cee/rappture_interface.c (modified) (3 diffs)
• src/fortran/rappture_fortran.c (modified) (6 diffs)

trunk/include/cee/rappture_interface.h

@@ -26 +26 @@
 
 PyObject*   rpRemove    (PyObject* lib, const char* path);
-const char* rpXml       (PyObject* lib);
+char* rpXml       (PyObject* lib);
 
 /*

trunk/src/cee/rappture_interface.c

@@ -722 +722 @@
  *          NULL will be returned.
  *
- * Returns pointer (const char*) to the c style string representing the
+ * Returns pointer (char*) to the c style string representing the
  *          xml text of the Rappture object if successful, or 
  *          NULL if something goes wrong.
  *
- *          The return value's contents should not be changed because 
- *          it is a pointer being borrowed from python's buffer space
- *          (hence the _const_)
- */
-
-
-const char* rpXml(PyObject* lib)
+ *          return value no longer needs to be const because i copy it
+ *          to tmp space but it will need to be free'd now
+ */
+
+
+char* rpXml(PyObject* lib)
 {
     PyObject* mbr_fxn   = NULL;      /* pointer to fxn of class lib */
     PyObject* rslt      = NULL;      /* results from fxn call */
+    char* tmpretVal     = NULL;      /* return value */
     char* retVal        = NULL;      /* return value */
 
@@ -750 +750 @@
                 if (rslt) {
                     // convert the result to c style strings
-                    retVal = PyString_AsString(rslt);
+                    tmpretVal = PyString_AsString(rslt);
+                    retVal = (char*) calloc(strlen(tmpretVal),sizeof(char));
+                    strcpy(retVal,tmpretVal);
                     Py_DECREF(rslt);
                 }
@@ -762 +764 @@
     }
 
-    return (const char*) retVal;
+    return retVal;
     
 }

trunk/src/fortran/rappture_fortran.c

@@ -1176 +1176 @@
 {
     int length = -1;
-    const char* xmlText = NULL;
+    char* xmlText = NULL;
 
     PyObject* lib = NULL;
@@ -1190 +1190 @@
                 if (xmlText) {
                     length = strlen(xmlText) + 1;
+                    free(xmlText);
                     // printf("len = :%d:\n",length);
                 }
@@ -1203 +1204 @@
     int length_out = 0;
     int i = 0;
-    const char* xmlText = NULL;
+    char* xmlText = NULL;
 
     PyObject* lib = NULL;
@@ -1214 +1215 @@
                 xmlText = rpXml(lib);
                 
-                length_in = strlen(xmlText);
-                length_out = retText_len;
-
-                strncpy(retText, xmlText, length_out);
-
-                // fortran-ify the string
-                if (length_in < length_out) {
-                      for (i = length_in; i < length_out; i++) {
-                          retText[i] = ' ';
-                      }
+                if (xmlText) {
+                    length_in = strlen(xmlText);
+                    length_out = retText_len;
+
+                    strncpy(retText, xmlText, length_out);
+
+                    // fortran-ify the string
+                    if (length_in < length_out) {
+                          for (i = length_in; i < length_out; i++) {
+                              retText[i] = ' ';
+                          }
+                    }
+                    *(retText+length_out-1) = ' ';
+
+                    free(xmlText);
                 }
-                *(retText+length_out-1) = ' ';
+                
             }
         }
@@ -1233 +1239 @@
 int rp_lib_write_xml(int* handle, char* outFile, int outFile_len)
 {
-    int retVal = 0;
+    int retVal = -1;
     PyObject* lib = NULL;
     FILE* outFH = NULL;
     char* inOutFile = NULL;
-    const char* xmlText = NULL;
+    char* xmlText = NULL;
 
     inOutFile = null_terminate(outFile, outFile_len);
@@ -1251 +1257 @@
             if (lib) {
                 xmlText = rpXml(lib);
-                retVal = fputs(xmlText,outFH);
+                if (xmlText) {
+                    retVal = fputs(xmlText,outFH);
+                    free(xmlText);
+                }
             }
         }