commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mt...@apache.org
Subject svn commit: r1196468 - in /commons/proper/daemon/trunk/src/native/unix/native: arguments.c java.c jsvc-unix.c
Date Wed, 02 Nov 2011 06:24:11 GMT
Author: mturk
Date: Wed Nov  2 06:24:11 2011
New Revision: 1196468

URL: http://svn.apache.org/viewvc?rev=1196468&view=rev
Log:
Cleanup SABLE and KAFFE VM code. Not supported any more.

Modified:
    commons/proper/daemon/trunk/src/native/unix/native/arguments.c
    commons/proper/daemon/trunk/src/native/unix/native/java.c
    commons/proper/daemon/trunk/src/native/unix/native/jsvc-unix.c

Modified: commons/proper/daemon/trunk/src/native/unix/native/arguments.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/arguments.c?rev=1196468&r1=1196467&r2=1196468&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/native/arguments.c (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/arguments.c Wed Nov  2 06:24:11 2011
@@ -325,17 +325,6 @@ static arg_data *parse(int argc, char *a
         else if (!strncmp(argv[x], "-verbose", 8)) {
             args->opts[args->onum++] = strdup(argv[x]);
         }
-#ifdef HAVE_KAFFEVM
-        else if (!strncmp(argv[x], "-vmdebug", 8)) {
-            args->opts[args->onum++] = strdup(argv[x]);
-            temp = optional(argc,argv,x++);
-            if (temp == NULL) {
-                log_error("vmdebug option requires a debug flag.");
-                return NULL;
-            }
-            args->opts[args->onum++] = strdup(temp);
-        }
-#endif
         else if (!strcmp(argv[x], "-D")) {
             log_error("Parameter -D must be followed by <name>=<value>");
             return NULL;

Modified: commons/proper/daemon/trunk/src/native/unix/native/java.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/java.c?rev=1196468&r1=1196467&r2=1196468&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/native/java.c (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/java.c Wed Nov  2 06:24:11 2011
@@ -166,8 +166,7 @@ bool java_init(arg_data *args, home_data
     }
 
     /* Load the JVM library */
-#if defined(OSD_POSIX) || defined(HAVE_KAFFEVM)
-#else
+#if !defined(OSD_POSIX)
     libh = dso_link(libf);
     if (libh == NULL) {
         log_error("Cannot dynamically link to %s", libf);
@@ -211,8 +210,8 @@ bool java_init(arg_data *args, home_data
     }
     log_debug("Shell library %s loaded", appf);
 #endif /* ifdef OS_DARWIN */
-#if defined(OSD_POSIX) || defined(HAVE_KAFFEVM)
-    /* BS2000 and kaffe does not allow to call JNI_CreateJavaVM indirectly */
+#if defined(OSD_POSIX)
+    /* BS2000 does not allow to call JNI_CreateJavaVM indirectly */
 #else
     symb = (jvm_create_t)dso_symbol(libh, "JNI_CreateJavaVM");
     if (symb == NULL) {
@@ -240,13 +239,7 @@ bool java_init(arg_data *args, home_data
 #else
     arg.version = JNI_VERSION_1_2;
 #endif
-#if defined(OSD_POSIX) || defined(HAVE_KAFFEVM)
-
-#if defined(HAVE_KAFFEVM)
-    memset(&arg, 0, sizeof(arg));
-    arg.version = JNI_VERSION_1_4;
-#endif
-
+#if defined(OSD_POSIX)
     if (JNI_GetDefaultJavaVMInitArgs(&arg) < 0) {
         log_error("Cannot init default JVM default args");
         return false;
@@ -308,7 +301,7 @@ bool java_init(arg_data *args, home_data
     }
 
     /* And finally create the Java VM */
-#if defined(OSD_POSIX) || defined(HAVE_KAFFEVM)
+#if defined(OSD_POSIX)
     ret = JNI_CreateJavaVM(&jvm, &env, &arg);
 #else
     ret = (*symb) (&jvm, &env, &arg);
@@ -328,9 +321,6 @@ bool java_init(arg_data *args, home_data
     }
     log_debug("Class %s found", loaderclass);
 
-#if defined(HAVE_SABLEVM)
-    log_debug("sableVM doesn't support RegisterNatives");
-#else
     jsvc_xlate_to_ascii(shutdownmethod);
     nativemethods[0].name = shutdownmethod;
     jsvc_xlate_to_ascii(shutdownparams);
@@ -347,7 +337,6 @@ bool java_init(arg_data *args, home_data
         return false;
     }
     log_debug("Native methods registered");
-#endif
 
     return true;
 }

Modified: commons/proper/daemon/trunk/src/native/unix/native/jsvc-unix.c
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/native/unix/native/jsvc-unix.c?rev=1196468&r1=1196467&r2=1196468&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/native/unix/native/jsvc-unix.c (original)
+++ commons/proper/daemon/trunk/src/native/unix/native/jsvc-unix.c Wed Nov  2 06:24:11 2011
@@ -732,7 +732,7 @@ static int child(arg_data *args, home_da
     log_debug("Waiting for a signal to be delivered");
     create_tmp_file(args);
     while (!stopping) {
-#if defined(OSD_POSIX) || defined(HAVE_KAFFEVM)
+#if defined(OSD_POSIX)
         java_sleep(60);
         /* pause(); */
 #else



Mime
View raw message