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

Timestamp:

Nov 17, 2014, 3:35:53 PM (9 years ago)

Author:

djay

Message:

Fix yaml service naming. Add javax javaxx optional sections in the main.cfg #105.

File:

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

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

@@ -51 +51 @@
       sprintf(classpath,"%s/%s/",ntmp,tmp->value);
     }
-    sprintf(oclasspath,"-Djava.class.path=%s",classpath);
   }else{
     if(cclasspath!=NULL){
@@ -67 +66 @@
       sprintf(classpath,"%s/",ntmp);
     }
-    sprintf(oclasspath,"-Djava.class.path=%s",classpath);
 
   }
@@ -77 +75 @@
 #endif
 
+  int nb=1;
+  int nbc0=0;
+  maps* javaXXMap=getMaps(main_conf,"javaxx");
+  if(javaXXMap!=NULL){
+    nbc0+=count(javaXXMap->content);
+  }
+  int nbc1=0;
+  maps* javaXMap=getMaps(main_conf,"javax");
+  if(javaXMap!=NULL){
+    nbc1+=count(javaXMap->content);
+  }
 #ifdef WIN32
-  JavaVMOption options[2];
-#else
-  JavaVMOption options[1];
+  nb=2+nbc0+nbc1;
+  JavaVMOption options[nb];
+#else
+  JavaVMOption options[nb+nbc0+nbc1];
 #endif
   JavaVMInitArgs vm_args;
@@ -95 +105 @@
   jclass cls_gr;
 #endif
-  int i;
-
+  int i,start;
+  map *cursorxx=NULL;
+  if(javaXXMap!=NULL)
+    cursorxx=javaXXMap->content;
+  map *cursorx=NULL;
+  if(javaXMap!=NULL)
+    cursorx=javaXMap->content;
   options[0].optionString = oclasspath;
 #ifdef WIN32
+  start=2;
   options[1].optionString = "-Xmx512m";
-  /*options[2].optionString = "-Xms128m";
-  options[3].optionString = "-XX:MaxPermSize=256m";
-  options[4].optionString = "-XX:MaxHeapFreeRatio=70";*/
-#endif
+#else
+  start=1;
+#endif
+  for(i=0;i<nbc0;i++){
+    char *tmp=parseJVMXXOption(cursorxx);
+    options[start+i].optionString = tmp;
+    free(tmp);
+    cursorxx=cursorxx->next;
+  }
+  for(;i<nbc1+nbc0;i++){
+    char *tmp=parseJVMXOption(cursorx);
+    options[start+i].optionString = tmp;
+    free(tmp);
+    cursorx=cursorx->next;
+  }
 
   JNI_GetDefaultJavaVMInitArgs(&vm_args);
   vm_args.version = JNI_VERSION_1_6;
   vm_args.options = options;
-#ifdef WIN32
-  vm_args.nOptions = 2;
-#else
-  vm_args.nOptions = 1;
-#endif
+  vm_args.nOptions = start+nbc0+nbc1;
   vm_args.ignoreUnrecognized = JNI_TRUE;
 
@@ -264 +287 @@
 }
 
+char *parseJVMXXOption(map* m){
+  char *res=(char*)malloc((strlen(m->name)+strlen(m->value)+5)*sizeof(char));
+  if(strncasecmp(m->value,"minus",5)==0)
+    sprintf(res,"-XX:-%s",m->name);
+  else if(strncasecmp(m->value,"plus",5)==0)
+    sprintf(res,"-XX:+%s",m->name);
+  else
+    sprintf(res,"-XX:%s=%s",m->name,m->value);
+  return res;
+}
+
+char *parseJVMXOption(map* m){
+  char *res=(char*)malloc((strlen(m->name)+strlen(m->value)+5)*sizeof(char));
+  sprintf(res,"-X%s:%s",m->name,m->value);
+  return res;
+}
+
 jobject HashMap_FromMaps(JNIEnv *env,maps* t,jclass scHashMapClass,jclass scHashMap_class,jmethodID scHashMap_constructor){
   jobject scObject,scObject1;