diff options
Diffstat (limited to 'ext/mysqlnd/mysqlnd_statistics.h')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_statistics.h | 116 |
1 files changed, 61 insertions, 55 deletions
diff --git a/ext/mysqlnd/mysqlnd_statistics.h b/ext/mysqlnd/mysqlnd_statistics.h index 08b28f36ed..2ac4f28d9e 100644 --- a/ext/mysqlnd/mysqlnd_statistics.h +++ b/ext/mysqlnd/mysqlnd_statistics.h @@ -30,86 +30,92 @@ extern MYSQLND_STATS *mysqlnd_global_stats; #define MYSQLND_INC_CONN_STATISTIC(conn_stats, statistic) \ { \ - tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \ - mysqlnd_global_stats->values[statistic]++; \ - tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \ - \ - if ((conn_stats)) { \ - ((MYSQLND_STATS *) conn_stats)->values[statistic]++; \ - } \ + if (mysqlnd_global_stats) { \ + tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \ + mysqlnd_global_stats->values[statistic]++; \ + tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \ + if ((conn_stats)) { \ + ((MYSQLND_STATS *) conn_stats)->values[statistic]++; \ + } \ + }\ } #define MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn_stats, statistic, value) \ { \ - my_uint64 v = (value); \ - \ - tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \ - mysqlnd_global_stats->values[statistic]+= v; \ - tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \ - \ - if ((conn_stats)) { \ - ((MYSQLND_STATS *) conn_stats)->values[statistic]+= v; \ - } \ - } + if (mysqlnd_global_stats) {\ + my_uint64 v = (value); \ + \ + tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \ + mysqlnd_global_stats->values[statistic] += v; \ + tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \ + if ((conn_stats)) { \ + ((MYSQLND_STATS *) conn_stats)->values[statistic]+= v; \ + } \ + }\ + } #define MYSQLND_INC_CONN_STATISTIC_W_VALUE3(conn_stats, statistic1, value1, statistic2, value2, statistic3, value3) \ { \ - my_uint64 v1 = (value1); \ - my_uint64 v2 = (value2); \ - my_uint64 v3 = (value3); \ - \ - tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \ - mysqlnd_global_stats->values[statistic1]+= v1; \ - mysqlnd_global_stats->values[statistic2]+= v2; \ - mysqlnd_global_stats->values[statistic3]+= v3; \ - tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \ - \ - if ((conn_stats)) { \ - ((MYSQLND_STATS *) conn_stats)->values[statistic1]+= v1; \ - ((MYSQLND_STATS *) conn_stats)->values[statistic2]+= v2; \ - ((MYSQLND_STATS *) conn_stats)->values[statistic3]+= v3; \ + if (mysqlnd_global_stats) { \ + my_uint64 v1 = (value1); \ + my_uint64 v2 = (value2); \ + my_uint64 v3 = (value3); \ + \ + tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \ + mysqlnd_global_stats->values[statistic1]+= v1; \ + mysqlnd_global_stats->values[statistic2]+= v2; \ + mysqlnd_global_stats->values[statistic3]+= v3; \ + tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \ + if ((conn_stats)) { \ + ((MYSQLND_STATS *) conn_stats)->values[statistic1]+= v1; \ + ((MYSQLND_STATS *) conn_stats)->values[statistic2]+= v2; \ + ((MYSQLND_STATS *) conn_stats)->values[statistic3]+= v3; \ + } \ } \ - } + } #else /* NON-ZTS */ #define MYSQLND_INC_CONN_STATISTIC(conn_stats, statistic) \ { \ - mysqlnd_global_stats->values[statistic]++; \ - \ - if ((conn_stats)) { \ - ((MYSQLND_STATS *) conn_stats)->values[statistic]++; \ + if (mysqlnd_global_stats) { \ + mysqlnd_global_stats->values[statistic]++; \ + if ((conn_stats)) { \ + ((MYSQLND_STATS *) conn_stats)->values[statistic]++; \ + } \ } \ } #define MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn_stats, statistic, value) \ { \ - my_uint64 v = (value); \ + my_uint64 v = (value); \ \ - mysqlnd_global_stats->values[statistic]+= v; \ - \ - if ((conn_stats)) { \ - ((MYSQLND_STATS *) conn_stats)->values[statistic]+= v; \ + if (mysqlnd_global_stats) { \ + mysqlnd_global_stats->values[statistic]+= v; \ + if ((conn_stats)) { \ + ((MYSQLND_STATS *) conn_stats)->values[statistic]+= v; \ + } \ } \ } #define MYSQLND_INC_CONN_STATISTIC_W_VALUE3(conn_stats, statistic1, value1, statistic2, value2, statistic3, value3) \ - { \ - my_uint64 v1 = (value1); \ - my_uint64 v2 = (value2); \ - my_uint64 v3 = (value3); \ - \ - mysqlnd_global_stats->values[statistic1]+= v1; \ - mysqlnd_global_stats->values[statistic2]+= v2; \ - mysqlnd_global_stats->values[statistic3]+= v3; \ - \ - if ((conn_stats)) { \ - ((MYSQLND_STATS *) conn_stats)->values[statistic1]+= v1; \ - ((MYSQLND_STATS *) conn_stats)->values[statistic2]+= v2; \ - ((MYSQLND_STATS *) conn_stats)->values[statistic3]+= v3; \ + { \ \ + if (mysqlnd_global_stats) { \ + my_uint64 v1 = (value1); \ + my_uint64 v2 = (value2); \ + my_uint64 v3 = (value3); \ + \ + mysqlnd_global_stats->values[statistic1]+= v1; \ + mysqlnd_global_stats->values[statistic2]+= v2; \ + mysqlnd_global_stats->values[statistic3]+= v3; \ + if ((conn_stats)) { \ + ((MYSQLND_STATS *) conn_stats)->values[statistic1]+= v1; \ + ((MYSQLND_STATS *) conn_stats)->values[statistic2]+= v2; \ + ((MYSQLND_STATS *) conn_stats)->values[statistic3]+= v3; \ + } \ } \ - } + } #endif |