@@ -997,23 +997,32 @@ static void apc_cache_init_entry(
997
997
}
998
998
/* }}} */
999
999
1000
+ static inline void array_add_long (zval * array , zend_string * key , zend_long lval ) {
1001
+ zval zv ;
1002
+ ZVAL_LONG (& zv , lval );
1003
+ zend_hash_add_new (Z_ARRVAL_P (array ), key , & zv );
1004
+ }
1005
+
1000
1006
/* {{{ apc_cache_link_info */
1001
1007
static zval apc_cache_link_info (apc_cache_t * cache , apc_cache_entry_t * p )
1002
1008
{
1003
- zval link ;
1004
-
1009
+ zval link , zv ;
1005
1010
array_init (& link );
1006
1011
1007
- add_assoc_str (& link , "info" , zend_string_dup (p -> key , 0 ));
1008
- add_assoc_long (& link , "ttl" , p -> ttl );
1012
+ ZVAL_STR (& zv , zend_string_dup (p -> key , 0 ));
1013
+ zend_hash_add_new (Z_ARRVAL (link ), apc_str_info , & zv );
1014
+
1015
+ array_add_long (& link , apc_str_ttl , p -> ttl );
1009
1016
1010
- add_assoc_double (& link , "num_hits" , (double )p -> nhits );
1011
- add_assoc_long (& link , "mtime" , p -> mtime );
1012
- add_assoc_long (& link , "creation_time" , p -> ctime );
1013
- add_assoc_long (& link , "deletion_time" , p -> dtime );
1014
- add_assoc_long (& link , "access_time" , p -> atime );
1015
- add_assoc_long (& link , "ref_count" , p -> ref_count );
1016
- add_assoc_long (& link , "mem_size" , p -> mem_size );
1017
+ ZVAL_DOUBLE (& zv , (double ) p -> nhits );
1018
+ zend_hash_add_new (Z_ARRVAL (link ), apc_str_num_hits , & zv );
1019
+
1020
+ array_add_long (& link , apc_str_mtime , p -> mtime );
1021
+ array_add_long (& link , apc_str_creation_time , p -> ctime );
1022
+ array_add_long (& link , apc_str_deletion_time , p -> dtime );
1023
+ array_add_long (& link , apc_str_access_time , p -> atime );
1024
+ array_add_long (& link , apc_str_ref_count , p -> ref_count );
1025
+ array_add_long (& link , apc_str_mem_size , p -> mem_size );
1017
1026
1018
1027
return link ;
1019
1028
}
@@ -1090,12 +1099,6 @@ PHP_APCU_API zend_bool apc_cache_info(zval *info, apc_cache_t *cache, zend_bool
1090
1099
}
1091
1100
/* }}} */
1092
1101
1093
- static inline void array_add_long (zval * array , zend_string * key , zend_long lval ) {
1094
- zval zv ;
1095
- ZVAL_LONG (& zv , lval );
1096
- zend_hash_add_new (Z_ARRVAL_P (array ), key , & zv );
1097
- }
1098
-
1099
1102
/*
1100
1103
fetches information about the key provided
1101
1104
*/
0 commit comments