andrey Tue Jan 29 12:00:52 2008 UTC
Modified files:
/php-src/ext/mysqlnd mysqlnd.c mysqlnd_statistics.c
mysqlnd_statistics.h
Log:
Moved initialization into a separate function
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.14&r2=1.15&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd.c
diff -u php-src/ext/mysqlnd/mysqlnd.c:1.14 php-src/ext/mysqlnd/mysqlnd.c:1.15
--- php-src/ext/mysqlnd/mysqlnd.c:1.14 Mon Jan 28 23:24:05 2008
+++ php-src/ext/mysqlnd/mysqlnd.c Tue Jan 29 12:00:52 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd.c,v 1.14 2008/01/28 23:24:05 andrey Exp $ */
+/* $Id: mysqlnd.c,v 1.15 2008/01/29 12:00:52 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_wireprotocol.h"
@@ -133,10 +133,7 @@
mysqlnd_library_initted = TRUE;
_mysqlnd_init_ps_subsystem();
/* Should be calloc, as mnd_calloc will reference LOCK_access*/
- mysqlnd_global_stats = calloc(1, sizeof(MYSQLND_STATS));
-#ifdef ZTS
- mysqlnd_global_stats->LOCK_access = tsrm_mutex_alloc();
-#endif
+ mysqlnd_stats_init(&mysqlnd_global_stats);
}
}
/* }}} */
@@ -146,11 +143,7 @@
void mysqlnd_library_end(TSRMLS_D)
{
if (mysqlnd_library_initted == TRUE) {
-#ifdef ZTS
- tsrm_mutex_free(mysqlnd_global_stats->LOCK_access);
-#endif
- /* mnd_free will reference LOCK_access and crash...*/
- free(mysqlnd_global_stats);
+ mysqlnd_stats_end(mysqlnd_global_stats);
mysqlnd_global_stats = NULL;
mysqlnd_library_initted = FALSE;
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_statistics.c?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_statistics.c
diff -u php-src/ext/mysqlnd/mysqlnd_statistics.c:1.3
php-src/ext/mysqlnd/mysqlnd_statistics.c:1.4
--- php-src/ext/mysqlnd/mysqlnd_statistics.c:1.3 Mon Dec 31 07:12:12 2007
+++ php-src/ext/mysqlnd/mysqlnd_statistics.c Tue Jan 29 12:00:52 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_statistics.c,v 1.3 2007/12/31 07:12:12 sebastian Exp $ */
+/* $Id: mysqlnd_statistics.c,v 1.4 2008/01/29 12:00:52 andrey Exp $ */
#include "php.h"
#include "mysqlnd.h"
#include "mysqlnd_priv.h"
@@ -145,6 +145,32 @@
/* }}} */
+/* {{{ mysqlnd_stats_init */
+void
+mysqlnd_stats_init(MYSQLND_STATS ** stats)
+{
+ *stats = calloc(1, sizeof(MYSQLND_STATS));
+#ifdef ZTS
+ (*stats)->LOCK_access = tsrm_mutex_alloc();
+#endif
+
+}
+/* }}} */
+
+
+/* {{{ mysqlnd_stats_end */
+void
+mysqlnd_stats_end(MYSQLND_STATS * stats)
+{
+#ifdef ZTS
+ tsrm_mutex_free(stats->LOCK_access);
+#endif
+ /* mnd_free will reference LOCK_access and crash...*/
+ free(stats);
+}
+/* }}} */
+
+
/*
* Local variables:
* tab-width: 4
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_statistics.h?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_statistics.h
diff -u php-src/ext/mysqlnd/mysqlnd_statistics.h:1.6
php-src/ext/mysqlnd/mysqlnd_statistics.h:1.7
--- php-src/ext/mysqlnd/mysqlnd_statistics.h:1.6 Wed Jan 2 21:16:46 2008
+++ php-src/ext/mysqlnd/mysqlnd_statistics.h Tue Jan 29 12:00:52 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mysqlnd_statistics.h,v 1.6 2008/01/02 21:16:46 andrey Exp $ */
+/* $Id: mysqlnd_statistics.h,v 1.7 2008/01/29 12:00:52 andrey Exp $ */
#ifndef MYSQLND_STATISTICS_H
#define MYSQLND_STATISTICS_H
@@ -196,6 +196,10 @@
void mysqlnd_fill_stats_hash(const MYSQLND_STATS * const stats, zval
*return_value
TSRMLS_DC
ZEND_FILE_LINE_DC);
+
+void mysqlnd_stats_init(MYSQLND_STATS ** stats);
+void mysqlnd_stats_end(MYSQLND_STATS * stats);
+
#endif /* MYSQLND_STATISTICS_H */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
