[GNUnet-SVN] r2945 - in freeway: native src/org/gnu/freeway/server

[mdonoughe]

Author: mdonoughe
Date: 2006-05-31 12:35:34 -0700 (Wed, 31 May 2006)
New Revision: 2945

Modified:
   freeway/native/org_gnu_freeway_server_CPluginLoader.c
   freeway/src/org/gnu/freeway/server/CPluginLoaderTest.java
Log:
improved code style and fixed resolution problem from last commit


Modified: freeway/native/org_gnu_freeway_server_CPluginLoader.c
===================================================================
--- freeway/native/org_gnu_freeway_server_CPluginLoader.c       2006-05-31 
19:05:27 UTC (rev 2944)
+++ freeway/native/org_gnu_freeway_server_CPluginLoader.c       2006-05-31 
19:35:34 UTC (rev 2945)
@@ -58,9 +58,40 @@
 
 
 
-static int convCIntToInt(jobject input, JNIEnv * env);
-static jobject convJStringToCString(jstring input, JNIEnv * env);
+static int convCIntToInt(jobject input, JNIEnv * env) {
+fprintf(stderr, "in convCIntToInt\n");
+  jclass classCInt;
+  jmethodID method;
 
+  if(input == NULL)
+    return 0;
+  classCInt = (*env)->FindClass(env, "org/gnu/freeway/cwrappers/CInt");
+  if(classCInt == NULL)
+    return 0;
+  method = (*env)->GetMethodID(env, classCInt, "getValue", "()I");
+  if(method == NULL)
+    return 0;
+fprintf(stderr, "leaving convCIntToInt\n");
+  return (*env)->CallIntMethod(env, input, method);
+}
+
+static jobject convJStringToCString(jstring input, JNIEnv * env) {
+fprintf(stderr, "in convJStringToCString\n");
+  jclass classCString;
+  jmethodID method;
+
+  if(input == NULL)
+    return NULL;
+  classCString = (*env)->FindClass(env, "org/gnu/freeway/cwrappers/CString");
+  if(classCString == NULL)
+    return NULL;
+  method = (*env)->GetMethodID(env, classCString, "<init>", 
"(Ljava/lang/String;)V");
+  if(method == NULL)
+    return NULL;
+fprintf(stderr, "leaving convJStringToCString\n");
+  return (*env)->NewObject(env, classCString, method, input);
+}
+
 static void * jrequestService(const char * name) {
 fprintf(stderr, "in jrequestService\n");
   ModuleList * pos;
@@ -85,15 +116,14 @@
   GNUNET_ASSERT(mname != 0);
   capiClazz = (*env)->GetObjectClass(env, pos->jcapi);
   GNUNET_ASSERT(capiClazz != 0);
-// next line does not work
-  method = (*env)->GetMethodID(env, capiClazz, "requestService", 
"(Lorg/gnu/freeway/cwrappers/CString;)Lorg/gnu/freeway/server/CPluginLoader.Handle;");
+  method = (*env)->GetMethodID(env, capiClazz, "requestService", 
"(Lorg/gnu/freeway/cwrappers/CString;)Lorg/gnu/freeway/server/CPluginLoader$Handle;");
   GNUNET_ASSERT(method != 0);
   retHandle = (*env)->CallObjectMethod(env, pos->jcapi, method, 
convJStringToCString(mname, env));
   jfieldID handle_ = (*env)->GetFieldID(env, (*env)->GetObjectClass(env, 
retHandle), "_", "J");
   if(handle_ == NULL)
     return 0;
   ret = (*env)->GetLongField(env, retHandle, handle_);
-fprintf(stderr, "leaving jrequestService\n");
+fprintf(stderr, "leaving jrequestService: %x\n", ret);
   return ret;
 }
 
@@ -127,39 +157,7 @@
   return convCIntToInt(ret, env);
 }
 
-static int convCIntToInt(jobject input, JNIEnv * env) {
-fprintf(stderr, "in convCIntToInt\n");
-       jclass classCInt;
-       jmethodID method;
-       
-       if(input == NULL)
-               return 0;
-       classCInt = (*env)->FindClass(env, "org/gnu/freeway/cwrappers/CInt");
-       if(classCInt == NULL)
-               return 0;
-       method = (*env)->GetMethodID(env, classCInt, "getValue", "()I");
-       if(method == NULL)
-               return 0;
-fprintf(stderr, "leaving convCIntToInt\n");
-       return (*env)->CallIntMethod(env, input, method);
-}
 
-static jobject convJStringToCString(jstring input, JNIEnv * env) {
-fprintf(stderr, "in convJStringToCString\n");
-       jclass classCString;
-       jmethodID method;
-       
-       if(input == NULL)
-               return NULL;
-       classCString = (*env)->FindClass(env, 
"org/gnu/freeway/cwrappers/CString");
-       if(classCString == NULL)
-               return NULL;
-       method = (*env)->GetMethodID(env, classCString, "<init>", 
"(Ljava/lang/String;)V");
-       if(method == NULL)
-               return NULL;
-fprintf(stderr, "leaving convJStringToCString\n");
-       return (*env)->NewObject(env, classCString, method, input);
-}
 
 static CoreAPIForApplication jcapi = {
   0,
@@ -305,42 +303,42 @@
 }
 
 JNIEXPORT jlong JNICALL 
