missed to commit in 5_3, here it comes, reusability of stats

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index b3994e26c21b3009cb1eded641c2a262003b0112..23af6dca9274da205503d3b1aa2b32051c3e39f6 100644 (file)
--- a/ext/mysqlnd/mysqlnd.c
+++ b/ext/mysqlnd/mysqlnd.c
@@ -2029,7 +2029,7 @@ MYSQLND_METHOD(mysqlnd_conn, get_connection_stats)(const MYSQLND * const conn,
 {
        DBG_ENTER("mysqlnd_conn::get_connection_stats");
        DBG_INF_FMT("conn=%llu", conn->thread_id);
-       mysqlnd_fill_stats_hash(conn->stats, return_value TSRMLS_CC ZEND_FILE_LINE_CC);
+       mysqlnd_fill_stats_hash(conn->stats, mysqlnd_stats_values_names, return_value TSRMLS_CC ZEND_FILE_LINE_CC);
        DBG_VOID_RETURN;
 }
 /* }}} */

diff --git a/ext/mysqlnd/mysqlnd_statistics.c b/ext/mysqlnd/mysqlnd_statistics.c
index 756d4ce2281b66a1e42e8099ed1c54d323da7f9d..e52414b3e8c66ce183c9ce97e725befa928c7256 100644 (file)
--- a/ext/mysqlnd/mysqlnd_statistics.c
+++ b/ext/mysqlnd/mysqlnd_statistics.c
@@ -190,13 +190,13 @@ const MYSQLND_STRING mysqlnd_stats_values_names[STAT_LAST] =
 
 
 /* {{{ mysqlnd_fill_stats_hash */
-void
-mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC)
+PHPAPI void
+mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, const MYSQLND_STRING * names, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC)
 {
        unsigned int i;
 
-       mysqlnd_array_init(return_value, STAT_LAST);
-       for (i = 0; i < STAT_LAST; i++) {
+       mysqlnd_array_init(return_value, stats->count);
+       for (i = 0; i < stats->count; i++) {
 #if PHP_MAJOR_VERSION >= 6
                UChar *ustr, *tstr;
                int ulen, tlen;
@@ -205,15 +205,13 @@ mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, zval *return_value TS
                
                sprintf((char *)&tmp, MYSQLND_LLU_SPEC, stats->values[i]);
 #if PHP_MAJOR_VERSION >= 6
-               zend_string_to_unicode(UG(utf8_conv), &ustr, &ulen, mysqlnd_stats_values_names[i].s,
-                                                               mysqlnd_stats_values_names[i].l + 1 TSRMLS_CC);
+               zend_string_to_unicode(UG(utf8_conv), &ustr, &ulen, names[i].s, names[i].l + 1 TSRMLS_CC);
                zend_string_to_unicode(UG(utf8_conv), &tstr, &tlen, tmp, strlen(tmp) + 1 TSRMLS_CC);
                add_u_assoc_unicode_ex(return_value, IS_UNICODE, ZSTR(ustr), ulen, tstr, 1);
                efree(ustr);
                efree(tstr);
 #else
-               add_assoc_string_ex(return_value, mysqlnd_stats_values_names[i].s,
-                                                       mysqlnd_stats_values_names[i].l + 1, tmp, 1);
+               add_assoc_string_ex(return_value, names[i].s, names[i].l + 1, tmp, 1);
 #endif
        }
 }
@@ -229,7 +227,7 @@ PHPAPI void _mysqlnd_get_client_stats(zval *return_value TSRMLS_DC ZEND_FILE_LIN
                memset(&stats, 0, sizeof(stats));
                stats_ptr = &stats;
        }
-       mysqlnd_fill_stats_hash(stats_ptr, return_value TSRMLS_CC ZEND_FILE_LINE_CC);
+       mysqlnd_fill_stats_hash(stats_ptr, mysqlnd_stats_values_names, return_value TSRMLS_CC ZEND_FILE_LINE_CC);
        DBG_VOID_RETURN;
 }
 /* }}} */
@@ -292,7 +290,7 @@ mysqlnd_stats_reset_triggers(MYSQLND_STATS * const stats TSRMLS_DC)
        DBG_ENTER("mysqlnd_stats_reset_trigger");
        if (stats) {
                MYSQLND_STATS_LOCK(stats);
-               memset(stats->triggers, 0, STAT_LAST * sizeof(mysqlnd_stat_trigger));
+               memset(stats->triggers, 0, stats->count * sizeof(mysqlnd_stat_trigger));
                MYSQLND_STATS_UNLOCK(stats);
        }
        DBG_RETURN(ret);

diff --git a/ext/mysqlnd/mysqlnd_statistics.h b/ext/mysqlnd/mysqlnd_statistics.h
index fce783803fcff4f994c232fe55f356ac4d35c05f..7cc1667b18dd92f85aacc7bf39760d6bc9f2c47f 100644 (file)
--- a/ext/mysqlnd/mysqlnd_statistics.h
+++ b/ext/mysqlnd/mysqlnd_statistics.h
@@ -163,9 +163,7 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
         MYSQLND_INC_STATISTIC_W_VALUE3(MYSQLND_G(collect_statistics), (conn_stats), (statistic1), (value1), (statistic2), (value2), (statistic3), (value3));
 
 
-void mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, zval *return_value
-                                                        TSRMLS_DC ZEND_FILE_LINE_DC);
-
+PHPAPI void mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, const MYSQLND_STRING * names, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC);
 
 PHPAPI void mysqlnd_stats_init(MYSQLND_STATS ** stats, size_t statistic_count);
 PHPAPI void mysqlnd_stats_end(MYSQLND_STATS * stats);