Changes in trunk/zoo-kernel/service_internal_js.c [26:9]

File:

• trunk/zoo-kernel/service_internal_js.c (modified) (6 diffs)

trunk/zoo-kernel/service_internal_js.c

@@ -23 +23 @@
  */
 
-#include "service_internal.h"
+#include "service_internal_js.h"
 
 static char dbg[1024];
@@ -74 +74 @@
   if (!JS_DefineFunction(cx, global, "ZOORequest", JSRequest, 4, 0))
     return 1;
-  if (!JS_DefineFunction(cx, global, "ZOOUpdateStatus", JSUpdateStatus, 2, 0))
-    return 1;
 
   /* Your application code here. This may include JSAPI calls
@@ -84 +82 @@
   map* tmpm1=getMap(request,"metapath");
   map* tmpm2=getMap(s->content,"serviceProvider");
+  char filename[strlen(tmpm1->value)+strlen(tmpm2->value)+6];
   char ntmp[1024];
   getcwd(ntmp,1024);
-  char filename[strlen(tmpm1->value)+strlen(tmpm2->value)+strlen(ntmp)+2];
   sprintf(filename,"%s/%s%s",ntmp,tmpm1->value,tmpm2->value);
-  filename[strlen(tmpm1->value)+strlen(tmpm2->value)+strlen(ntmp)+1]=0;
-  fprintf(stderr,"FILENAME %s\n",filename);
   struct stat file_status;
   stat(filename, &file_status);
@@ -207 +203 @@
 
   /* Cleanup. */
+  // The JS_MaybeGC call imply segmentation fault
+  //JS_MaybeGC(cx);
   JS_DestroyScript(cx, script);
-  JS_MaybeGC(cx);
   // If we use the DestroyContext as requested to release memory then we get 
   // issue getting back the main configuration maps after coming back to the 
@@ -390 +387 @@
 #endif
       if(res!=NULL){
-#ifdef JS_DEBUG
         fprintf(stderr,"%s - %s\n",JS_GetStringBytes(jsmsg),JS_GetStringBytes(jsmsg1));
-#endif
         addToMap(res,JS_GetStringBytes(jsmsg),JS_GetStringBytes(jsmsg1));
       }
@@ -399 +394 @@
         res->next=NULL;
       }
-#ifdef JS_DEBUG
       dumpMap(res);
-#endif
     }
   }