Issue #23488: Random generator objects now consume 2x less memory on 64-bit.

1 files changed, 68 insertions, 70 deletions

diff --git a/Modules/_randommodule.c b/Modules/_randommodule.c
index af86182..91fcc87 100644
--- a/Modules/_randommodule.c
+++ b/Modules/_randommodule.c
@@ -69,17 +69,21 @@
 #include "Python.h"
 #include <time.h>               /* for seeding to current time */
 
+#ifndef PY_UINT32_T
+#  error "Failed to find an exact-width 32-bit integer type"
+#endif
+
 /* Period parameters -- These are all magic.  Don't change. */
 #define N 624
 #define M 397
-#define MATRIX_A 0x9908b0dfUL   /* constant vector a */
-#define UPPER_MASK 0x80000000UL /* most significant w-r bits */
-#define LOWER_MASK 0x7fffffffUL /* least significant r bits */
+#define MATRIX_A 0x9908b0dfU    /* constant vector a */
+#define UPPER_MASK 0x80000000U  /* most significant w-r bits */
+#define LOWER_MASK 0x7fffffffU  /* least significant r bits */
 
 typedef struct {
     PyObject_HEAD
     int index;
-    unsigned long state[N];
+    PY_UINT32_T state[N];
 } RandomObject;
 
 static PyTypeObject Random_Type;
@@ -91,13 +95,13 @@ static PyTypeObject Random_Type;
 
 
 /* generates a random number on [0,0xffffffff]-interval */
-static unsigned long
+static PY_UINT32_T
 genrand_int32(RandomObject *self)
 {
-    unsigned long y;
-    static unsigned long mag01[2]={0x0UL, MATRIX_A};
+    PY_UINT32_T y;
+    static PY_UINT32_T mag01[2]={0x0U, MATRIX_A};
     /* mag01[x] = x * MATRIX_A  for x=0,1 */
-    unsigned long *mt;
+    PY_UINT32_T *mt;
 
     mt = self->state;
     if (self->index >= N) { /* generate N words at one time */
@@ -105,22 +109,22 @@ genrand_int32(RandomObject *self)
 
         for (kk=0;kk<N-M;kk++) {
             y = (mt[kk]&UPPER_MASK)|(mt[kk+1]&LOWER_MASK);
-            mt[kk] = mt[kk+M] ^ (y >> 1) ^ mag01[y & 0x1UL];
+            mt[kk] = mt[kk+M] ^ (y >> 1) ^ mag01[y & 0x1U];
         }
         for (;kk<N-1;kk++) {
             y = (mt[kk]&UPPER_MASK)|(mt[kk+1]&LOWER_MASK);
-            mt[kk] = mt[kk+(M-N)] ^ (y >> 1) ^ mag01[y & 0x1UL];
+            mt[kk] = mt[kk+(M-N)] ^ (y >> 1) ^ mag01[y & 0x1U];
         }
         y = (mt[N-1]&UPPER_MASK)|(mt[0]&LOWER_MASK);
-        mt[N-1] = mt[M-1] ^ (y >> 1) ^ mag01[y & 0x1UL];
+        mt[N-1] = mt[M-1] ^ (y >> 1) ^ mag01[y & 0x1U];
 
         self->index = 0;
     }
 
     y = mt[self->index++];
     y ^= (y >> 11);
-    y ^= (y << 7) & 0x9d2c5680UL;
-    y ^= (y << 15) & 0xefc60000UL;
+    y ^= (y << 7) & 0x9d2c5680U;
+    y ^= (y << 15) & 0xefc60000U;
     y ^= (y >> 18);
     return y;
 }
@@ -137,28 +141,26 @@ genrand_int32(RandomObject *self)
 static PyObject *
 random_random(RandomObject *self)
 {
-    unsigned long a=genrand_int32(self)>>5, b=genrand_int32(self)>>6;
+    PY_UINT32_T a=genrand_int32(self)>>5, b=genrand_int32(self)>>6;
     return PyFloat_FromDouble((a*67108864.0+b)*(1.0/9007199254740992.0));
 }
 
 /* initializes mt[N] with a seed */
 static void
