Changeset 823

Timestamp:

2012-03-22T18:29:49+01:00 (14 months ago)

Author:

moo

Message:

PHP_5_4: HashTable? bucket changes

Location:

trunk

Files:

• processor/hashtable.m4 (modified) (1 diff)
• xcache.h (modified) (1 diff)

trunk/processor/hashtable.m4

@@ -104 +104 @@
             IFCALCCOPY(`bucketsize = BUCKET_SIZE(b);')
             ALLOC(pnew, char, bucketsize, , Bucket)
-            IFCOPY(`memcpy(pnew, b, bucketsize);')
+            IFCOPY(`
+#ifdef ZEND_ENGINE_2_4
+            memcpy(pnew, b, BUCKET_HEAD_SIZE(Bucket));
+            pnew->arKey = (const char *) (pnew + 1);
+            memcpy(pnew->arKey, b->arKey, BUCKET_KEY_SIZE(b));
+#else
+            memcpy(pnew, b, bucketsize);
+    #endif
+            ')
             IFCOPY(`
                 n = b->h & src->nTableMask;

trunk/xcache.h

@@ -140 +140 @@
 #   define BUCKET_HEAD_SIZE(b) XtOffsetOf(Bucket, arKey)
 #endif
-#define BUCKET_SIZE(b) (BUCKET_HEAD_SIZE(b) + BUCKET_KEY_SIZE(b))
+
+#ifdef ZEND_ENGINE_2_4
+#   define BUCKET_SIZE(b) (sizeof(Bucket) + BUCKET_KEY_SIZE(b))
+#else
+#   define BUCKET_SIZE(b) (BUCKET_HEAD_SIZE(b) + BUCKET_KEY_SIZE(b))
+#endif
 
 #ifndef IS_UNICODE