mprove performance by embedding and rearranging structs

Author: m6w6

msgpack.c

@@ -157,16 +157,12 @@ PS_SERIALIZER_DECODE_FUNC(msgpack) /* {{{ */ {
     zend_string *key_str;
     zval tmp, *value;
     msgpack_unpack_t mp;
-    msgpack_unserialize_data_t var_hash;
     size_t off = 0;
 
     template_init(&mp);
 
-    msgpack_unserialize_var_init(&var_hash);
-
     ZVAL_UNDEF(&tmp);
     mp.user.retval = &tmp;
-    mp.user.var_hash = &var_hash;
     mp.user.eof = val + vallen;
 
     ret = template_execute(&mp, val, vallen, &off);
@@ -175,7 +171,7 @@ PS_SERIALIZER_DECODE_FUNC(msgpack) /* {{{ */ {
     }
 
     if (ret == MSGPACK_UNPACK_EXTRA_BYTES || ret == MSGPACK_UNPACK_SUCCESS) {
-        msgpack_unserialize_var_destroy(&var_hash, 0);
+        msgpack_unserialize_var_destroy(&mp.user.var_hash, 0);
 
         switch(Z_TYPE_P(mp.user.retval)) {
         case IS_ARRAY:
@@ -192,7 +188,7 @@ PS_SERIALIZER_DECODE_FUNC(msgpack) /* {{{ */ {
 
         zval_ptr_dtor(&tmp);
     } else {
-        msgpack_unserialize_var_destroy(&var_hash, 1);
+        msgpack_unserialize_var_destroy(&mp.user.var_hash, 1);
     }
 
     return SUCCESS;
@@ -214,7 +210,6 @@ PHP_MSGPACK_API int php_msgpack_unserialize(zval *return_value, char *str, size_
     int ret;
     size_t off = 0;
     msgpack_unpack_t mp;
-    msgpack_unserialize_data_t var_hash;
 
     if (str_len <= 0) {
         RETVAL_NULL();
@@ -223,10 +218,7 @@ PHP_MSGPACK_API int php_msgpack_unserialize(zval *return_value, char *str, size_
 
     template_init(&mp);
 
-    msgpack_unserialize_var_init(&var_hash);
-
     mp.user.retval = return_value;
-    mp.user.var_hash = &var_hash;
     mp.user.eof = str + str_len;
 
     ret = template_execute(&mp, str, (size_t)str_len, &off);
@@ -243,7 +235,7 @@ PHP_MSGPACK_API int php_msgpack_unserialize(zval *return_value, char *str, size_
             break;
         case MSGPACK_UNPACK_EXTRA_BYTES:
         case MSGPACK_UNPACK_SUCCESS:
-            msgpack_unserialize_var_destroy(&var_hash, 0);
+            msgpack_unserialize_var_destroy(&mp.user.var_hash, 0);
             if (off < str_len) {
                 MSGPACK_WARNING("[msgpack] (%s) Extra bytes", __FUNCTION__);
             }
@@ -252,7 +244,7 @@ PHP_MSGPACK_API int php_msgpack_unserialize(zval *return_value, char *str, size_
             MSGPACK_WARNING("[msgpack] (%s) Unknown result", __FUNCTION__);
     }
     zval_dtor(return_value);
-    msgpack_unserialize_var_destroy(&var_hash, 1);
+    msgpack_unserialize_var_destroy(&mp.user.var_hash, 1);
     RETVAL_FALSE;
     return FAILURE;
 }

msgpack_class.c

@@ -17,7 +17,6 @@ typedef struct {
     zval retval;
     long offset;
     msgpack_unpack_t mp;
-    msgpack_unserialize_data_t var_hash;
     long php_only;
     zend_bool finished;
     int error;
@@ -300,17 +299,15 @@ static ZEND_METHOD(msgpack_unpacker, __construct) /* {{{ */ {
 
     template_init(&unpacker->mp);
 
-    msgpack_unserialize_var_init(&unpacker->var_hash);
-
-    (&unpacker->mp)->user.var_hash = &unpacker->var_hash;
+    msgpack_unserialize_var_init(&unpacker->mp.user.var_hash);
 }
 /* }}} */
 
 static ZEND_METHOD(msgpack_unpacker, __destruct) /* {{{ */ {
     php_msgpack_unpacker_t *unpacker = Z_MSGPACK_UNPACKER_P(getThis());
     smart_str_free(&unpacker->buffer);
     zval_ptr_dtor(&unpacker->retval);
-    msgpack_unserialize_var_destroy(&unpacker->var_hash, unpacker->error);
+    msgpack_unserialize_var_destroy(&unpacker->mp.user.var_hash, unpacker->error);
 }
 /* }}} */
 
@@ -387,14 +384,12 @@ static ZEND_METHOD(msgpack_unpacker, execute) /* {{{ */ {
     }
 
     if (unpacker->finished) {
-        msgpack_unserialize_var_destroy(&unpacker->var_hash, unpacker->error);
+        msgpack_unserialize_var_destroy(&unpacker->mp.user.var_hash, unpacker->error);
         unpacker->error = 0;
 
         template_init(&unpacker->mp);
 
-        msgpack_unserialize_var_init(&unpacker->var_hash);
-
-        (&unpacker->mp)->user.var_hash = &unpacker->var_hash;
+        msgpack_unserialize_var_init(&unpacker->mp.user.var_hash);
     }
     (&unpacker->mp)->user.retval = &unpacker->retval;
     (&unpacker->mp)->user.eof = data + len;
@@ -480,14 +475,12 @@ static ZEND_METHOD(msgpack_unpacker, reset) /* {{{ */ {
 
     smart_str_free(&buffer);
 
-    msgpack_unserialize_var_destroy(&unpacker->var_hash, unpacker->error);
+    msgpack_unserialize_var_destroy(&unpacker->mp.user.var_hash, unpacker->error);
     unpacker->error = 0;
 
     template_init(&unpacker->mp);
 
-    msgpack_unserialize_var_init(&unpacker->var_hash);
-
-    (&unpacker->mp)->user.var_hash = &unpacker->var_hash;
+    msgpack_unserialize_var_init(&unpacker->mp.user.var_hash);
 }
 /* }}} */
 

msgpack_unpack.c

@@ -14,23 +14,23 @@
 #endif
 
 typedef struct {
-    zval data[VAR_ENTRIES_MAX];
     zend_long used_slots;
     void *next;
+    zval data[VAR_ENTRIES_MAX];
 } var_entries;
 
 #define MSGPACK_UNSERIALIZE_ALLOC_STACK(_unpack)                 \
     if (UNEXPECTED(_unpack->deps == 0)) {                        \
         *obj = _unpack->retval;                                  \
     } else {                                                     \
-        *obj = msgpack_stack_push(_unpack->var_hash);            \
+        *obj = msgpack_stack_push(&_unpack->var_hash);            \
     }
 
 #define MSGPACK_UNSERIALIZE_ALLOC_VALUE(_unpack)                 \
     if (UNEXPECTED(_unpack->deps <= 0)) {                        \
         *obj = _unpack->retval;                                  \
     } else {                                                     \
-        *obj = msgpack_var_push(_unpack->var_hash);              \
+        *obj = msgpack_var_push(&_unpack->var_hash);              \
     }
 
 #define MSGPACK_UNSERIALIZE_DEC_DEP(_unpack)                     \
@@ -41,10 +41,10 @@ typedef struct {
 
 #define MSGPACK_UNSERIALIZE_FINISH_ITEM(_unpack, _v1, _v2)       \
     if ((_v2) && MSGPACK_IS_STACK_VALUE((_v2))) {                \
-        msgpack_stack_pop(_unpack->var_hash, (_v2));             \
+        msgpack_stack_pop(&_unpack->var_hash, (_v2));             \
     }                                                            \
     if ((_v1) && MSGPACK_IS_STACK_VALUE((_v1))) {                \
-        msgpack_stack_pop(_unpack->var_hash, (_v1));             \
+        msgpack_stack_pop(&_unpack->var_hash, (_v1));             \
     }                                                            \
     MSGPACK_UNSERIALIZE_DEC_DEP(_unpack);
 
@@ -327,6 +327,7 @@ void msgpack_unserialize_var_destroy(msgpack_unserialize_data_t *var_hashx, zend
 void msgpack_unserialize_init(msgpack_unserialize_data *unpack) /* {{{ */ {
     unpack->deps = 0;
     unpack->type = MSGPACK_SERIALIZE_TYPE_NONE;
+    msgpack_unserialize_var_init(&unpack->var_hash);
 }
 /* }}} */
 
@@ -598,7 +599,7 @@ int msgpack_unserialize_map_item(msgpack_unserialize_data *unpack, zval **contai
                     int type = unpack->type;
 
                     unpack->type = MSGPACK_SERIALIZE_TYPE_NONE;
-                    if ((rval = msgpack_var_access(unpack->var_hash, Z_LVAL_P(val) - 1)) == NULL)  {
+                    if ((rval = msgpack_var_access(&unpack->var_hash, Z_LVAL_P(val) - 1)) == NULL)  {
                         if (UNEXPECTED(Z_LVAL_P(val) == 1 /* access the retval */)) {
                             rval = unpack->retval;
                         } else {
@@ -745,13 +746,13 @@ int msgpack_unserialize_map_item(msgpack_unserialize_data *unpack, zval **contai
     }
 
     if (MSGPACK_IS_STACK_VALUE(val)) {
-        msgpack_stack_pop(unpack->var_hash, val);
+        msgpack_stack_pop(&unpack->var_hash, val);
     } else {
         msgpack_var_replace(val, nval);
     }
     if (MSGPACK_IS_STACK_VALUE(key)) {
         /* just in case for malformed data */
-        msgpack_stack_pop(unpack->var_hash, key);
+        msgpack_stack_pop(&unpack->var_hash, key);
     }
 
     deps = unpack->deps - 1;

msgpack_unpack.h

@@ -28,11 +28,11 @@ typedef struct _msgpack_unserialize_data {
 typedef struct {
     zval *retval;
     const char *eof;
-    msgpack_unserialize_data_t *var_hash;
     int type;
     unsigned int count;
     long deps;
     long stack[MSGPACK_EMBED_STACK_SIZE];
+    msgpack_unserialize_data_t var_hash;
 } msgpack_unserialize_data;
 
 void msgpack_unserialize_var_init(msgpack_unserialize_data_t *var_hashx);