-init_genrand(RandomObject *self, unsigned long s)
+init_genrand(RandomObject *self, PY_UINT32_T s)
 {
     int mti;
-    unsigned long *mt;
+    PY_UINT32_T *mt;
 
     mt = self->state;
-    mt[0]= s & 0xffffffffUL;
+    mt[0]= s;
     for (mti=1; mti<N; mti++) {
         mt[mti] =
-        (1812433253UL * (mt[mti-1] ^ (mt[mti-1] >> 30)) + mti);
+        (1812433253U * (mt[mti-1] ^ (mt[mti-1] >> 30)) + mti);
         /* See Knuth TAOCP Vol2. 3rd Ed. P.106 for multiplier. */
         /* In the previous versions, MSBs of the seed affect   */
         /* only MSBs of the array mt[].                                */
         /* 2002/01/09 modified by Makoto Matsumoto                     */
-        mt[mti] &= 0xffffffffUL;
-        /* for >32 bit machines */
     }
     self->index = mti;
     return;
@@ -168,32 +170,30 @@ init_genrand(RandomObject *self, unsigned long s)
 /* init_key is the array for initializing keys */
 /* key_length is its length */
 static PyObject *
-init_by_array(RandomObject *self, unsigned long init_key[], size_t key_length)
+init_by_array(RandomObject *self, PY_UINT32_T init_key[], size_t key_length)
 {
     size_t i, j, k;       /* was signed in the original code. RDH 12/16/2002 */
-    unsigned long *mt;
+    PY_UINT32_T *mt;
 
     mt = self->state;
-    init_genrand(self, 19650218UL);
+    init_genrand(self, 19650218U);
     i=1; j=0;
     k = (N>key_length ? N : key_length);
     for (; k; k--) {
-        mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * 1664525UL))
-                 + init_key[j] + (unsigned long)j; /* non linear */
-        mt[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */
+        mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * 1664525U))
+                 + init_key[j] + (PY_UINT32_T)j; /* non linear */
         i++; j++;
         if (i>=N) { mt[0] = mt[N-1]; i=1; }
         if (j>=key_length) j=0;
     }
     for (k=N-1; k; k--) {
-        mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * 1566083941UL))
-                 - (unsigned long)i; /* non linear */
-        mt[i] &= 0xffffffffUL; /* for WORDSIZE > 32 machines */
+        mt[i] = (mt[i] ^ ((mt[i-1] ^ (mt[i-1] >> 30)) * 1566083941U))
+                 - (PY_UINT32_T)i; /* non linear */
         i++;
         if (i>=N) { mt[0] = mt[N-1]; i=1; }
     }
 
-    mt[0] = 0x80000000UL; /* MSB is 1; assuring non-zero initial array */
+    mt[0] = 0x80000000U; /* MSB is 1; assuring non-zero initial array */
     Py_INCREF(Py_None);
     return Py_None;
 }
@@ -208,9 +208,8 @@ random_seed(RandomObject *self, PyObject *args)
 {
     PyObject *result = NULL;            /* guilty until proved innocent */
     PyObject *n = NULL;
-    unsigned long *key = NULL;
-    unsigned char *key_as_bytes = NULL;
-    size_t bits, keyused, i;
+    PY_UINT32_T *key = NULL;
+    size_t bits, keyused;
     int res;
     PyObject *arg = NULL;
 
@@ -221,7 +220,7 @@ random_seed(RandomObject *self, PyObject *args)
         time_t now;
 
         time(&now);
-        init_genrand(self, (unsigned long)now);
+        init_genrand(self, (PY_UINT32_T)now);
         Py_INCREF(Py_None);
         return Py_None;
     }
@@ -249,35 +248,31 @@ random_seed(RandomObject *self, PyObject *args)
     keyused = bits == 0 ? 1 : (bits - 1) / 32 + 1;
 
     /* Convert seed to byte sequence. */
