Changeset 767 for trunk/zoo-project/zoo-kernel/service_internal_java.c

Timestamp:

Jun 9, 2016, 2:21:26 PM (9 years ago)

Author:

djay

Message:

Fix issue with headers located in extern C. Define java.library.path at runtime to search for libZOO.so from the Java zoo-api.

File:

• trunk/zoo-project/zoo-kernel/service_internal_java.c (modified) (8 diffs)

trunk/zoo-project/zoo-kernel/service_internal_java.c

@@ -40 +40 @@
   maps* inputs=*real_inputs;
   maps* outputs=*real_outputs;
-  char ntmp[1024];
-  getcwd(ntmp,1024);
+  map* cwdMap=getMapFromMaps(*main_conf,"lenv","cwd");
+  char *ntmp=NULL;
+  if(cwdMap!=NULL)
+    ntmp=zStrdup(cwdMap->value);
   map* tmp=getMap(request,"metapath");
   char *classpath;
@@ -80 +82 @@
   }
   sprintf(oclasspath,"-Djava.class.path=%s",classpath);
-
 #ifdef DEBUG
   fprintf(stderr,"CLASSPATH=%s\n",classpath);
   fprintf(stderr,"(%s)\n",oclasspath);
 #endif
+#ifndef USE_JDB
+  int njdb=0;
+#else
+  int njdb=2;
+#endif
 #ifndef WIN32
-  int nb=1;
+  int nb=3+njdb;
 #endif
   int nbc0=0;
@@ -125 +131 @@
   options[0].optionString = oclasspath;
   options[0].extraInfo=NULL;
+  options[1].optionString = "-server";
+  options[1].extraInfo=NULL;
+  char tmp1[100];
+  sprintf(tmp1,"-Djava.library.path=%s",cwdMap->value);
+  fprintf(stderr,"%s\n",tmp1);
+  options[2].optionString = tmp1;
+  options[2].extraInfo=NULL;
+#ifdef USE_JDB
+  options[3].optionString = "-Xdebug";
+  options[3].extraInfo=NULL;
+  options[4].optionString = "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=7896";
+  options[4].extraInfo=NULL;
+#endif
 #ifdef WIN32
   start=2;
   options[1].optionString = "-Xmx512m";
 #else
-  start=1;
+  start=3+njdb;
 #endif
   for(i=0;i<nbc0;i++){
@@ -164 +183 @@
   tmp=getMap(s->content,"serviceProvider");
 #ifdef JAVA7
-  cls = env->FindClass(tmp->value);
-  cls_gr = env->NewGlobalRef(cls);
+  cls = (*env).FindClass(tmp->value);
 #else
   cls = (*env)->FindClass(env,tmp->value);
-  cls_gr = (*env)->NewGlobalRef(env, cls);
 #endif
   if( cls == NULL ) {
@@ -183 +200 @@
     fprintf(stderr,"%s loaded\n",tmp->value);
   }
+#endif
+#ifdef JAVA7
+  cls_gr = (*env)NewGlobalRef(cls);
+#else
+  cls_gr = (*env)->NewGlobalRef(env, cls);
 #endif
 
@@ -246 +268 @@
       displayStack(env,*main_conf);
 #ifdef JAVA7
+      (*env).ExceptionDescribe();
       (*jvm).DestroyJavaVM();
 #else
@@ -324 +347 @@
   if(strncasecmp(m->value,"minus",5)==0)
     sprintf(res,"-XX:-%s",m->name);
-  else if(strncasecmp(m->value,"plus",5)==0)
+  else if(strncasecmp(m->value,"plus",4)==0)
     sprintf(res,"-XX:+%s",m->name);
   else
@@ -393 +416 @@
               jbyteArray tmpData=(*env).NewByteArray(atoi(sizeV->value));
               (*env).SetByteArrayRegion(tmpData,0,atoi(sizeV->value),(const jbyte *)tmp1->value);
-              (*env).CallObjectMethod(scObject1, put_mid, (*env).NewStringUTF(tmp1->name), tmpData);
+              (*env).CallObjectMethod(env,scObject1, put_mid, (*env).NewStringUTF(env,tmp1->name), tmpData);
 #else
               jbyteArray tmpData=(*env)->NewByteArray(env,atoi(sizeV->value));
-              (*env)->SetByteArrayRegion(env,tmpData,0,atoi(sizeV->value),tmp1->value);
+              (*env)->SetByteArrayRegion(env,tmpData,0,atoi(sizeV->value),(jbyte*) tmp1->value);
               (*env)->CallObjectMethod(env,scObject1, put_mid, (*env)->NewStringUTF(env,tmp1->name), tmpData);
 #endif