[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c trunk/ext/mysqlnd/mysqlnd_debug.c
andrey Wed, 22 Sep 2010 14:54:43 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=303678
Log:
small macro fix
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-09-22
14:44:13 UTC (rev 303677)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-09-22
14:54:43 UTC (rev 303678)
@@ -1092,8 +1092,10 @@
}
/* }}} */
-#if MYSQLND_DEBUG_MEMORY
+#define MYSQLND_DEBUG_MEMORY 1
+#if MYSQLND_DEBUG_MEMORY == 0
+
/* {{{ mysqlnd_zend_mm_emalloc */
static void * mysqlnd_zend_mm_emalloc(size_t size MYSQLND_MEM_D)
{
@@ -1208,8 +1210,6 @@
#endif
-#define MYSQLND_DEBUG_MEMORY 1
-
PHPAPI struct st_mysqlnd_allocator_methods mysqlnd_allocator =
{
#if MYSQLND_DEBUG_MEMORY
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-09-22 14:44:13 UTC
(rev 303677)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-09-22 14:54:43 UTC
(rev 303678)
@@ -1092,8 +1092,10 @@
}
/* }}} */
-#if MYSQLND_DEBUG_MEMORY
+#define MYSQLND_DEBUG_MEMORY 1
+#if MYSQLND_DEBUG_MEMORY == 0
+
/* {{{ mysqlnd_zend_mm_emalloc */
static void * mysqlnd_zend_mm_emalloc(size_t size MYSQLND_MEM_D)
{
@@ -1208,8 +1210,6 @@
#endif
-#define MYSQLND_DEBUG_MEMORY 1
-
PHPAPI struct st_mysqlnd_allocator_methods mysqlnd_allocator =
{
#if MYSQLND_DEBUG_MEMORY
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c trunk/ext/mysqlnd/mysqlnd_debug.c
andrey Thu, 27 May 2010 12:00:48 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=299843
Log:
Fix crashes in the allocator in case of OOM.
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-05-27
10:45:39 UTC (rev 299842)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-05-27
12:00:48 UTC (rev 299843)
@@ -932,7 +932,7 @@
#endif
DBG_INF_FMT(size=%lu ptr=%p, size, ret);
- if (collect_memory_statistics) {
+ if (ret collect_memory_statistics) {
*(size_t *) ret = size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_MEM_MALLOC_COUNT, 1,
STAT_MEM_MALLOC_AMOUNT, size);
}
@@ -963,7 +963,7 @@
#endif
DBG_INF_FMT(size=%lu ptr=%p, size, ret);
- if (collect_memory_statistics) {
+ if (ret collect_memory_statistics) {
*(size_t *) ret = size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_MEM_CALLOC_COUNT, 1,
STAT_MEM_CALLOC_AMOUNT, size);
}
@@ -997,7 +997,7 @@
DBG_INF_FMT(new_ptr=%p, (char*)ret);
- if (collect_memory_statistics) {
+ if (ret collect_memory_statistics) {
*(size_t *) ret = new_size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_MEM_REALLOC_COUNT,
1, STAT_MEM_REALLOC_AMOUNT, new_size);
}
@@ -1082,7 +1082,7 @@
ret = pemalloc(tmp_str.len + sizeof(size_t), persistent);
memcpy(FAKE_PTR(ret), tmp_str.c, tmp_str.len);
- if (collect_memory_statistics) {
+ if (ret collect_memory_statistics) {
*(size_t *) ret = tmp_str.len;
MYSQLND_INC_GLOBAL_STATISTIC(persistent? STAT_MEM_STRDUP_COUNT
: STAT_MEM_ESTRDUP_COUNT);
}
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-05-27 10:45:39 UTC
(rev 299842)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-05-27 12:00:48 UTC
(rev 299843)
@@ -932,7 +932,7 @@
#endif
DBG_INF_FMT(size=%lu ptr=%p, size, ret);
- if (collect_memory_statistics) {
+ if (ret collect_memory_statistics) {
*(size_t *) ret = size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_MEM_MALLOC_COUNT, 1,
STAT_MEM_MALLOC_AMOUNT, size);
}
@@ -963,7 +963,7 @@
#endif
DBG_INF_FMT(size=%lu ptr=%p, size, ret);
- if (collect_memory_statistics) {
+ if (ret collect_memory_statistics) {
*(size_t *) ret = size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_MEM_CALLOC_COUNT, 1,
STAT_MEM_CALLOC_AMOUNT, size);
}
@@ -997,7 +997,7 @@
DBG_INF_FMT(new_ptr=%p, (char*)ret);
- if (collect_memory_statistics) {
+ if (ret collect_memory_statistics) {
*(size_t *) ret = new_size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_MEM_REALLOC_COUNT,
1, STAT_MEM_REALLOC_AMOUNT, new_size);
}
@@ -1082,7 +1082,7 @@
ret = pemalloc(tmp_str.len + sizeof(size_t), persistent);
memcpy(FAKE_PTR(ret), tmp_str.c, tmp_str.len);
- if (collect_memory_statistics) {
+ if (ret collect_memory_statistics) {
*(size_t *) ret = tmp_str.len;
MYSQLND_INC_GLOBAL_STATISTIC(persistent? STAT_MEM_STRDUP_COUNT
: STAT_MEM_ESTRDUP_COUNT);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c trunk/ext/mysqlnd/mysqlnd_debug.c
andrey Fri, 21 May 2010 13:06:52 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=299578
Log:
When OOM hits the wire, don't crash.
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-05-21
12:16:07 UTC (rev 299577)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-05-21
13:06:52 UTC (rev 299578)
@@ -1,4 +1,4 @@
-;/*
+/*
+--+
| PHP Version 5|
+--+
@@ -679,7 +679,7 @@
DBG_INF_FMT(size=%lu ptr=%p, size, ret);
- if (collect_memory_statistics) {
+ if (ret collect_memory_statistics) {
*(size_t *) ret = size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_MEM_EMALLOC_COUNT,
1, STAT_MEM_EMALLOC_AMOUNT, size);
}
@@ -711,7 +711,7 @@
DBG_INF_FMT(size=%lu ptr=%p persistent=%d, size, ret, persistent);
- if (collect_memory_statistics) {
+ if (ret collect_memory_statistics) {
enum mysqlnd_collected_stats s1 = persistent?
STAT_MEM_MALLOC_COUNT:STAT_MEM_EMALLOC_COUNT;
enum mysqlnd_collected_stats s2 = persistent?
STAT_MEM_MALLOC_AMOUNT:STAT_MEM_EMALLOC_AMOUNT;
*(size_t *) ret = size;
@@ -747,7 +747,7 @@
DBG_INF_FMT(after : %lu, zend_memory_usage(FALSE TSRMLS_CC));
DBG_INF_FMT(size=%lu ptr=%p, size, ret);
- if (collect_memory_statistics) {
+ if (ret collect_memory_statistics) {
*(size_t *) ret = size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_MEM_ECALLOC_COUNT,
1, STAT_MEM_ECALLOC_AMOUNT, size);
}
@@ -779,7 +779,7 @@
DBG_INF_FMT(size=%lu ptr=%p, size, ret);
- if (collect_memory_statistics) {
+ if (ret collect_memory_statistics) {
enum mysqlnd_collected_stats s1 = persistent?
STAT_MEM_CALLOC_COUNT:STAT_MEM_ECALLOC_COUNT;
enum mysqlnd_collected_stats s2 = persistent?
STAT_MEM_CALLOC_AMOUNT:STAT_MEM_ECALLOC_AMOUNT;
*(size_t *) ret = size;
@@ -815,7 +815,7 @@
#endif
DBG_INF_FMT(new_ptr=%p, (char*)ret);
- if (collect_memory_statistics) {
+ if (ret collect_memory_statistics) {
*(size_t *) ret = new_size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_MEM_EREALLOC_COUNT,
1, STAT_MEM_EREALLOC_AMOUNT, new_size);
}
@@ -849,7 +849,7 @@
DBG_INF_FMT(new_ptr=%p, (char*)ret);
- if (collect_memory_statistics) {
+ if (ret collect_memory_statistics) {
enum mysqlnd_collected_stats s1 = persistent?
STAT_MEM_REALLOC_COUNT:STAT_MEM_EREALLOC_COUNT;
enum mysqlnd_collected_stats s2 = persistent?
STAT_MEM_REALLOC_AMOUNT:STAT_MEM_EREALLOC_AMOUNT;
*(size_t *) ret = new_size;
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-05-21 12:16:07 UTC
(rev 299577)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-05-21 13:06:52 UTC
(rev 299578)
@@ -1,4 +1,4 @@
-;/*
+/*
+--+
| PHP Version 5|
+--+
@@ -679,7 +679,7 @@
DBG_INF_FMT(size=%lu ptr=%p, size, ret);
- if (collect_memory_statistics) {
+ if (ret collect_memory_statistics) {
*(size_t *) ret = size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_MEM_EMALLOC_COUNT,
1, STAT_MEM_EMALLOC_AMOUNT, size);
}
@@ -711,7 +711,7 @@
DBG_INF_FMT(size=%lu ptr=%p persistent=%d, size, ret, persistent);
- if (collect_memory_statistics) {
+ if (ret collect_memory_statistics) {
enum mysqlnd_collected_stats s1 = persistent?
STAT_MEM_MALLOC_COUNT:STAT_MEM_EMALLOC_COUNT;
enum mysqlnd_collected_stats s2 = persistent?
STAT_MEM_MALLOC_AMOUNT:STAT_MEM_EMALLOC_AMOUNT;
*(size_t *) ret = size;
@@ -747,7 +747,7 @@
DBG_INF_FMT(after : %lu, zend_memory_usage(FALSE TSRMLS_CC));
DBG_INF_FMT(size=%lu ptr=%p, size, ret);
- if (collect_memory_statistics) {
+ if (ret collect_memory_statistics) {
*(size_t *) ret = size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(STAT_MEM_ECALLOC_COUNT,
1, STAT_MEM_ECALLOC_AMOUNT, size);
}
@@ -779,7 +779,7 @@
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c trunk/ext/mysqlnd/mysqlnd_debug.c
andrey Mon, 03 May 2010 13:51:30 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=298902
Log:
Fix compiler warnings - unused functions
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-05-03
13:45:58 UTC (rev 298901)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-05-03
13:51:30 UTC (rev 298902)
@@ -28,60 +28,6 @@
#include mysqlnd_statistics.h
#include zend_builtin_functions.h
-static void * mysqlnd_zend_mm_emalloc(size_t size MYSQLND_MEM_D);
-static void * mysqlnd_zend_mm_pemalloc(size_t size, zend_bool persistent
MYSQLND_MEM_D);
-static void * mysqlnd_zend_mm_ecalloc(unsigned int nmemb, size_t size
MYSQLND_MEM_D);
-static void * mysqlnd_zend_mm_pecalloc(unsigned int nmemb, size_t size,
zend_bool persistent MYSQLND_MEM_D);
-static void * mysqlnd_zend_mm_erealloc(void *ptr, size_t new_size
MYSQLND_MEM_D);
-static void * mysqlnd_zend_mm_perealloc(void *ptr, size_t new_size, zend_bool
persistent MYSQLND_MEM_D);
-static void mysqlnd_zend_mm_efree(void * ptr MYSQLND_MEM_D);
-static void mysqlnd_zend_mm_pefree(void * ptr, zend_bool persistent
MYSQLND_MEM_D);
-static void * mysqlnd_zend_mm_malloc(size_t size MYSQLND_MEM_D);
-static void * mysqlnd_zend_mm_calloc(unsigned int nmemb, size_t size
MYSQLND_MEM_D);
-static void * mysqlnd_zend_mm_realloc(void * ptr, size_t new_size
MYSQLND_MEM_D);
-static void mysqlnd_zend_mm_free(void * ptr MYSQLND_MEM_D);
-static char * mysqlnd_zend_mm_pestrndup(const char * const ptr, size_t length,
zend_bool persistent MYSQLND_MEM_D);
-static char * mysqlnd_zend_mm_pestrdup(const char * const ptr, zend_bool
persistent MYSQLND_MEM_D);
-
-#define MYSQLND_DEBUG_MEMORY 1
-
-struct st_mysqlnd_allocator_methods mysqlnd_allocator =
-{
-#if MYSQLND_DEBUG_MEMORY
- _mysqlnd_emalloc,
- _mysqlnd_pemalloc,
- _mysqlnd_ecalloc,
- _mysqlnd_pecalloc,
- _mysqlnd_erealloc,
- _mysqlnd_perealloc,
- _mysqlnd_efree,
- _mysqlnd_pefree,
- _mysqlnd_malloc,
- _mysqlnd_calloc,
- _mysqlnd_realloc,
- _mysqlnd_free,
- _mysqlnd_pestrndup,
- _mysqlnd_pestrdup
-#else
- mysqlnd_zend_mm_emalloc,
- mysqlnd_zend_mm_pemalloc,
- mysqlnd_zend_mm_ecalloc,
- mysqlnd_zend_mm_pecalloc,
- mysqlnd_zend_mm_erealloc,
- mysqlnd_zend_mm_perealloc,
- mysqlnd_zend_mm_efree,
- mysqlnd_zend_mm_pefree,
- mysqlnd_zend_mm_malloc,
- mysqlnd_zend_mm_calloc,
- mysqlnd_zend_mm_realloc,
- mysqlnd_zend_mm_free,
- mysqlnd_zend_mm_pestrndup,
- mysqlnd_zend_mm_pestrdup
-#endif
-};
-
-
-
static const char * const mysqlnd_debug_default_trace_file =
/tmp/mysqlnd.trace;
#ifdef ZTS
@@ -1046,6 +992,7 @@
}
/* }}} */
+#if MYSQLND_DEBUG_MEMORY
/* {{{ mysqlnd_zend_mm_emalloc */
static void * mysqlnd_zend_mm_emalloc(size_t size MYSQLND_MEM_D)
@@ -1158,8 +1105,48 @@
}
/* }}} */
+#endif
+#define MYSQLND_DEBUG_MEMORY 1
+
+struct st_mysqlnd_allocator_methods mysqlnd_allocator =
+{
+#if MYSQLND_DEBUG_MEMORY
+ _mysqlnd_emalloc,
+ _mysqlnd_pemalloc,
+ _mysqlnd_ecalloc,
+ _mysqlnd_pecalloc,
+ _mysqlnd_erealloc,
+ _mysqlnd_perealloc,
+ _mysqlnd_efree,
+ _mysqlnd_pefree,
+ _mysqlnd_malloc,
+ _mysqlnd_calloc,
+ _mysqlnd_realloc,
+ _mysqlnd_free,
+ _mysqlnd_pestrndup,
+ _mysqlnd_pestrdup
+#else
+ mysqlnd_zend_mm_emalloc,
+ mysqlnd_zend_mm_pemalloc,
+ mysqlnd_zend_mm_ecalloc,
+ mysqlnd_zend_mm_pecalloc,
+ mysqlnd_zend_mm_erealloc,
+ mysqlnd_zend_mm_perealloc,
+ mysqlnd_zend_mm_efree,
+ mysqlnd_zend_mm_pefree,
+ mysqlnd_zend_mm_malloc,
+ mysqlnd_zend_mm_calloc,
+ mysqlnd_zend_mm_realloc,
+ mysqlnd_zend_mm_free,
+ mysqlnd_zend_mm_pestrndup,
+ mysqlnd_zend_mm_pestrdup
+#endif
+};
+
+
+
/* Follows code borrowed from zend_builtin_functions.c because the functions
there are static */
#if PHP_MAJOR_VERSION = 6
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-05-03 13:45:58 UTC
(rev 298901)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-05-03 13:51:30 UTC
(rev 298902)
@@ -28,60 +28,6 @@
#include mysqlnd_statistics.h
#include zend_builtin_functions.h
-static void * mysqlnd_zend_mm_emalloc(size_t size MYSQLND_MEM_D);
-static void * mysqlnd_zend_mm_pemalloc(size_t size, zend_bool persistent
MYSQLND_MEM_D);
-static void * mysqlnd_zend_mm_ecalloc(unsigned int nmemb, size_t size
MYSQLND_MEM_D);
-static void *
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c trunk/ext/mysqlnd/mysqlnd_debug.c
andrey Tue, 06 Apr 2010 14:33:55 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=297584
Log:
Stricly C
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-04-06
13:42:21 UTC (rev 297583)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-04-06
14:33:55 UTC (rev 297584)
@@ -696,9 +696,9 @@
DBG_INF_FMT(size=%lu ptr=%p persistent=%d, size, ret, persistent);
if (collect_memory_statistics) {
- *(size_t *) ret = size;
enum mysqlnd_collected_stats s1 = persistent?
STAT_MEM_MALLOC_COUNT:STAT_MEM_EMALLOC_COUNT;
enum mysqlnd_collected_stats s2 = persistent?
STAT_MEM_MALLOC_AMOUNT:STAT_MEM_EMALLOC_AMOUNT;
+ *(size_t *) ret = size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(s1, 1, s2, size);
}
@@ -741,9 +741,9 @@
DBG_INF_FMT(size=%lu ptr=%p, size, ret);
if (collect_memory_statistics) {
- *(size_t *) ret = size;
enum mysqlnd_collected_stats s1 = persistent?
STAT_MEM_CALLOC_COUNT:STAT_MEM_ECALLOC_COUNT;
enum mysqlnd_collected_stats s2 = persistent?
STAT_MEM_CALLOC_AMOUNT:STAT_MEM_ECALLOC_AMOUNT;
+ *(size_t *) ret = size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(s1, 1, s2, size);
}
@@ -789,9 +789,9 @@
DBG_INF_FMT(new_ptr=%p, ret);
if (collect_memory_statistics) {
- *(size_t *) ret = new_size;
enum mysqlnd_collected_stats s1 = persistent?
STAT_MEM_REALLOC_COUNT:STAT_MEM_EREALLOC_COUNT;
enum mysqlnd_collected_stats s2 = persistent?
STAT_MEM_REALLOC_AMOUNT:STAT_MEM_EREALLOC_AMOUNT;
+ *(size_t *) ret = new_size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(s1, 1, s2, new_size);
}
DBG_RETURN(FAKE_PTR(ret));
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-04-06 13:42:21 UTC
(rev 297583)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-04-06 14:33:55 UTC
(rev 297584)
@@ -696,9 +696,9 @@
DBG_INF_FMT(size=%lu ptr=%p persistent=%d, size, ret, persistent);
if (collect_memory_statistics) {
- *(size_t *) ret = size;
enum mysqlnd_collected_stats s1 = persistent?
STAT_MEM_MALLOC_COUNT:STAT_MEM_EMALLOC_COUNT;
enum mysqlnd_collected_stats s2 = persistent?
STAT_MEM_MALLOC_AMOUNT:STAT_MEM_EMALLOC_AMOUNT;
+ *(size_t *) ret = size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(s1, 1, s2, size);
}
@@ -741,9 +741,9 @@
DBG_INF_FMT(size=%lu ptr=%p, size, ret);
if (collect_memory_statistics) {
- *(size_t *) ret = size;
enum mysqlnd_collected_stats s1 = persistent?
STAT_MEM_CALLOC_COUNT:STAT_MEM_ECALLOC_COUNT;
enum mysqlnd_collected_stats s2 = persistent?
STAT_MEM_CALLOC_AMOUNT:STAT_MEM_ECALLOC_AMOUNT;
+ *(size_t *) ret = size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(s1, 1, s2, size);
}
@@ -789,9 +789,9 @@
DBG_INF_FMT(new_ptr=%p, ret);
if (collect_memory_statistics) {
- *(size_t *) ret = new_size;
enum mysqlnd_collected_stats s1 = persistent?
STAT_MEM_REALLOC_COUNT:STAT_MEM_EREALLOC_COUNT;
enum mysqlnd_collected_stats s2 = persistent?
STAT_MEM_REALLOC_AMOUNT:STAT_MEM_EREALLOC_AMOUNT;
+ *(size_t *) ret = new_size;
MYSQLND_INC_GLOBAL_STATISTIC_W_VALUE2(s1, 1, s2, new_size);
}
DBG_RETURN(FAKE_PTR(ret));
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c trunk/ext/mysqlnd/mysqlnd_debug.c
andrey Thu, 21 Jan 2010 18:17:19 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=293816
Log:
decrement correctly!
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-01-21
18:12:18 UTC (rev 293815)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-01-21
18:17:19 UTC (rev 293816)
@@ -1120,9 +1120,10 @@
len = va_arg(args, int*);
num = va_arg(args, int*);
- if (!(*level)--) {
+ if (!*level) {
return ZEND_HASH_APPLY_KEEP;
}
+ --*level;
s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 1 + 1);
sprintf(s_tmp, #%d , (*num)++);
@@ -1296,9 +1297,10 @@
len = va_arg(args, int*);
num = va_arg(args, int*);
- if (!(*level)--) {
+ if (!*level) {
return ZEND_HASH_APPLY_KEEP;
}
+ --*level;
s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 1 + 1);
sprintf(s_tmp, #%d , (*num)++);
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-01-21 18:12:18 UTC
(rev 293815)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-01-21 18:17:19 UTC
(rev 293816)
@@ -1120,9 +1120,10 @@
len = va_arg(args, int*);
num = va_arg(args, int*);
- if (!(*level)--) {
+ if (!*level) {
return ZEND_HASH_APPLY_KEEP;
}
+ --*level;
s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 1 + 1);
sprintf(s_tmp, #%d , (*num)++);
@@ -1296,9 +1297,10 @@
len = va_arg(args, int*);
num = va_arg(args, int*);
- if (!(*level)--) {
+ if (!*level) {
return ZEND_HASH_APPLY_KEEP;
}
+ --*level;
s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 1 + 1);
sprintf(s_tmp, #%d , (*num)++);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c trunk/ext/mysqlnd/mysqlnd_debug.c
andrey Thu, 14 Jan 2010 11:39:18 +
Revision: http://svn.php.net/viewvc?view=revisionrevision=293539
Log:
Fix compiler warning
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-01-14
11:11:56 UTC (rev 293538)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_debug.c2010-01-14
11:39:18 UTC (rev 293539)
@@ -317,7 +317,7 @@
}
if ((self-flags MYSQLND_DEBUG_TRACE_MEMORY_CALLS) == 0
self-skip_functions) {
- char ** p = self-skip_functions;
+ const char ** p = self-skip_functions;
while (*p) {
if (*p == func_name) {
zend_stack_push(self-call_stack, ,
sizeof());
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c
===
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-01-14 11:11:56 UTC
(rev 293538)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_debug.c 2010-01-14 11:39:18 UTC
(rev 293539)
@@ -317,7 +317,7 @@
}
if ((self-flags MYSQLND_DEBUG_TRACE_MEMORY_CALLS) == 0
self-skip_functions) {
- char ** p = self-skip_functions;
+ const char ** p = self-skip_functions;
while (*p) {
if (*p == func_name) {
zend_stack_push(self-call_stack, ,
sizeof());
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
