summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_statistics.h
diff options
context:
space:
mode:
Diffstat (limited to 'ext/mysqlnd/mysqlnd_statistics.h')
-rw-r--r--ext/mysqlnd/mysqlnd_statistics.h103
1 files changed, 69 insertions, 34 deletions
diff --git a/ext/mysqlnd/mysqlnd_statistics.h b/ext/mysqlnd/mysqlnd_statistics.h
index dc36aa777c..eb9bdb3190 100644
--- a/ext/mysqlnd/mysqlnd_statistics.h
+++ b/ext/mysqlnd/mysqlnd_statistics.h
@@ -39,7 +39,8 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
#define MYSQLND_INC_GLOBAL_STATISTIC(statistic) \
{ \
if (MYSQLND_G(collect_statistics) && (statistic) != STAT_LAST) { \
- DBG_INF_FMT("Global stat increase [%s]", mysqlnd_stats_values_names[(statistic)]); \
+ DBG_INF_FMT("Global stat increase [%s]", mysqlnd_stats_values_names[(statistic)].s); \
+ \
tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
mysqlnd_global_stats->values[(statistic)]++; \
tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
@@ -49,7 +50,8 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
#define MYSQLND_DEC_CONN_STATISTIC(conn_stats, statistic) \
{ \
if (MYSQLND_G(collect_statistics) && (statistic) != STAT_LAST) { \
- DBG_INF_FMT("Global&conn stat decrease [%s]", mysqlnd_stats_values_names[(statistic)]); \
+ DBG_INF_FMT("Global&conn stat decrease [%s]", mysqlnd_stats_values_names[(statistic)].s); \
+ \
tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
mysqlnd_global_stats->values[(statistic)]--; \
tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
@@ -64,11 +66,15 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
if (MYSQLND_G(collect_statistics)) { \
uint64_t v1 = (uint64_t) (value1); \
uint64_t v2 = (uint64_t) (value2); \
- DBG_INF_FMT("Global stat increase [%s] [%s]", mysqlnd_stats_values_names[(statistic1)], mysqlnd_stats_values_names[(statistic2)]); \
+ enum_mysqlnd_collected_stats _s1 = (statistic1);\
+ enum_mysqlnd_collected_stats _s2 = (statistic2);\
+ \
+ if (_s1 != STAT_LAST) DBG_INF_FMT("Global stat increase1 [%s]", mysqlnd_stats_values_names[_s1].s); \
+ if (_s2 != STAT_LAST) DBG_INF_FMT("Global stat increase2 [%s]", mysqlnd_stats_values_names[_s2].s); \
\
tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
- if (statistic1 != STAT_LAST) mysqlnd_global_stats->values[(statistic1)]+= v1; \
- if (statistic2 != STAT_LAST) mysqlnd_global_stats->values[(statistic2)]+= v2; \
+ if (_s1 != STAT_LAST) mysqlnd_global_stats->values[_s1]+= v1; \
+ if (_s2 != STAT_LAST) mysqlnd_global_stats->values[_s2]+= v2; \
tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
}\
}
@@ -76,7 +82,8 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
#define MYSQLND_INC_CONN_STATISTIC(conn_stats, statistic) \
{ \
if (MYSQLND_G(collect_statistics) && (statistic) != STAT_LAST) { \
- DBG_INF_FMT("Global&Conn stat increase [%s]", mysqlnd_stats_values_names[(statistic)]); \
+ DBG_INF_FMT("Global&Conn stat increase [%s]", mysqlnd_stats_values_names[(statistic)].s); \
+ \
tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
mysqlnd_global_stats->values[(statistic)]++; \
tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
@@ -90,7 +97,8 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
{ \
if (MYSQLND_G(collect_statistics) && (statistic) != STAT_LAST) { \
uint64_t v = (uint64_t) (value); \
- DBG_INF_FMT("Global&Conn stat increase w value [%s]", mysqlnd_stats_values_names[(statistic)]); \
+ DBG_INF_FMT("Global&Conn stat increase w value [%s]", mysqlnd_stats_values_names[(statistic)].s); \
+ \
tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
mysqlnd_global_stats->values[(statistic)] += v; \
tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
@@ -105,14 +113,19 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
if (MYSQLND_G(collect_statistics)) { \
uint64_t v1 = (uint64_t) (value1); \
uint64_t v2 = (uint64_t) (value2); \
+ enum_mysqlnd_collected_stats _s1 = (statistic1);\
+ enum_mysqlnd_collected_stats _s2 = (statistic2);\
\
+ if (_s1 != STAT_LAST) DBG_INF_FMT("Global stat increase1 [%s]", mysqlnd_stats_values_names[_s1].s); \
+ if (_s2 != STAT_LAST) DBG_INF_FMT("Global stat increase2 [%s]", mysqlnd_stats_values_names[_s2].s); \
+ \
tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
- if (statistic1 != STAT_LAST) mysqlnd_global_stats->values[(statistic1)]+= v1; \
- if (statistic2 != STAT_LAST) mysqlnd_global_stats->values[(statistic2)]+= v2; \
+ if (_s1 != STAT_LAST) mysqlnd_global_stats->values[_s1]+= v1; \
+ if (_s2 != STAT_LAST) mysqlnd_global_stats->values[_s2]+= v2; \
tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
if ((conn_stats)) { \
- if (statistic1 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[(statistic1)]+= v1; \
- if (statistic2 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[(statistic2)]+= v2; \
+ if (_s1 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[_s1]+= v1; \
+ if (_s2 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[_s2]+= v2; \
} \
} \
}
@@ -124,16 +137,23 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
uint64_t v1 = (uint64_t) (value1); \
uint64_t v2 = (uint64_t) (value2); \
uint64_t v3 = (uint64_t) (value3); \
+ enum_mysqlnd_collected_stats _s1 = (statistic1); \
+ enum_mysqlnd_collected_stats _s2 = (statistic2); \
+ enum_mysqlnd_collected_stats _s3 = (statistic3); \
+ \
+ if (_s1 != STAT_LAST) DBG_INF_FMT("Global stat increase1 [%s]", mysqlnd_stats_values_names[_s1].s); \
+ if (_s2 != STAT_LAST) DBG_INF_FMT("Global stat increase2 [%s]", mysqlnd_stats_values_names[_s2].s); \
+ if (_s3 != STAT_LAST) DBG_INF_FMT("Global stat increase3 [%s]", mysqlnd_stats_values_names[_s3].s); \
\
tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
- if (statistic1 != STAT_LAST) mysqlnd_global_stats->values[(statistic1)]+= v1; \
- if (statistic2 != STAT_LAST) mysqlnd_global_stats->values[(statistic2)]+= v2; \
- if (statistic3 != STAT_LAST) mysqlnd_global_stats->values[(statistic3)]+= v3; \
+ if (_s1 != STAT_LAST) mysqlnd_global_stats->values[_s1]+= v1; \
+ if (_s2 != STAT_LAST) mysqlnd_global_stats->values[_s2]+= v2; \
+ if (_s3 != STAT_LAST) mysqlnd_global_stats->values[_s3]+= v3; \
tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
if ((conn_stats)) { \
- if (statistic1 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[(statistic1)]+= v1; \
- if (statistic2 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[(statistic2)]+= v2; \
- if (statistic3 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[(statistic3)]+= v3; \
+ if (_s1 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[_s1]+= v1; \
+ if (_s2 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[_s2]+= v2; \
+ if (_s3 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[_s3]+= v3; \
} \
} \
}
@@ -144,7 +164,7 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
#define MYSQLND_INC_GLOBAL_STATISTIC(statistic) \
{ \
if (MYSQLND_G(collect_statistics) && (statistic) != STAT_LAST) { \
- DBG_INF_FMT("Global stat increase [%s]", mysqlnd_stats_values_names[(statistic)]); \
+ DBG_INF_FMT("Global stat increase [%s]", mysqlnd_stats_values_names[(statistic)].s); \
mysqlnd_global_stats->values[(statistic)]++; \
} \
}
@@ -153,7 +173,7 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
#define MYSQLND_DEC_CONN_STATISTIC(conn_stats, statistic) \
{ \
if (MYSQLND_G(collect_statistics) && (statistic) != STAT_LAST) { \
- DBG_INF_FMT("Global&Conn stat decrease [%s]", mysqlnd_stats_values_names[(statistic)]); \
+ DBG_INF_FMT("Global&Conn stat decrease [%s]", mysqlnd_stats_values_names[(statistic)].s); \
mysqlnd_global_stats->values[(statistic)]--; \
if ((conn_stats)) { \
((MYSQLND_STATS *) conn_stats)->values[(statistic)]--; \
@@ -166,17 +186,21 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
if (MYSQLND_G(collect_statistics)) { \
uint64_t v1 = (uint64_t) (value1); \
uint64_t v2 = (uint64_t) (value2); \
- DBG_INF_FMT("Global stat increase [%s] [%s]", mysqlnd_stats_values_names[(statistic1)], mysqlnd_stats_values_names[(statistic2)]); \
+ enum_mysqlnd_collected_stats _s1 = (statistic1);\
+ enum_mysqlnd_collected_stats _s2 = (statistic2);\
+ \
+ if (_s1 != STAT_LAST) DBG_INF_FMT("Global stat increase1 [%s]", mysqlnd_stats_values_names[_s1].s); \
+ if (_s2 != STAT_LAST) DBG_INF_FMT("Global stat increase2 [%s]", mysqlnd_stats_values_names[_s2].s); \
\
- if (statistic1 != STAT_LAST) mysqlnd_global_stats->values[(statistic1)]+= v1; \
- if (statistic2 != STAT_LAST) mysqlnd_global_stats->values[(statistic2)]+= v2; \
+ if (_s1 != STAT_LAST) mysqlnd_global_stats->values[_s1]+= v1; \
+ if (_s2 != STAT_LAST) mysqlnd_global_stats->values[_s2]+= v2; \
}\
}
#define MYSQLND_INC_CONN_STATISTIC(conn_stats, statistic) \
{ \
if (MYSQLND_G(collect_statistics) && (statistic) != STAT_LAST) { \
- DBG_INF_FMT("Global&Conn stat increase [%s]", mysqlnd_stats_values_names[(statistic)]); \
+ DBG_INF_FMT("Global&Conn stat increase [%s]", mysqlnd_stats_values_names[(statistic)].s); \
mysqlnd_global_stats->values[(statistic)]++; \
if ((conn_stats)) { \
((MYSQLND_STATS *) conn_stats)->values[(statistic)]++; \
@@ -188,7 +212,7 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
{ \
if (MYSQLND_G(collect_statistics) && (statistic) != STAT_LAST) { \
uint64_t v = (uint64_t) (value); \
- DBG_INF_FMT("Global&Conn stats increase w value [%s]", mysqlnd_stats_values_names[(statistic)]); \
+ DBG_INF_FMT("Global&Conn stats increase w value [%s]", mysqlnd_stats_values_names[(statistic)].s); \
mysqlnd_global_stats->values[(statistic)] += v; \
if ((conn_stats)) { \
((MYSQLND_STATS *) conn_stats)->values[(statistic)] += v; \
@@ -201,12 +225,16 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
if (MYSQLND_G(collect_statistics)) { \
uint64_t v1 = (uint64_t) (value1); \
uint64_t v2 = (uint64_t) (value2); \
+ enum_mysqlnd_collected_stats _s1 = (statistic1);\
+ enum_mysqlnd_collected_stats _s2 = (statistic2);\
+ if (_s1 != STAT_LAST) DBG_INF_FMT("Global stat increase1 [%s]", mysqlnd_stats_values_names[_s1].s); \
+ if (_s2 != STAT_LAST) DBG_INF_FMT("Global stat increase2 [%s]", mysqlnd_stats_values_names[_s2].s); \
\
- if (statistic1 != STAT_LAST) mysqlnd_global_stats->values[(statistic1)]+= v1; \
- if (statistic2 != STAT_LAST) mysqlnd_global_stats->values[(statistic2)]+= v2; \
+ if (_s1 != STAT_LAST) mysqlnd_global_stats->values[_s1]+= v1; \
+ if (_s2 != STAT_LAST) mysqlnd_global_stats->values[_s2]+= v2; \
if ((conn_stats)) { \
- if (statistic1 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[(statistic1)]+= v1; \
- if (statistic2 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[(statistic2)]+= v2; \
+ if (_s1 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[_s1]+= v1; \
+ if (_s2 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[_s2]+= v2; \
} \
} \
}
@@ -217,14 +245,21 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
uint64_t v1 = (uint64_t) (value1); \
uint64_t v2 = (uint64_t) (value2); \
uint64_t v3 = (uint64_t) (value3); \
+ enum_mysqlnd_collected_stats _s1 = (statistic1); \
+ enum_mysqlnd_collected_stats _s2 = (statistic2); \
+ enum_mysqlnd_collected_stats _s3 = (statistic3); \
+ \
+ if (_s1 != STAT_LAST) DBG_INF_FMT("Global stat increase1 [%s]", mysqlnd_stats_values_names[_s1].s); \
+ if (_s2 != STAT_LAST) DBG_INF_FMT("Global stat increase2 [%s]", mysqlnd_stats_values_names[_s2].s); \
+ if (_s3 != STAT_LAST) DBG_INF_FMT("Global stat increase3 [%s]", mysqlnd_stats_values_names[_s3].s); \
\
- if (statistic1 != STAT_LAST) mysqlnd_global_stats->values[(statistic1)]+= v1; \
- if (statistic2 != STAT_LAST) mysqlnd_global_stats->values[(statistic2)]+= v2; \
- if (statistic3 != STAT_LAST) mysqlnd_global_stats->values[(statistic3)]+= v3; \
+ if (_s1 != STAT_LAST) mysqlnd_global_stats->values[_s1]+= v1; \
+ if (_s2 != STAT_LAST) mysqlnd_global_stats->values[_s2]+= v2; \
+ if (_s3 != STAT_LAST) mysqlnd_global_stats->values[_s3]+= v3; \
if ((conn_stats)) { \
- if (statistic1 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[(statistic1)]+= v1; \
- if (statistic2 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[(statistic2)]+= v2; \
- if (statistic3 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[(statistic3)]+= v3; \
+ if (_s1 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[_s1]+= v1; \
+ if (_s2 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[_s2]+= v2; \
+ if (_s3 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[_s3]+= v3; \
} \
} \
}
View Lorry Controller Status