diff options
Diffstat (limited to 'ext/mysqlnd/mysqlnd_statistics.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_statistics.c | 47 |
1 files changed, 25 insertions, 22 deletions
diff --git a/ext/mysqlnd/mysqlnd_statistics.c b/ext/mysqlnd/mysqlnd_statistics.c index 8acc056093..7f12a72511 100644 --- a/ext/mysqlnd/mysqlnd_statistics.c +++ b/ext/mysqlnd/mysqlnd_statistics.c @@ -25,9 +25,7 @@ #include "mysqlnd_debug.h" -/* {{{ mysqlnd_stats_values_names - */ - +/* {{{ mysqlnd_stats_values_names */ const MYSQLND_STRING mysqlnd_stats_values_names[STAT_LAST] = { { MYSQLND_STR_W_LEN("bytes_sent") }, @@ -113,8 +111,10 @@ const MYSQLND_STRING mysqlnd_stats_values_names[STAT_LAST] = { MYSQLND_STR_W_LEN("mem_free_amount") }, { MYSQLND_STR_W_LEN("mem_estrndup_count") }, { MYSQLND_STR_W_LEN("mem_strndup_count") }, - { MYSQLND_STR_W_LEN("mem_estndup_count") }, + { MYSQLND_STR_W_LEN("mem_estrdup_count") }, { MYSQLND_STR_W_LEN("mem_strdup_count") }, + { MYSQLND_STR_W_LEN("mem_edupl_count") }, + { MYSQLND_STR_W_LEN("mem_dupl_count") }, { MYSQLND_STR_W_LEN("proto_text_fetched_null") }, { MYSQLND_STR_W_LEN("proto_text_fetched_bit") }, { MYSQLND_STR_W_LEN("proto_text_fetched_tinyint") }, @@ -212,25 +212,9 @@ mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, const MYSQLND_STRING /* }}} */ -/* {{{ _mysqlnd_get_client_stats */ -PHPAPI void -_mysqlnd_get_client_stats(zval *return_value ZEND_FILE_LINE_DC) -{ - MYSQLND_STATS stats, *stats_ptr = mysqlnd_global_stats; - DBG_ENTER("_mysqlnd_get_client_stats"); - if (!stats_ptr) { - memset(&stats, 0, sizeof(stats)); - stats_ptr = &stats; - } - mysqlnd_fill_stats_hash(stats_ptr, mysqlnd_stats_values_names, return_value ZEND_FILE_LINE_CC); - DBG_VOID_RETURN; -} -/* }}} */ - - /* {{{ mysqlnd_stats_init */ PHPAPI void -mysqlnd_stats_init(MYSQLND_STATS ** stats, size_t statistic_count, int persistent) +mysqlnd_stats_init(MYSQLND_STATS ** stats, const size_t statistic_count, const zend_bool persistent) { *stats = pecalloc(1, sizeof(MYSQLND_STATS), persistent); if (*stats == NULL) { @@ -249,7 +233,7 @@ mysqlnd_stats_init(MYSQLND_STATS ** stats, size_t statistic_count, int persisten /* {{{ mysqlnd_stats_end */ PHPAPI void -mysqlnd_stats_end(MYSQLND_STATS * stats, int persistent) +mysqlnd_stats_end(MYSQLND_STATS * stats, const zend_bool persistent) { #ifdef ZTS tsrm_mutex_free(stats->LOCK_access); @@ -295,6 +279,25 @@ mysqlnd_stats_reset_triggers(MYSQLND_STATS * const stats) /* }}} */ +/************ MYSQLND specific code **********/ + +/* {{{ _mysqlnd_get_client_stats */ +PHPAPI void +_mysqlnd_get_client_stats(MYSQLND_STATS * stats_ptr, zval *return_value ZEND_FILE_LINE_DC) +{ + MYSQLND_STATS stats; + DBG_ENTER("_mysqlnd_get_client_stats"); + if (!stats_ptr) { + memset(&stats, 0, sizeof(stats)); + stats_ptr = &stats; + } + mysqlnd_fill_stats_hash(stats_ptr, mysqlnd_stats_values_names, return_value ZEND_FILE_LINE_CC); + DBG_VOID_RETURN; +} +/* }}} */ + + + /* * Local variables: * tab-width: 4 |