Fix Long*HashMap impl. of IntIntHashMap: Better 64bit hash value, using new HashUtil.

Introduce markup: /*keyHash*/(.*)/*keyHash*/ allowing Long*HashMap to inject hash function for 64bit value.

2 files changed, 9 insertions, 3 deletions

diff --git a/make/build.xml b/make/build.xml
index 886b2db..188f518 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -597,6 +597,7 @@
     <antcall target="create-map" inheritrefs="true">
         <param name="map.name" value="IntObjectHashMap"/>
         <param name="map.key" value="int"/>
+        <param name="map.keyHash" value="\1"/>
         <param name="map.value" value="Object"/>
         <param name="map.null" value="null"/>
     </antcall>
@@ -604,6 +605,7 @@
     <antcall target="create-map" inheritrefs="true">
         <param name="map.name" value="IntLongHashMap"/>
         <param name="map.key" value="int"/>
+        <param name="map.keyHash" value="\1"/>
         <param name="map.value" value="long"/>
         <param name="map.null" value="-1"/>
     </antcall>
@@ -612,6 +614,7 @@
     <antcall target="create-map" inheritrefs="true">
         <param name="map.name" value="LongObjectHashMap"/>
         <param name="map.key" value="long"/>
+        <param name="map.keyHash" value="HashUtil.getAddrHash32_EqualDist(\1)"/>
         <param name="map.value" value="Object"/>
         <param name="map.null" value="null"/>
     </antcall>
@@ -619,6 +622,7 @@
     <antcall target="create-map" inheritrefs="true">
         <param name="map.name" value="LongIntHashMap"/>
         <param name="map.key" value="long"/>
+        <param name="map.keyHash" value="HashUtil.getAddrHash32_EqualDist(\1)"/>
         <param name="map.value" value="int"/>
         <param name="map.null" value="-1"/>
     </antcall>
@@ -626,6 +630,7 @@
     <antcall target="create-map" inheritrefs="true">
         <param name="map.name" value="LongLongHashMap"/>
         <param name="map.key" value="long"/>
+        <param name="map.keyHash" value="HashUtil.getAddrHash32_EqualDist(\1)"/>
         <param name="map.value" value="long"/>
         <param name="map.null" value="-1"/>
     </antcall>
@@ -641,6 +646,7 @@
             <replaceregex pattern="@see ${map.name}" replace="@see IntIntHashMap"/>
             <replaceregex pattern="/\*value\*/int/\*value\*/" replace="${map.value}"/>
             <replaceregex pattern="/\*key\*/int/\*key\*/" replace="${map.key}"/>
+            <replaceregex pattern="/\*keyHash\*/(.*)/\*keyHash\*/" replace="${map.keyHash}"/>
             <replaceregex pattern="/\*null\*/-1/\*null\*/" replace="${map.null}"/>
         </filterchain>
         <!-- no clue why we have to do this twice... otherwise it will only replace one token per line -->
diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh
index f8615a5..482843b 100755
--- a/make/scripts/runtest.sh
+++ b/make/scripts/runtest.sh
@@ -41,7 +41,7 @@ rm -f $LOG
 
 #D_ARGS="-Djogamp.debug.ProcAddressHelper=true -Djogamp.debug.NativeLibrary=true"
 #D_ARGS="-Djogamp.debug.TraceLock"
-D_ARGS="-Djogamp.debug.Platform -Djogamp.debug.NativeLibrary"
+#D_ARGS="-Djogamp.debug.Platform -Djogamp.debug.NativeLibrary"
 #D_ARGS="-Djogamp.debug.JarUtil"
 #D_ARGS="-Djogamp.debug.TempJarCache"
 #D_ARGS="-Djogamp.debug.TempFileCache"
@@ -88,13 +88,13 @@ function onetest() {
 #onetest com.jogamp.common.util.TestArrayHashSet01 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.IntIntHashMapTest 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.IntObjectHashMapTest 2>&1 | tee -a $LOG
-#onetest com.jogamp.common.util.LongIntHashMapTest 2>&1 | tee -a $LOG
+onetest com.jogamp.common.util.LongIntHashMapTest 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.nio.TestBuffersFloatDoubleConversion 2>&1 | tee -a $LOG
 #onetest com.jogamp.gluegen.PCPPTest 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.nio.TestPointerBufferEndian 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.nio.TestStructAccessorEndian 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.os.TestElfReader01 2>&1 | tee -a $LOG
-onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG
+#onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG
 #onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG
 #onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG