clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
75e175180c
php-src/ext/mysqlnd/mysqlnd_statistics.h

252 lines
9.4 KiB
C
Raw Normal View History

Import of mysqlnd and ext/mysql + ext/mysqli patched to be built either with libmysql or mysqld. Use --with-mysql=mysqlnd --with-mysqli=mysqlnd to build with mysqlnd.
2007-07-24 16:13:26 +00:00
/*
+----------------------------------------------------------------------+
| PHP Version 6 |
+----------------------------------------------------------------------+
Bump copyright year, 2 of 2.
2007-12-31 07:12:20 +00:00
| Copyright (c) 2006-2008 The PHP Group |
Import of mysqlnd and ext/mysql + ext/mysqli patched to be built either with libmysql or mysqld. Use --with-mysql=mysqlnd --with-mysqli=mysqlnd to build with mysqlnd.
2007-07-24 16:13:26 +00:00
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.php.net/license/3_01.txt |
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Authors: Georg Richter <georg@mysql.com> |
| Andrey Hristov <andrey@mysql.com> |
| Ulf Wendel <uwendel@mysql.com> |
+----------------------------------------------------------------------+
*/
/* $Id$ */
#ifndef MYSQLND_STATISTICS_H
#define MYSQLND_STATISTICS_H
extern MYSQLND_STATS *mysqlnd_global_stats;
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
typedef struct st_mysqlnd_string
{
char *s;
size_t l;
} MYSQLND_STRING;
extern const MYSQLND_STRING mysqlnd_stats_values_names[];
Import of mysqlnd and ext/mysql + ext/mysqli patched to be built either with libmysql or mysqld. Use --with-mysql=mysqlnd --with-mysqli=mysqlnd to build with mysqlnd.
2007-07-24 16:13:26 +00:00
#ifdef ZTS
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
#define MYSQLND_INC_GLOBAL_STATISTIC(statistic) \
{ \
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
if (MYSQLND_G(collect_statistics) && statistic != STAT_LAST) { \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
DBG_INF_FMT("Global stat increase [%s]", mysqlnd_stats_values_names[statistic]); \
tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
mysqlnd_global_stats->values[(statistic)]++; \
tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
}\
}
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
#define MYSQLND_DEC_CONN_STATISTIC(conn_stats, statistic) \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
{ \
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
if (MYSQLND_G(collect_statistics) && statistic != STAT_LAST) { \
DBG_INF_FMT("Global&conn stat decrease [%s]", mysqlnd_stats_values_names[statistic]); \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
mysqlnd_global_stats->values[(statistic)]--; \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
if ((conn_stats)) { \
((MYSQLND_STATS *) conn_stats)->values[(statistic)]--; \
} \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
}\
}
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
#define MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(statistic1, value1, statistic2, value2) \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
{ \
if (MYSQLND_G(collect_statistics)) { \
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
uint64 v1 = (uint64) (value1); \
uint64 v2 = (uint64) (value2); \
Fix a crash introduced yesterday in mysqlnd, non-zts mode - missing if () for STAT_LAST was accessing wrong memory thus overwritting method pointers. Windows doesn't have atoll(), which is C99, C89 has only atoi() + atol(). Win has _atoi64, so use it.
2008-09-16 14:34:11 +00:00
DBG_INF_FMT("Global stat increase [%s] [%s]", mysqlnd_stats_values_names[statistic1], mysqlnd_stats_values_names[statistic2]); \
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
\
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
if (statistic1 != STAT_LAST) mysqlnd_global_stats->values[(statistic1)]+= v1; \
if (statistic2 != STAT_LAST) mysqlnd_global_stats->values[(statistic2)]+= v2; \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
}\
}
Import of mysqlnd and ext/mysql + ext/mysqli patched to be built either with libmysql or mysqld. Use --with-mysql=mysqlnd --with-mysqli=mysqlnd to build with mysqlnd.
2007-07-24 16:13:26 +00:00
#define MYSQLND_INC_CONN_STATISTIC(conn_stats, statistic) \
{ \
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
if (MYSQLND_G(collect_statistics) && statistic != STAT_LAST) { \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
DBG_INF_FMT("Global&Conn stat increase [%s]", mysqlnd_stats_values_names[statistic]); \
Update CVS - Fix BIT problem for BIT values represented with 5 bytes. Typo. - Make it possible with an ini variable to switch off/on statistics collection. - Compile-out debug checking of uneaten data from the line, when the build is release. According to callgrind this was eating some percentage.
2007-08-03 16:32:27 +00:00
tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
mysqlnd_global_stats->values[(statistic)]++; \
Update CVS - Fix BIT problem for BIT values represented with 5 bytes. Typo. - Make it possible with an ini variable to switch off/on statistics collection. - Compile-out debug checking of uneaten data from the line, when the build is release. According to callgrind this was eating some percentage.
2007-08-03 16:32:27 +00:00
tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
if ((conn_stats)) { \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
((MYSQLND_STATS *) conn_stats)->values[(statistic)]++; \
Update CVS - Fix BIT problem for BIT values represented with 5 bytes. Typo. - Make it possible with an ini variable to switch off/on statistics collection. - Compile-out debug checking of uneaten data from the line, when the build is release. According to callgrind this was eating some percentage.
2007-08-03 16:32:27 +00:00
} \
}\
Import of mysqlnd and ext/mysql + ext/mysqli patched to be built either with libmysql or mysqld. Use --with-mysql=mysqlnd --with-mysqli=mysqlnd to build with mysqlnd.
2007-07-24 16:13:26 +00:00
}
#define MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn_stats, statistic, value) \
{ \
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
if (MYSQLND_G(collect_statistics) && statistic != STAT_LAST) { \
- Fix problems with double definitions - Clean up a bit a type mess - 4 types less. No need to have aliases for the same thing (unification is the name). - New macro for Johannes mysqlnd_stmt_ro_result_metadata ----------------------------------------------------------------------
2008-01-02 21:16:46 +00:00
uint64 v = (uint64) (value); \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
DBG_INF_FMT("Global&Conn stat increase w value [%s]", mysqlnd_stats_values_names[statistic]); \
Update CVS - Fix BIT problem for BIT values represented with 5 bytes. Typo. - Make it possible with an ini variable to switch off/on statistics collection. - Compile-out debug checking of uneaten data from the line, when the build is release. According to callgrind this was eating some percentage.
2007-08-03 16:32:27 +00:00
tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
mysqlnd_global_stats->values[(statistic)] += v; \
Update CVS - Fix BIT problem for BIT values represented with 5 bytes. Typo. - Make it possible with an ini variable to switch off/on statistics collection. - Compile-out debug checking of uneaten data from the line, when the build is release. According to callgrind this was eating some percentage.
2007-08-03 16:32:27 +00:00
tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
if ((conn_stats)) { \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
((MYSQLND_STATS *) conn_stats)->values[(statistic)]+= v; \
Update CVS - Fix BIT problem for BIT values represented with 5 bytes. Typo. - Make it possible with an ini variable to switch off/on statistics collection. - Compile-out debug checking of uneaten data from the line, when the build is release. According to callgrind this was eating some percentage.
2007-08-03 16:32:27 +00:00
} \
}\
}
Import of mysqlnd and ext/mysql + ext/mysqli patched to be built either with libmysql or mysqld. Use --with-mysql=mysqlnd --with-mysqli=mysqlnd to build with mysqlnd.
2007-07-24 16:13:26 +00:00
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
#define MYSQLND_INC_CONN_STATISTIC_W_VALUE2(conn_stats, statistic1, value1, statistic2, value2) \
Import of mysqlnd and ext/mysql + ext/mysqli patched to be built either with libmysql or mysqld. Use --with-mysql=mysqlnd --with-mysqli=mysqlnd to build with mysqlnd.
2007-07-24 16:13:26 +00:00
{ \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
if (MYSQLND_G(collect_statistics)) { \
- Fix problems with double definitions - Clean up a bit a type mess - 4 types less. No need to have aliases for the same thing (unification is the name). - New macro for Johannes mysqlnd_stmt_ro_result_metadata ----------------------------------------------------------------------
2008-01-02 21:16:46 +00:00
uint64 v1 = (uint64) (value1); \
uint64 v2 = (uint64) (value2); \
Update CVS - Fix BIT problem for BIT values represented with 5 bytes. Typo. - Make it possible with an ini variable to switch off/on statistics collection. - Compile-out debug checking of uneaten data from the line, when the build is release. According to callgrind this was eating some percentage.
2007-08-03 16:32:27 +00:00
\
tsrm_mutex_lock(mysqlnd_global_stats->LOCK_access); \
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
if (statistic1 != STAT_LAST) mysqlnd_global_stats->values[(statistic1)]+= v1; \
if (statistic2 != STAT_LAST) mysqlnd_global_stats->values[(statistic2)]+= v2; \
Update CVS - Fix BIT problem for BIT values represented with 5 bytes. Typo. - Make it possible with an ini variable to switch off/on statistics collection. - Compile-out debug checking of uneaten data from the line, when the build is release. According to callgrind this was eating some percentage.
2007-08-03 16:32:27 +00:00
tsrm_mutex_unlock(mysqlnd_global_stats->LOCK_access); \
if ((conn_stats)) { \
Fix a crash introduced yesterday in mysqlnd, non-zts mode - missing if () for STAT_LAST was accessing wrong memory thus overwritting method pointers. Windows doesn't have atoll(), which is C99, C89 has only atoi() + atol(). Win has _atoi64, so use it.
2008-09-16 14:34:11 +00:00
if (statistic1 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[(statistic1)]+= v1; \
if (statistic2 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[(statistic2)]+= v2; \
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
} \
} \
}
#define MYSQLND_INC_CONN_STATISTIC_W_VALUE3(conn_stats, statistic1, value1, statistic2, value2, statistic3, value3) \
{ \
if (MYSQLND_G(collect_statistics)) { \
uint64 v1 = (uint64) (value1); \
uint64 v2 = (uint64) (value2); \
uint64 v3 = (uint64) (value3); \
\
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; \
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; \
Update CVS - Fix BIT problem for BIT values represented with 5 bytes. Typo. - Make it possible with an ini variable to switch off/on statistics collection. - Compile-out debug checking of uneaten data from the line, when the build is release. According to callgrind this was eating some percentage.
2007-08-03 16:32:27 +00:00
} \
Import of mysqlnd and ext/mysql + ext/mysqli patched to be built either with libmysql or mysqld. Use --with-mysql=mysqlnd --with-mysqli=mysqlnd to build with mysqlnd.
2007-07-24 16:13:26 +00:00
} \
Update CVS - Fix BIT problem for BIT values represented with 5 bytes. Typo. - Make it possible with an ini variable to switch off/on statistics collection. - Compile-out debug checking of uneaten data from the line, when the build is release. According to callgrind this was eating some percentage.
2007-08-03 16:32:27 +00:00
}
Import of mysqlnd and ext/mysql + ext/mysqli patched to be built either with libmysql or mysqld. Use --with-mysql=mysqlnd --with-mysqli=mysqlnd to build with mysqlnd.
2007-07-24 16:13:26 +00:00
#else /* NON-ZTS */
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
#define MYSQLND_INC_GLOBAL_STATISTIC(statistic) \
{ \
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
if (MYSQLND_G(collect_statistics) && statistic != STAT_LAST) { \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
DBG_INF_FMT("Global stat increase [%s]", mysqlnd_stats_values_names[statistic]); \
mysqlnd_global_stats->values[(statistic)]++; \
} \
}
#define MYSQLND_DEC_CONN_STATISTIC(conn_stats, statistic) \
{ \
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
if (MYSQLND_G(collect_statistics) && statistic != STAT_LAST) { \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
DBG_INF_FMT("Global&Conn stat decrease [%s]", mysqlnd_stats_values_names[statistic]); \
mysqlnd_global_stats->values[(statistic)]--; \
if ((conn_stats)) { \
((MYSQLND_STATS *) conn_stats)->values[(statistic)]--; \
} \
} \
}
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
#define MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(statistic1, value1, statistic2, value2) \
Import of mysqlnd and ext/mysql + ext/mysqli patched to be built either with libmysql or mysqld. Use --with-mysql=mysqlnd --with-mysqli=mysqlnd to build with mysqlnd.
2007-07-24 16:13:26 +00:00
{ \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
if (MYSQLND_G(collect_statistics)) { \
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
uint64 v1 = (uint64) (value1); \
uint64 v2 = (uint64) (value2); \
Fix a crash introduced yesterday in mysqlnd, non-zts mode - missing if () for STAT_LAST was accessing wrong memory thus overwritting method pointers. Windows doesn't have atoll(), which is C99, C89 has only atoi() + atol(). Win has _atoi64, so use it.
2008-09-16 14:34:11 +00:00
DBG_INF_FMT("Global stat increase [%s] [%s]", mysqlnd_stats_values_names[statistic1], mysqlnd_stats_values_names[statistic2]); \
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
\
if (statistic1 != STAT_LAST) mysqlnd_global_stats->values[(statistic1)]+= v1; \
if (statistic2 != STAT_LAST) mysqlnd_global_stats->values[(statistic2)]+= v2; \
}\
}
#define MYSQLND_INC_CONN_STATISTIC(conn_stats, statistic) \
{ \
if (MYSQLND_G(collect_statistics) && statistic != STAT_LAST) { \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
DBG_INF_FMT("Global&Conn stat increase [%s]", mysqlnd_stats_values_names[statistic]); \
mysqlnd_global_stats->values[(statistic)]++; \
Update CVS - Fix BIT problem for BIT values represented with 5 bytes. Typo. - Make it possible with an ini variable to switch off/on statistics collection. - Compile-out debug checking of uneaten data from the line, when the build is release. According to callgrind this was eating some percentage.
2007-08-03 16:32:27 +00:00
if ((conn_stats)) { \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
((MYSQLND_STATS *) conn_stats)->values[(statistic)]++; \
Update CVS - Fix BIT problem for BIT values represented with 5 bytes. Typo. - Make it possible with an ini variable to switch off/on statistics collection. - Compile-out debug checking of uneaten data from the line, when the build is release. According to callgrind this was eating some percentage.
2007-08-03 16:32:27 +00:00
} \
Import of mysqlnd and ext/mysql + ext/mysqli patched to be built either with libmysql or mysqld. Use --with-mysql=mysqlnd --with-mysqli=mysqlnd to build with mysqlnd.
2007-07-24 16:13:26 +00:00
} \
}
#define MYSQLND_INC_CONN_STATISTIC_W_VALUE(conn_stats, statistic, value) \
{ \
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
if (MYSQLND_G(collect_statistics) && statistic != STAT_LAST) { \
uint64 v = (uint64) (value); \
DBG_INF_FMT("Global&Conn stats increase w value [%s]", mysqlnd_stats_values_names[statistic]); \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
mysqlnd_global_stats->values[(statistic)] += v; \
Update CVS - Fix BIT problem for BIT values represented with 5 bytes. Typo. - Make it possible with an ini variable to switch off/on statistics collection. - Compile-out debug checking of uneaten data from the line, when the build is release. According to callgrind this was eating some percentage.
2007-08-03 16:32:27 +00:00
if ((conn_stats)) { \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
((MYSQLND_STATS *) conn_stats)->values[(statistic)] += v; \
Update CVS - Fix BIT problem for BIT values represented with 5 bytes. Typo. - Make it possible with an ini variable to switch off/on statistics collection. - Compile-out debug checking of uneaten data from the line, when the build is release. According to callgrind this was eating some percentage.
2007-08-03 16:32:27 +00:00
} \
Import of mysqlnd and ext/mysql + ext/mysqli patched to be built either with libmysql or mysqld. Use --with-mysql=mysqlnd --with-mysqli=mysqlnd to build with mysqlnd.
2007-07-24 16:13:26 +00:00
} \
}
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
#define MYSQLND_INC_CONN_STATISTIC_W_VALUE2(conn_stats, statistic1, value1, statistic2, value2) \
{ \
if (MYSQLND_G(collect_statistics)) { \
uint64 v1 = (uint64) (value1); \
uint64 v2 = (uint64) (value2); \
\
if (statistic1 != STAT_LAST) mysqlnd_global_stats->values[(statistic1)]+= v1; \
if (statistic2 != STAT_LAST) mysqlnd_global_stats->values[(statistic2)]+= v2; \
if ((conn_stats)) { \
Fix a crash introduced yesterday in mysqlnd, non-zts mode - missing if () for STAT_LAST was accessing wrong memory thus overwritting method pointers. Windows doesn't have atoll(), which is C99, C89 has only atoi() + atol(). Win has _atoi64, so use it.
2008-09-16 14:34:11 +00:00
if (statistic1 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[(statistic1)]+= v1; \
if (statistic2 != STAT_LAST) ((MYSQLND_STATS *) conn_stats)->values[(statistic2)]+= v2; \
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
} \
} \
}
Import of mysqlnd and ext/mysql + ext/mysqli patched to be built either with libmysql or mysqld. Use --with-mysql=mysqlnd --with-mysqli=mysqlnd to build with mysqlnd.
2007-07-24 16:13:26 +00:00
#define MYSQLND_INC_CONN_STATISTIC_W_VALUE3(conn_stats, statistic1, value1, statistic2, value2, statistic3, value3) \
Fix crashes with pconn in ext/mysql
2007-08-06 15:11:46 +00:00
{ \
Update mysqlnd in HEAD Updated ext/mysql and ext/mysqli in HEAD
2007-10-02 10:45:27 +00:00
if (MYSQLND_G(collect_statistics)) { \
- Fix problems with double definitions - Clean up a bit a type mess - 4 types less. No need to have aliases for the same thing (unification is the name). - New macro for Johannes mysqlnd_stmt_ro_result_metadata ----------------------------------------------------------------------
2008-01-02 21:16:46 +00:00
uint64 v1 = (uint64) (value1); \
uint64 v2 = (uint64) (value2); \
uint64 v3 = (uint64) (value3); \
Update CVS - Fix BIT problem for BIT values represented with 5 bytes. Typo. - Make it possible with an ini variable to switch off/on statistics collection. - Compile-out debug checking of uneaten data from the line, when the build is release. According to callgrind this was eating some percentage.
2007-08-03 16:32:27 +00:00
\
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
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; \
Update CVS - Fix BIT problem for BIT values represented with 5 bytes. Typo. - Make it possible with an ini variable to switch off/on statistics collection. - Compile-out debug checking of uneaten data from the line, when the build is release. According to callgrind this was eating some percentage.
2007-08-03 16:32:27 +00:00
if ((conn_stats)) { \
- More statistics - Fixed endless loop - mysqlnd_stmt_next_result() returned FAIL but as it is defined to be 1 (and PASS is 0), checking for mysqlnd_stmt_more_result() was successful although we were expecting a FAIL.
2008-09-12 15:06:55 +00:00
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; \
Update CVS - Fix BIT problem for BIT values represented with 5 bytes. Typo. - Make it possible with an ini variable to switch off/on statistics collection. - Compile-out debug checking of uneaten data from the line, when the build is release. According to callgrind this was eating some percentage.
2007-08-03 16:32:27 +00:00
} \
Import of mysqlnd and ext/mysql + ext/mysqli patched to be built either with libmysql or mysqld. Use --with-mysql=mysqlnd --with-mysqli=mysqlnd to build with mysqlnd.
2007-07-24 16:13:26 +00:00
} \
Update CVS - Fix BIT problem for BIT values represented with 5 bytes. Typo. - Make it possible with an ini variable to switch off/on statistics collection. - Compile-out debug checking of uneaten data from the line, when the build is release. According to callgrind this was eating some percentage.
2007-08-03 16:32:27 +00:00
}
Import of mysqlnd and ext/mysql + ext/mysqli patched to be built either with libmysql or mysqld. Use --with-mysql=mysqlnd --with-mysqli=mysqlnd to build with mysqlnd.
2007-07-24 16:13:26 +00:00
#endif
void mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, zval *return_value
TSRMLS_DC ZEND_FILE_LINE_DC);
Moved initialization into a separate function
2008-01-29 12:00:52 +00:00
void mysqlnd_stats_init(MYSQLND_STATS ** stats);
void mysqlnd_stats_end(MYSQLND_STATS * stats);
Import of mysqlnd and ext/mysql + ext/mysqli patched to be built either with libmysql or mysqld. Use --with-mysql=mysqlnd --with-mysqli=mysqlnd to build with mysqlnd.
2007-07-24 16:13:26 +00:00
#endif /* MYSQLND_STATISTICS_H */
/*
* Local variables:
* tab-width: 4
* c-basic-offset: 4
* End:
* vim600: noet sw=4 ts=4 fdm=marker
* vim<600: noet sw=4 ts=4
*/
Reference in New Issue Copy Permalink