Changeset 35551 for main/trunk

Timestamp:

2021-10-12T10:43:54+13:00 (3 years ago)

Author:

davidb

Message:

Further changes related to compiling Greenstone up natively for use of Windows 64-bit. On Window 32-bit 'long' is the same size of pointers (4 bytes), however on 64-bit Windows this is not the case: long is still 4 bytes (320-bit), but pointers are 8 bytes (64-bit). This leads to typcasing truncation in our code were we have be using the 'trick' of mapping MG related pointer to be 'long' (to pass its effective memory location address between C and Java code). The change here is to use 'jlong' which is aways 8 bytes (64-bit). Thinking through the implications of this change is that it should also work on 32-bit compiled OSes, but this is yet to be confirmed emperically by trying out a compiled version.

Location:

main/trunk/greenstone2/common-src/indexers/mg/jni

Files:

• MGRetrieveWrapperImpl.c (modified) (1 diff)
• MGSearchWrapperImpl.c (modified) (1 diff)
• MGWrapperImpl.c (modified) (1 diff)

main/trunk/greenstone2/common-src/indexers/mg/jni/MGRetrieveWrapperImpl.c

@@ -197 +197 @@
 
   /* Save the object on the Java side */
-  (*j_env)->SetLongField(j_env, j_obj, FID_mg_data, (long) data);
+  (*j_env)->SetLongField(j_env, j_obj, FID_mg_data, (jlong) data);
 
   /* Initialise MG environment variables */

main/trunk/greenstone2/common-src/indexers/mg/jni/MGSearchWrapperImpl.c

@@ -159 +159 @@
 
   /* Save the object on the Java side */
-  (*j_env)->SetLongField(j_env, j_obj, FID_mg_data, (long) data);
+  (*j_env)->SetLongField(j_env, j_obj, FID_mg_data, (jlong) data);
 
   /* Initialise MG environment variables */

main/trunk/greenstone2/common-src/indexers/mg/jni/MGWrapperImpl.c

@@ -185 +185 @@
 
   /* Save the object on the Java side */
-  (*j_env)->SetLongField(j_env, j_obj, FID_mg_data, (long) data);
+  (*j_env)->SetLongField(j_env, j_obj, FID_mg_data, (jlong) data);
 
   /* Initialise MG environment variables */