-    key_as_bytes = (unsigned char *)PyMem_Malloc((size_t)4 * keyused);
-    if (key_as_bytes == NULL) {
+    key = (PY_UINT32_T *)PyMem_Malloc((size_t)4 * keyused);
+    if (key == NULL) {
         PyErr_NoMemory();
         goto Done;
     }
     res = _PyLong_AsByteArray((PyLongObject *)n,
-                              key_as_bytes, keyused * 4,
-                              1,  /* little-endian */
+                              (unsigned char *)key, keyused * 4,
+                              PY_LITTLE_ENDIAN,
                               0); /* unsigned */
     if (res == -1) {
-        PyMem_Free(key_as_bytes);
+        PyMem_Free(key);
         goto Done;
     }
 
-    /* Fill array of unsigned longs from byte sequence. */
-    key = (unsigned long *)PyMem_Malloc(sizeof(unsigned long) * keyused);
-    if (key == NULL) {
-        PyErr_NoMemory();
-        PyMem_Free(key_as_bytes);
-        goto Done;
-    }
-    for (i = 0; i < keyused; i++) {
-        key[i] =
-            ((unsigned long)key_as_bytes[4*i + 0] << 0) +
-            ((unsigned long)key_as_bytes[4*i + 1] << 8) +
-            ((unsigned long)key_as_bytes[4*i + 2] << 16) +
-            ((unsigned long)key_as_bytes[4*i + 3] << 24);
+#if PY_BIG_ENDIAN
+    {
+        size_t i, j;
+        /* Reverse an array. */
+        for (i = 0; j = keyused - 1; i < j; i++, j--) {
+            PY_UINT32_T tmp = key[i];
+            key[i] = key[j];
+            key[j] = tmp;
+        }
     }
-    PyMem_Free(key_as_bytes);
+#endif
     result = init_by_array(self, key, keyused);
 Done:
     Py_XDECREF(n);
@@ -334,7 +329,7 @@ random_setstate(RandomObject *self, PyObject *state)
         element = PyLong_AsUnsignedLong(PyTuple_GET_ITEM(state, i));
         if (element == (unsigned long)-1 && PyErr_Occurred())
             return NULL;
-        self->state[i] = element & 0xffffffffUL; /* Make sure we get sane state */
+        self->state[i] = (PY_UINT32_T)element;
     }
 
     index = PyLong_AsLong(PyTuple_GET_ITEM(state, i));
@@ -349,9 +344,9 @@ random_setstate(RandomObject *self, PyObject *state)
 static PyObject *
 random_getrandbits(RandomObject *self, PyObject *args)
 {
-    int k, i, bytes;
-    unsigned long r;
-    unsigned char *bytearray;
+    int k, i, words;
+    PY_UINT32_T r;
+    PY_UINT32_T *wordarray;
     PyObject *result;
 
     if (!PyArg_ParseTuple(args, "i:getrandbits", &k))
@@ -366,27 +361,30 @@ random_getrandbits(RandomObject *self, PyObject *args)
     if (k <= 32)  /* Fast path */
         return PyLong_FromUnsignedLong(genrand_int32(self) >> (32 - k));
 
-    bytes = ((k - 1) / 32 + 1) * 4;
-    bytearray = (unsigned char *)PyMem_Malloc(bytes);
-    if (bytearray == NULL) {
+    words = (k - 1) / 32 + 1;
+    wordarray = (PY_UINT32_T *)PyMem_Malloc(words * 4);
+    if (wordarray == NULL) {
         PyErr_NoMemory();
         return NULL;
     }
 
-    /* Fill-out whole words, byte-by-byte to avoid endianness issues */
-    for (i=0 ; i<bytes ; i+=4, k-=32) {
+    /* Fill-out bits of long integer, by 32-bit words, from least significant
+       to most significant. */
+#if PY_LITTLE_ENDIAN
+    for (i = 0; i < words; i++, k -= 32)
+#else
+    for (i = words - 1; i >= 0; i--, k -= 32)
+#endif
+    {
         r = genrand_int32(self);
         if (k < 32)
-            r >>= (32 - k);
-        bytearray[i+0] = (unsigned char)r;
-        bytearray[i+1] = (unsigned char)(r >> 8);
-        bytearray[i+2] = (unsigned char)(r >> 16);
-        bytearray[i+3] = (unsigned char)(r >> 24);
+            r >>= (32 - k);  /* Drop least significant bits */
+        wordarray[i] = r;
     }
 
-    /* little endian order to match bytearray assignment order */
-    result = _PyLong_FromByteArray(bytearray, bytes, 1, 0);
-    PyMem_Free(bytearray);
+    result = _PyLong_FromByteArray((unsigned char *)wordarray, words * 4,
+                                   PY_LITTLE_ENDIAN, 0 /* unsigned */);
+    PyMem_Free(wordarray);
     return result;
 }