1 files changed, 88 insertions, 138 deletions

diff --git a/ext/mysqlnd/mysqlnd_statistics.h b/ext/mysqlnd/mysqlnd_statistics.h
index eb9bdb3190..80aca9d6c1 100644
--- a/ext/mysqlnd/mysqlnd_statistics.h
+++ b/ext/mysqlnd/mysqlnd_statistics.h
@@ -35,15 +35,31 @@ typedef struct st_mysqlnd_string
 extern const MYSQLND_STRING mysqlnd_stats_values_names[];
 
 #ifdef ZTS
+#define MYSQLND_STATS_LOCK(stats) tsrm_mutex_lock((stats)->LOCK_access)
+#define MYSQLND_STATS_UNLOCK(stats) tsrm_mutex_unlock((stats)->LOCK_access)
+#else
+#define MYSQLND_STATS_LOCK(stats)
+#define MYSQLND_STATS_UNLOCK(stats)
+#endif
+
+#define MYSQLND_CHECK_AND_CALL_HANDLER(stats, statistic, value) \
+			if ((stats)->handlers[(statistic)] && (stats)->in_handler == FALSE) { \
+				(stats)->in_handler = TRUE; \
+				(stats)->handlers[(statistic)]((stats), (statistic), (value) TSRMLS_CC); \
+				(stats)->in_handler = FALSE; \
+			} \
+
+
 
 #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)].s); \
 			\
- 		tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
+ 		MYSQLND_STATS_LOCK(mysqlnd_global_stats); \
+		MYSQLND_CHECK_AND_CALL_HANDLER(mysqlnd_global_stats, (statistic), 1); \
 		mysqlnd_global_stats->values[(statistic)]++; \
-		tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
+ 		MYSQLND_STATS_UNLOCK(mysqlnd_global_stats); \
 	}\
  }
 
@@ -52,11 +68,12 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
  	if (MYSQLND_G(collect_statistics) && (statistic) != STAT_LAST) { \
 		DBG_INF_FMT("Global&conn stat decrease [%s]", mysqlnd_stats_values_names[(statistic)].s); \
 			\
- 		tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
+ 		MYSQLND_STATS_LOCK(mysqlnd_global_stats); \
+		MYSQLND_CHECK_AND_CALL_HANDLER(mysqlnd_global_stats, (statistic), -1); \
 		mysqlnd_global_stats->values[(statistic)]--; \
-		tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
-		if ((conn_stats)) { \
-			((MYSQLND_STATS *) conn_stats)->values[(statistic)]--; \
+ 		MYSQLND_STATS_UNLOCK(mysqlnd_global_stats); \
+		if ((conn_stats)) {  \
+			MYSQLND_CHECK_AND_CALL_HANDLER((conn_stats), (statistic), -1); \
 		} \
 	}\
  }
@@ -72,10 +89,16 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
 		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 (_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); \
+ 		MYSQLND_STATS_LOCK(mysqlnd_global_stats); \
+		if (_s1 != STAT_LAST) { \
+			MYSQLND_CHECK_AND_CALL_HANDLER(mysqlnd_global_stats, _s1, v1); \
+			mysqlnd_global_stats->values[_s1]+= v1; \
+		} \
+		if (_s2 != STAT_LAST) { \
+			MYSQLND_CHECK_AND_CALL_HANDLER(mysqlnd_global_stats, _s2, v2); \
+			mysqlnd_global_stats->values[_s2]+= v2; \
+		} \
+ 		MYSQLND_STATS_UNLOCK(mysqlnd_global_stats); \
 	}\
  }
 
@@ -84,11 +107,13 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
  	if (MYSQLND_G(collect_statistics) && (statistic) != STAT_LAST) { \
 		DBG_INF_FMT("Global&Conn stat increase [%s]", mysqlnd_stats_values_names[(statistic)].s); \
 			\
- 		tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
+ 		MYSQLND_STATS_LOCK(mysqlnd_global_stats); \
+		MYSQLND_CHECK_AND_CALL_HANDLER(mysqlnd_global_stats, (statistic), 1); \
 		mysqlnd_global_stats->values[(statistic)]++; \
-		tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
-		if ((conn_stats)) { \
-			((MYSQLND_STATS *) conn_stats)->values[(statistic)]++; \
+ 		MYSQLND_STATS_UNLOCK(mysqlnd_global_stats); \
+		if (conn_stats) { \
+			MYSQLND_CHECK_AND_CALL_HANDLER((conn_stats), (statistic), 1); \
+			(conn_stats)->values[(statistic)]++; \
 		} \
 	}\
  }
@@ -99,11 +124,13 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
 		uint64_t v = (uint64_t) (value); \
 		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_STATS_LOCK(mysqlnd_global_stats); \
+		MYSQLND_CHECK_AND_CALL_HANDLER(mysqlnd_global_stats, (statistic), v); \
 		mysqlnd_global_stats->values[(statistic)] += v; \
-		tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
-		if ((conn_stats)) { \
-			((MYSQLND_STATS *) conn_stats)->values[(statistic)]+= v; \
+ 		MYSQLND_STATS_UNLOCK(mysqlnd_global_stats); \
+		if (conn_stats) { \
+			MYSQLND_CHECK_AND_CALL_HANDLER((conn_stats), (statistic), v); \
+			(conn_stats)->values[(statistic)]+= v; \
 		} \
 	}\
  }
