Changeset 295

Timestamp:

Aug 3, 2011, 9:12:16 PM (13 years ago)

Author:

djay

Message:

Removing Py_DECREF frmo service_internal_python.c, should solve bug #29

File:

• trunk/zoo-kernel/service_internal_python.c (modified) (11 diffs)

trunk/zoo-kernel/service_internal_python.c

@@ -74 +74 @@
   free(pythonpath);
 
+  PyThreadState *mainstate;
+  PyEval_InitThreads();
   Py_Initialize();
+  mainstate = PyThreadState_Swap(NULL);
+  PyEval_ReleaseLock();
+  PyGILState_STATE gstate;
+  gstate = PyGILState_Ensure();
   PyObject *pName, *pModule, *pFunc;
   tmp=getMap(s->content,"serviceProvider");
@@ -119 +125 @@
         dumpMaps(outputs);
 #endif
-        Py_DECREF(arg1);
-        Py_DECREF(arg2);
-        Py_DECREF(arg3);
-        Py_DECREF(pArgs);
-        Py_DECREF(pValue);
-        Py_XDECREF(pFunc);
-        Py_DECREF(pModule);
       }else{      
         PyObject *ptype,*pvalue, *ptraceback;
@@ -159 +158 @@
         addToMap(err,"code","NoApplicableCode");
         printExceptionReportResponse(m,err);
-        Py_DECREF(arg1);
-        Py_DECREF(arg2);
-        Py_DECREF(arg3);
-        Py_XDECREF(pFunc);
-        Py_DECREF(pArgs);
-        Py_DECREF(pModule);
-        Py_DECREF(ptraceback);
-        Py_DECREF(ptype);
-        Py_DECREF(pValue);
-#if not(defined(macintosh)) && not(defined(__MACH__) && defined(__APPLE__))
-        Py_Finalize();
-#endif
-        exit(-1);
+        res=-1;
       }
     }
     else{
       char tmpS[1024];
-      sprintf(tmpS, "Cannot find the %s function int the %s file.\n", s->name, tmp->value);
+      sprintf(tmpS, "Cannot find the %s function in the %s file.\n", s->name, tmp->value);
       map* tmps=createMap("text",tmpS);
       printExceptionReportResponse(m,tmps);
-      Py_XDECREF(pFunc);
-      Py_DECREF(pModule);
-      exit(-1);
+      res=-1;
     }
   } else{
@@ -190 +175 @@
     if (PyErr_Occurred())
       PyErr_Print();
-    exit(-1);
+    PyErr_Clear();
+    res=-1;
+    //exit(-1);
   } 
-#if not(defined(macintosh)) && not(defined(__MACH__) && defined(__APPLE__))
+  PyGILState_Release(gstate);
+  PyEval_AcquireLock();
+  PyThreadState_Swap(mainstate);
   Py_Finalize();
-#endif
   return res;
 }
@@ -202 +190 @@
   maps* tmp=t;
   while(tmp!=NULL){
-    PyObject* subc=(PyObject*)PyDict_FromMap(tmp->content);
-    if(PyDict_SetItem(res,PyString_FromString(tmp->name),subc)<0){
-      fprintf(stderr,"Unable to parse params...");
-      exit(1);
-    }
-    Py_DECREF(subc);
+    PyObject* value=(PyObject*)PyDict_FromMap(tmp->content);
+    PyObject* name=PyString_FromString(tmp->name);
+    if(PyDict_SetItem(res,name,value)<0){
+      fprintf(stderr,"Unable to set map value ...");
+      return NULL;
+    }
+    Py_DECREF(name);
     tmp=tmp->next;
   }  
@@ -223 +212 @@
         PyObject* value=PyString_FromStringAndSize(tmp->value,atoi(size->value));
         if(PyDict_SetItem(res,name,value)<0){
-          fprintf(stderr,"Unable to parse params...");
-          Py_DECREF(value);
-          exit(1);
+          fprintf(stderr,"Unable to set key value pair...");
+          return NULL;
         }
-        Py_DECREF(value);
       }
       else{
         PyObject* value=PyString_FromString(tmp->value);
         if(PyDict_SetItem(res,name,value)<0){
-          fprintf(stderr,"Unable to parse params...");
-          Py_DECREF(value);
-          exit(1);
+          fprintf(stderr,"Unable to set key value pair...");
+          return NULL;
         }
-        Py_DECREF(value);
       }
     }
@@ -242 +227 @@
       PyObject* value=PyString_FromString(tmp->value);
       if(PyDict_SetItem(res,name,value)<0){
-        fprintf(stderr,"Unable to parse params...");
-        Py_DECREF(value);
-        exit(1);
-      }
-      Py_DECREF(value);
+        fprintf(stderr,"Unable to set key value pair...");
+        return NULL;
+      }
     }
     Py_DECREF(name);
@@ -272 +255 @@
     cursor=(maps*)malloc(MAPS_SIZE);
     cursor->name=PyString_AsString(key);
-#ifdef DEBUG
-    dumpMap(mapFromPyDict((PyDictObject*)value));
-#endif
     cursor->content=mapFromPyDict((PyDictObject*)value);
+#ifdef DEBUG
+    dumpMap(cursor->content);
+#endif
     cursor->next=NULL;
     if(res==NULL)
@@ -284 +267 @@
     free(cursor->content);
     free(cursor);
-    Py_DECREF(value);
-    Py_DECREF(key);
 #ifdef DEBUG
     dumpMaps(res);
@@ -291 +272 @@
 #endif
   }
-  Py_DECREF(list);
   return res;
 }
@@ -330 +310 @@
         res=createMap(PyString_AsString(key),PyString_AsString(value));
     }
-    Py_DECREF(key);
-  }
-  Py_DECREF(list);
+  }
   return res;
 }