Java_org_gnu_freeway_server_CPluginLoader_cBindDynamicMethod
-  (JNIEnv *env, jobject cls, jlong libhandle, jstring methodprefix, jstring 
dsoname) {
-  if(methodprefix == NULL)
+  (JNIEnv *env, jobject cls, jlong libHandle, jstring methodPrefix, jstring 
dsoName) {
+  if(methodPrefix == NULL)
     return 0;
-  if(dsoname == NULL)
+  if(dsoName == NULL)
     return 0;
-  const char * strmethodprefix = (*env)->GetStringUTFChars(env, methodprefix, 
NULL);
-  if(strmethodprefix == NULL)
+  const char * strMethodPrefix = (*env)->GetStringUTFChars(env, methodPrefix, 
NULL);
+  if(strMethodPrefix == NULL)
     return 0;
-  const char * strdsoname = (*env)->GetStringUTFChars(env, dsoname, NULL);
-  if(strdsoname == NULL)
+  const char * strDsoName = (*env)->GetStringUTFChars(env, dsoName, NULL);
+  if(strDsoName == NULL)
     return 0;
-  long returnValue = (long) bindDynamicMethod((void *)(long)libhandle, 
strmethodprefix, strdsoname);
-  (*env)->ReleaseStringUTFChars(env, methodprefix, strmethodprefix);
-  (*env)->ReleaseStringUTFChars(env, dsoname, strdsoname);
+  long returnValue = (long) bindDynamicMethod((void *)(long)libHandle, 
strMethodPrefix, strDsoName);
+  (*env)->ReleaseStringUTFChars(env, methodPrefix, strMethodPrefix);
+  (*env)->ReleaseStringUTFChars(env, dsoName, strDsoName);
   return (jlong) returnValue;
 }
 
 JNIEXPORT jlong JNICALL 
Java_org_gnu_freeway_server_CPluginLoader_cLoadDynamicLibrary
-  (JNIEnv *env, jobject cls, jstring libprefix, jstring dsoname) {
-  if(libprefix == NULL)
+  (JNIEnv *env, jobject cls, jstring libPrefix, jstring dsoName) {
+  if(libPrefix == NULL)
     return 0;
-  if(dsoname == NULL)
+  if(dsoName == NULL)
     return 0;
-  const char * strlibprefix = (*env)->GetStringUTFChars(env, libprefix, NULL);
-  if(strlibprefix == NULL)
+  const char * strLibPrefix = (*env)->GetStringUTFChars(env, libPrefix, NULL);
+  if(strLibPrefix == NULL)
     return 0;
-  const char * strdsoname = (*env)->GetStringUTFChars(env, dsoname, NULL);
-  if(strdsoname == NULL)
+  const char * strDsoName = (*env)->GetStringUTFChars(env, dsoName, NULL);
+  if(strDsoName == NULL)
     return 0;
-  long returnValue = (long) loadDynamicLibrary(strlibprefix, strdsoname);
-  (*env)->ReleaseStringUTFChars(env, libprefix, strlibprefix);
-  (*env)->ReleaseStringUTFChars(env, dsoname, strdsoname);
+  long returnValue = (long) loadDynamicLibrary(strLibPrefix, strDsoName);
+  (*env)->ReleaseStringUTFChars(env, libPrefix, strLibPrefix);
+  (*env)->ReleaseStringUTFChars(env, dsoName, strDsoName);
   return (jlong) returnValue;
 }
 
 JNIEXPORT void JNICALL 
Java_org_gnu_freeway_server_CPluginLoader_cUnloadDynamicLibrary
-  (JNIEnv *env, jobject cls, jlong libhandle) {
-  unloadDynamicLibrary((void *)(long)libhandle);
+  (JNIEnv *env, jobject cls, jlong libHandle) {
+  unloadDynamicLibrary((void *)(long)libHandle);
 }

Modified: freeway/src/org/gnu/freeway/server/CPluginLoaderTest.java
===================================================================
--- freeway/src/org/gnu/freeway/server/CPluginLoaderTest.java   2006-05-31 
19:05:27 UTC (rev 2944)
+++ freeway/src/org/gnu/freeway/server/CPluginLoaderTest.java   2006-05-31 
19:35:34 UTC (rev 2945)
@@ -22,7 +22,7 @@
                CPluginLoader cpl = new CPluginLoader();
                StatsService statsService = (StatsService) 
cpl.createService("StatsService");
                CInt statHandle = statsService.create(new ConstCString("# of 
test stats"));
-               //assertFalse(statHandle.getValue() == 0);
+               assertFalse(statHandle.getValue() == 0);
                statsService.set(statHandle, new ConstCLong(0));
                statsService.change(statHandle, new ConstCInt(1));
                CLong result = statsService.get(statHandle);