Changeset 1552 for trunk/bindings

Timestamp:

07/10/10 03:38:14 (20 months ago)

Author:

Tobias Richter

Message:

Error reporting may have failed due to memory corruption or whatever
but was masked by threading problems. If we get a fresh class reference
every time we want to throw an error that helps. refs #219

File:

• trunk/bindings/java/native/NexusFile.c (modified) (18 diffs)

trunk/bindings/java/native/NexusFile.c

@@ -37 +37 @@
    the integer first before it can do useful work.
 
-
 */
 #include <stdlib.h>
@@ -53 +52 @@
 #endif
 
-//#define DEBUG 
-#ifdef DEBUG
-static FILE *fd = NULL;
-#endif
-
-static jclass nexusException;  // Global variable
+#define DEBUG 
+
 static JavaVM *jvm;  // Global variable
 
 JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
     JNIEnv *env;
+    jclass nexusException;  
 
     jint ret = (*vm)->GetEnv(vm, (void **)&env, JNI_VERSION_1_1);
@@ -68 +64 @@
     assert(ret == JNI_OK);
 
-    // Find and store the NexusException class for use in JapiError
+    jvm = vm;
+
     nexusException = (*env)->FindClass(env,"org/nexusformat/NexusException");
-    assert(nexusException);
-
-    jvm = vm;
+    if (nexusException) {
+        fprintf(stderr, "cannot find NexusException - this will not work. Terminating.");
+        assert(nexusException);
+    }
 
     return JNI_VERSION_1_1;
@@ -84 +82 @@
   --------------------------------------------------------------------------*/
 static void JapiError(void *pData, char *text) {
-    // better ignore the env passed in via pData, it is unsafe due to #219
-    JNIEnv *env;
+    JNIEnv *env = pData;
+    jclass nexusException;  
 
 #ifdef DEBUG
-    fprintf(fd,"JapiError called with: %s\n", text); 
-#endif
-
-    (*jvm)->AttachCurrentThread (jvm, (void **) &env, NULL);
+    fprintf(stderr,"JapiError called with: %s\n", text); 
+#endif
+
+    /* (*jvm)->AttachCurrentThread (jvm, (void **) &env, NULL); */
 
     if (env == NULL) {
@@ -98 +96 @@
     }
 
+    // Find and store the NexusException class for use in JapiError
+    nexusException = (*env)->FindClass(env,"org/nexusformat/NexusException");
     (*env)->ThrowNew(env, nexusException, text);
 } 
@@ -111 +111 @@
     int iRet;
 
-#ifdef DEBUG
-    if(fd == NULL)
-    {
-        fd = fopen("jnexusdebug.dat","w");
-    }
-#endif    
     /* set error handler */
     NXMSetTError(env,JapiError);
 
     /* extract the filename as a C char* */
-    fileName = (char *) (*env)->GetStringUTFChars(env,filename,0);    
+    fileName = (char *) (*env)->GetStringUTFChars(env, filename, 0);    
     
     /* call NXopen */
 #ifdef DEBUG
-    fprintf(fd,"Calling NXopen on %s, with %d\n", fileName,access);
+    fprintf(stderr,"Calling NXopen on %s, with %d\n", fileName, access);
 #endif
     iRet = NXopen(fileName,access,&handle);
 
 #ifdef DEBUG
-    fprintf(fd,"Handle %d allocated for %s\n", handle, fileName);
+    fprintf(stderr,"Handle allocated for %s\n", fileName);
 #endif
 
@@ -163 +157 @@
     HHRemoveHandle(handle);
 
-
     /* call NXflush */
     iRet = NXflush(&nxhandle);
@@ -191 +184 @@
     nxhandle =  (NXhandle)HHGetPointer(handle);
 #ifdef DEBUG
-    fprintf(fd,"closing handle %d, nxhandle %d\n", handle, nxhandle);
+    fprintf(stderr,"closing handle %d, nxhandle %d\n", handle, nxhandle);
 #endif
 
@@ -251 +244 @@
     if(iRet != NX_OK)
     {
-      fprintf(fd,"Cleanup code called after raising Exception\n");
+      fprintf(stderr,"Cleanup code called after raising Exception\n");
     }
 #endif
@@ -282 +275 @@
     if(iRet != NX_OK)
     {
-      fprintf(fd,"Cleanup code called after raising Exception\n");
+      fprintf(stderr,"Cleanup code called after raising Exception\n");
     }
 #endif
@@ -312 +305 @@
     if(iRet != NX_OK)
     {
-      fprintf(fd,"Cleanup code called after raising Exception\n");
+      fprintf(stderr,"Cleanup code called after raising Exception\n");
     }
 #endif
@@ -480 +473 @@
 
 #ifdef DEBUG
-    fprintf(fd,"Compressing at %d with type %d\n", nxhandle, comp_type);
+    fprintf(stderr,"Compressing at %d with type %d\n", nxhandle, comp_type);
 #endif
     iRet = NXcompress(nxhandle,comp_type);
@@ -510 +503 @@
     if(iRet != NX_OK)
     {
-        HEprint(fd,0);
+        HEprint(stderr,0);
     }
 #endif
@@ -626 +619 @@
     if(iRet != NX_OK)
     {
-        HEprint(fd,0);
+        HEprint(stderr,0);
     }
 #endif
@@ -686 +679 @@
     iargs = (*env)->GetIntArrayElements(env,args,0);
 #ifdef DEBUG
-    fprintf(fd,"nxgetattr converted types \n");
+    fprintf(stderr,"nxgetattr converted types \n");
 #endif
 
@@ -692 +685 @@
     iType = iargs[1];
 #ifdef DEBUG
-    fprintf(fd,"nxgetattr: iLen %d, iType: %d\n",iLen, iType);
+    fprintf(stderr,"nxgetattr: iLen %d, iType: %d\n",iLen, iType);
 #endif
 
@@ -699 +692 @@
     iargs[1] = iType;
 #ifdef DEBUG
-    fprintf(fd,"nxgetattr cleaning up \n");
+    fprintf(stderr,"nxgetattr cleaning up \n");
 #endif
 
@@ -1310 +1303 @@
    }
 }
-
-
-
-
-
-
-
-
-