@@ -119,13 +146,25 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
 		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 (_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 (_s1 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[_s1]+= v1; \
-			if (_s2 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[_s2]+= v2; \
+ 		MYSQLND_STATS_LOCK(mysqlnd_global_stats); \
+		if (_s1 != STAT_LAST) { \
+			MYSQLND_CHECK_AND_CALL_HANDLER(mysqlnd_global_stats, _s1, v1); \
+			mysqlnd_global_stats->values[_s1]+= v1; \
+		} \
+		if (_s2 != STAT_LAST) { \
+			MYSQLND_CHECK_AND_CALL_HANDLER(mysqlnd_global_stats, _s2, v2); \
+			mysqlnd_global_stats->values[_s2]+= v2; \
+		} \
+ 		MYSQLND_STATS_UNLOCK(mysqlnd_global_stats); \
+		if (conn_stats) { \
+			if (_s1 != STAT_LAST) { \
+				MYSQLND_CHECK_AND_CALL_HANDLER((conn_stats), _s1, v1); \
+				(conn_stats)->values[_s1]+= v1; \
+			} \
+			if (_s2 != STAT_LAST) { \
+				MYSQLND_CHECK_AND_CALL_HANDLER((conn_stats), _s2, v2); \
+				(conn_stats)->values[_s2]+= v2; \
+			} \
 		} \
 	} \
  }
@@ -145,126 +184,37 @@ extern const MYSQLND_STRING mysqlnd_stats_values_names[];
 		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 (_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 (_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; \
+ 		MYSQLND_STATS_LOCK(mysqlnd_global_stats); \
+		if (_s1 != STAT_LAST) { \
+			MYSQLND_CHECK_AND_CALL_HANDLER(mysqlnd_global_stats, _s1, v1); \
+			mysqlnd_global_stats->values[_s1]+= v1; \
 		} \
-	} \
- }
-
-
-#else /* NON-ZTS */
-
-#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)].s); \
-		mysqlnd_global_stats->values[(statistic)]++; \
-	} \
- }
-
-
-#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)].s); \
-		mysqlnd_global_stats->values[(statistic)]--; \
-		if ((conn_stats)) { \
-			((MYSQLND_STATS *) conn_stats)->values[(statistic)]--; \
+		if (_s2 != STAT_LAST) { \
+			MYSQLND_CHECK_AND_CALL_HANDLER(mysqlnd_global_stats, _s2, v2); \
+			mysqlnd_global_stats->values[_s2]+= v2; \
 		} \
-	} \
- }
-
-#define MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(statistic1, value1, statistic2, value2) \
- { \
- 	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 (_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)].s); \
-		mysqlnd_global_stats->values[(statistic)]++; \
-		if ((conn_stats)) { \
-			((MYSQLND_STATS *) conn_stats)->values[(statistic)]++; \
+		if (_s3 != STAT_LAST) { \
+			MYSQLND_CHECK_AND_CALL_HANDLER(mysqlnd_global_stats, _s3, v3); \
+			mysqlnd_global_stats->values[_s3]+= v3; \
 		} \
-	} \
- }
-
-#define MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn_stats, statistic, value) \
- { \
- 	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)].s); \
-		mysqlnd_global_stats->values[(statistic)] += v; \
-		if ((conn_stats)) { \
-			((MYSQLND_STATS *) conn_stats)->values[(statistic)] += v; \
-		} \
-	} \
- } 
-
-#define MYSQLND_INC_CONN_STATISTIC_W_VALUE2(conn_stats, statistic1, value1, statistic2, value2) \
- { \
- 	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 (_s1 != STAT_LAST) mysqlnd_global_stats->values[_s1]+= v1; \
-		if (_s2 != STAT_LAST) mysqlnd_global_stats->values[_s2]+= v2; \
-		if ((conn_stats)) { \
-			if (_s1 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[_s1]+= v1; \
-			if (_s2 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[_s2]+= v2; \
+ 		MYSQLND_STATS_UNLOCK(mysqlnd_global_stats); \
+		if (conn_stats) { \
+			if (_s1 != STAT_LAST) { \
+				MYSQLND_CHECK_AND_CALL_HANDLER((conn_stats), _s1, v1); \
+				(conn_stats)->values[_s1]+= v1; \
+			} \
+			if (_s2 != STAT_LAST) { \
+				MYSQLND_CHECK_AND_CALL_HANDLER((conn_stats), _s2, v2); \
+				(conn_stats)->values[_s2]+= v2; \
+			} \
+			if (_s3 != STAT_LAST) { \
+				MYSQLND_CHECK_AND_CALL_HANDLER((conn_stats), _s3, v3); \
+				(conn_stats)->values[_s3]+= v3; \
+			} \
 		} \
 	} \
  }
 
-#define MYSQLND_INC_CONN_STATISTIC_W_VALUE3(conn_stats, statistic1, value1, statistic2, value2, statistic3, value3) \
- { \
- 	if (MYSQLND_G(collect_statistics)) { \
-		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 (_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 (_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; \
-		} \
-	} \
- }
-
-#endif
 
 void mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, zval *return_value
 							 TSRMLS_DC ZEND_FILE_LINE_DC);