Changeset 676

Timestamp:

2009-08-26T05:02:07+02:00 (4 years ago)

Author:

moo

Message:

fixed #224: 2G/4G limitation on 64bit arch

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• mem.c (modified) (7 diffs)
• mem.h (modified) (2 diffs)
• xcache.c (modified) (1 diff)

branches/1.3/mem.c

@@ -91 +91 @@
     realsize = ALIGN(realsize);
 
-    TRACE("avail: %d (%dKB). Allocate size: %d realsize: %d (%dKB)"
+    TRACE("avail: %lu (%luKB). Allocate size: %lu realsize: %lu (%luKB)"
             , mem->avail, mem->avail / 1024
             , size
@@ -104 +104 @@
 
         b = NULL;
-        minsize = INT_MAX;
+        minsize = ULONG_MAX;
 
         /* prev|cur */
@@ -161 +161 @@
          */
 
-        TRACE(" -> avail: %d (%dKB). new next: %p offset: %d %dKB. Got: %p"
+        TRACE(" -> avail: %lu (%luKB). new next: %p offset: %lu %luKB. Got: %p"
                 , mem->avail, mem->avail / 1024
                 , newb
@@ -183 +183 @@
 
     cur = (xc_block_t *) (CHAR_PTR(p) - BLOCK_HEADER_SIZE());
-    TRACE("freeing: %p, size=%d", p, cur->size);
+    TRACE("freeing: %p, size=%lu", p, cur->size);
     xc_block_check(cur);
     assert((char*)mem < (char*)cur && (char*)cur < (char*)mem + mem->size);
@@ -198 +198 @@
     size = cur->size;
 
-    TRACE(" avail %d (%dKB)", mem->avail, mem->avail / 1024);
+    TRACE(" avail %lu (%luKB)", mem->avail, mem->avail / 1024);
     mem->avail += size;
 
@@ -216 +216 @@
         TRACE("%s", " combine next");
     }
-    TRACE(" -> avail %d (%dKB)", mem->avail, mem->avail / 1024);
+    TRACE(" -> avail %lu (%luKB)", mem->avail, mem->avail / 1024);
     return size;
 }
@@ -297 +297 @@
         return NULL;
     }
+    TRACE("size=%lu", size);
     mem->shm = shm;
     mem->size = size;

branches/1.3/mem.h

@@ +1 @@
+#include "xc_shm.h"
+
 typedef struct _xc_mem_handlers_t xc_mem_handlers_t;
 
@@ -14 +16 @@
 typedef struct XC_MEM_IMPL xc_mem_t;
 typedef struct XC_MEMBLOCK_IMPL xc_block_t;
-typedef unsigned int xc_memsize_t;
+typedef xc_shmsize_t xc_memsize_t;
 
 /* shm::mem */

branches/1.3/xcache.c

@@ -2840 +2840 @@
     }
 
-    *p = zend_atoi(value, strlen(value));
+    *p = zend_atol(value, strlen(value));
     return SUCCESS;
 }