Changeset 24031 for main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/random.c

Timestamp:

2011-05-19T09:26:07+12:00 (13 years ago)

Author:

jmt12

Message:

Found mg indexing randomly broke on 64bit machines. Tracked it down to random.c and perf_hash.c. Replaced all occurances of 'long' (which is not well defined on 64 bit machines) with the more stable mg_s_long (mglong.h) to fix this issue.

File:

• main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/random.c (modified) (4 diffs)

main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/lib/random.c

@@ -33 +33 @@
  *  The table mt[0:127] is defined by mt[i] = 69069 ** (128-i)
  */
-
-#define MASK ((long) 593970775)
+#include "random.h"
+
+#define MASK ((mg_s_long) 593970775)
 /*  or in hex, 23674657 */
 
@@ -40 +41 @@
 /*  i.e. 2 to power -31 */
 
-static long mt [128] =   {
+static mg_s_long mt [128] =   {
       902906369,
      2030498053,
@@ -172 +173 @@
 
 double 
-random (long is [2])
+random (mg_s_long is [2])
 {
-    long it, leh, nit;
+    mg_s_long it, leh, nit;
 
     it = is [0];
@@ -187 +188 @@
     is [0] = it;    is [1] = leh;
     if (leh < 0) leh = ~leh;
-    return (SCALE * ((long) (leh | 1)));
+    return (SCALE * ((mg_s_long) (leh | 1)));
 }
 
 
 
-long 
-irandm (long is [2])
+mg_s_long 
+irandm (mg_s_long is [2])
 {
-    long it, leh, nit;
+    mg_s_long it, leh, nit;
 
     it = is [0];