From: Andrey Hristov Date: Tue, 29 Jan 2008 18:11:46 +0000 (+0000) Subject: Fix the build, add a missing file X-Git-Tag: RELEASE_1_3_1~238 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=829831f5bae038fd375fc5cbd66ae1d0f19a07ff;p=php Fix the build, add a missing file --- diff --git a/ext/mysqlnd/config9.m4 b/ext/mysqlnd/config9.m4 index 619685f417..83b3b019e8 100644 --- a/ext/mysqlnd/config9.m4 +++ b/ext/mysqlnd/config9.m4 @@ -2,6 +2,11 @@ dnl dnl $Id$ dnl config.m4 for mysqlnd driver + +PHP_ARG_ENABLE(mysqlnd_threading, whether to enable threaded fetch in mysqlnd, +[ --enable-mysqlnd-threading mysqlnd: Enable threaded fetch], no, no) + + dnl If some extension uses mysqlnd it will get compiled in PHP core if test "$PHP_MYSQLND_ENABLED" = "yes"; then mysqlnd_sources="mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \ @@ -16,6 +21,13 @@ if test "$PHP_MYSQLND_ENABLED" = "yes"; then PHP_INSTALL_HEADERS([$ext_builddir/php_mysqlnd_config.h]) AC_DEFINE([HAVE_MYSQLND], 1, [Whether mysqlnd is enabled]) + dnl Windows uses config.w32 thus this code is safe for now + if test "$PHP_MYSQLND_THREADING" = "yes"; then + PHP_BUILD_THREAD_SAFE + AC_DEFINE([MYSQLND_THREADED], 1, [Whether mysqlnd threading is enabled]) + fi + + dnl This creates a file so it has to be after above macros PHP_CHECK_TYPES([int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t], [ $ext_builddir/php_mysqlnd_config.h diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 9f22912356..d1703a252a 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -68,63 +68,6 @@ static zend_bool mysqlnd_library_initted = FALSE; static enum_func_status mysqlnd_send_close(MYSQLND * conn TSRMLS_DC); -#define MYSQLND_SILENT 1 - -#ifdef MYSQLND_THREADED -/* {{{ _mysqlnd_fetch_thread */ -void * _mysqlnd_fetch_thread(void *arg) -{ - MYSQLND *conn = (MYSQLND *) arg; - MYSQLND_RES * result = NULL; - void ***tsrm_ls = conn->tsrm_ls; -#ifndef MYSQLND_SILENT - printf("conn=%p tsrm_ls=%p\n", conn, conn->tsrm_ls); -#endif - do { - pthread_mutex_lock(&conn->LOCK_work); - while (conn->thread_killed == FALSE /* && there is work */) { -#ifndef MYSQLND_SILENT - printf("Waiting for work in %s\n", __FUNCTION__); -#endif - pthread_cond_wait(&conn->COND_work, &conn->LOCK_work); - } - if (conn->thread_killed == TRUE) { -#ifndef MYSQLND_SILENT - printf("Thread killed in %s\n", __FUNCTION__); -#endif - pthread_cond_signal(&conn->COND_thread_ended); - pthread_mutex_unlock(&conn->LOCK_work); - break; - } -#ifndef MYSQLND_SILENT - printf("Got work in %s\n", __FUNCTION__); -#endif - CONN_SET_STATE(conn, CONN_FETCHING_DATA); - result = conn->current_result; - conn->current_result = NULL; - pthread_mutex_unlock(&conn->LOCK_work); - - mysqlnd_background_store_result_fetch_data(result TSRMLS_CC); - - /* do fetch the data from the wire */ - - pthread_mutex_lock(&conn->LOCK_work); - CONN_SET_STATE(conn, CONN_READY); - pthread_cond_signal(&conn->COND_work_done); -#ifndef MYSQLND_SILENT - printf("Signaling work done in %s\n", __FUNCTION__); -#endif - pthread_mutex_unlock(&conn->LOCK_work); - } while (1); - -#ifndef MYSQLND_SILENT - printf("Exiting worker thread in %s\n", __FUNCTION__); -#endif - return NULL; -} -/* }}} */ -#endif /* MYSQLND_THREADED */ - /* {{{ mysqlnd_library_init */ void mysqlnd_library_init(TSRMLS_D) @@ -839,7 +782,7 @@ PHPAPI MYSQLND *mysqlnd_connect(MYSQLND *conn, pthread_attr_setdetachstate(&connection_attrib, PTHREAD_CREATE_DETACHED); conn->thread_is_running = TRUE; - if (pthread_create(&th, &connection_attrib, _mysqlnd_fetch_thread, (void*)conn)) { + if (pthread_create(&th, &connection_attrib, mysqlnd_fetch_thread, (void*)conn)) { conn->thread_is_running = FALSE; } } diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h index fb2e771afc..1ce2b1882d 100644 --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h @@ -30,8 +30,6 @@ #define MYSQLND_USE_OPTIMISATIONS 0 -//#define MYSQLND_THREADING - /* #define MYSQLND_STRING_TO_INT_CONVERSION */ /* This force mysqlnd to do a single (or more depending on ammount of data) diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c index ea523a3623..99c72154f4 100644 --- a/ext/mysqlnd/mysqlnd_result.c +++ b/ext/mysqlnd/mysqlnd_result.c @@ -32,6 +32,62 @@ #define MYSQLND_SILENT +#ifdef MYSQLND_THREADED +/* {{{ mysqlnd_fetch_thread */ +void * mysqlnd_fetch_thread(void *arg) +{ + MYSQLND *conn = (MYSQLND *) arg; + MYSQLND_RES * result = NULL; + void ***tsrm_ls = conn->tsrm_ls; +#ifndef MYSQLND_SILENT + printf("conn=%p tsrm_ls=%p\n", conn, conn->tsrm_ls); +#endif + do { + pthread_mutex_lock(&conn->LOCK_work); + while (conn->thread_killed == FALSE /* && there is work */) { +#ifndef MYSQLND_SILENT + printf("Waiting for work in %s\n", __FUNCTION__); +#endif + pthread_cond_wait(&conn->COND_work, &conn->LOCK_work); + } + if (conn->thread_killed == TRUE) { +#ifndef MYSQLND_SILENT + printf("Thread killed in %s\n", __FUNCTION__); +#endif + pthread_cond_signal(&conn->COND_thread_ended); + pthread_mutex_unlock(&conn->LOCK_work); + break; + } +#ifndef MYSQLND_SILENT + printf("Got work in %s\n", __FUNCTION__); +#endif + CONN_SET_STATE(conn, CONN_FETCHING_DATA); + result = conn->current_result; + conn->current_result = NULL; + pthread_mutex_unlock(&conn->LOCK_work); + + mysqlnd_background_store_result_fetch_data(result TSRMLS_CC); + + /* do fetch the data from the wire */ + + pthread_mutex_lock(&conn->LOCK_work); + CONN_SET_STATE(conn, CONN_READY); + pthread_cond_signal(&conn->COND_work_done); +#ifndef MYSQLND_SILENT + printf("Signaling work done in %s\n", __FUNCTION__); +#endif + pthread_mutex_unlock(&conn->LOCK_work); + } while (1); + +#ifndef MYSQLND_SILENT + printf("Exiting worker thread in %s\n", __FUNCTION__); +#endif + return NULL; +} +/* }}} */ +#endif /* MYSQLND_THREADED */ + + /* {{{ mysqlnd_res_initialize_result_set_rest */ void mysqlnd_res_initialize_result_set_rest(MYSQLND_RES * const result TSRMLS_DC) { @@ -1260,8 +1316,8 @@ mysqlnd_fetch_row_async_buffered(MYSQLND_RES *result, void *param, unsigned int break; } if (!set->data_cursor || (set->data_cursor - set->data) < (set->row_count)) { -#if HAVE_USLEEP tsrm_mutex_unlock(set->LOCK); +#if HAVE_USLEEP usleep(2000); #else volatile int i = 0; @@ -1280,6 +1336,7 @@ mysqlnd_fetch_row_async_buffered(MYSQLND_RES *result, void *param, unsigned int /* We don't forget to release the lock */ tsrm_mutex_unlock(set->LOCK); + /* If there was no decoding in background, we have to decode here */ if (set->decode_in_foreground == TRUE) { MYSQLND_MEMORY_POOL_CHUNK *current_buffer = set->row_buffers[row_num]; result->m.row_decoder(current_buffer, diff --git a/ext/mysqlnd/mysqlnd_result.h b/ext/mysqlnd/mysqlnd_result.h index 570f1a5d0d..920f779417 100644 --- a/ext/mysqlnd/mysqlnd_result.h +++ b/ext/mysqlnd/mysqlnd_result.h @@ -38,6 +38,10 @@ enum_func_status mysqlnd_query_read_result_set_header(MYSQLND *conn, MYSQLND_STM void mysqlnd_res_initialize_result_set_rest(MYSQLND_RES * const result TSRMLS_DC); +#ifdef MYSQLND_THREADED +void * mysqlnd_fetch_thread(void *arg); +#endif + enum_func_status mysqlnd_background_store_result_fetch_data(MYSQLND_RES *result TSRMLS_DC); #endif /* MYSQLND_RESULT_H */ diff --git a/ext/mysqlnd/mysqlnd_structs.h b/ext/mysqlnd/mysqlnd_structs.h index 8fca5f7ce3..55f15fd9f8 100644 --- a/ext/mysqlnd/mysqlnd_structs.h +++ b/ext/mysqlnd/mysqlnd_structs.h @@ -448,7 +448,7 @@ struct st_mysqlnd_connection /* stats */ MYSQLND_STATS stats; -#ifdef ZTS +#ifdef MYSQLND_THREADED MUTEX_T LOCK_state; pthread_cond_t COND_work_done; diff --git a/ext/mysqlnd/php_mysqlnd.c b/ext/mysqlnd/php_mysqlnd.c new file mode 100644 index 0000000000..bb7d9008a4 --- /dev/null +++ b/ext/mysqlnd/php_mysqlnd.c @@ -0,0 +1,249 @@ +/* + +----------------------------------------------------------------------+ + | PHP Version 6 | + +----------------------------------------------------------------------+ + | Copyright (c) 2006-2008 The PHP Group | + +----------------------------------------------------------------------+ + | 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 | + | Andrey Hristov | + | Ulf Wendel | + +----------------------------------------------------------------------+ +*/ + +/* $Id$ */ +#include "php.h" +#include "php_ini.h" +#include "mysqlnd.h" +#include "mysqlnd_priv.h" +#include "mysqlnd_debug.h" +#include "ext/standard/info.h" + +/* {{{ mysqlnd_functions[] + * + * Every user visible function must have an entry in mysqlnd_functions[]. + */ +static zend_function_entry mysqlnd_functions[] = { + {NULL, NULL, NULL} /* Must be the last line in mysqlnd_functions[] */ +}; +/* }}} */ + + +/* {{{ mysqlnd_minfo_print_hash */ +#if PHP_MAJOR_VERSION >= 6 +PHPAPI void mysqlnd_minfo_print_hash(zval *values) +{ + zval **values_entry; + HashPosition pos_values; + + zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), &pos_values); + while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values), + (void **)&values_entry, &pos_values) == SUCCESS) { + TSRMLS_FETCH(); + zstr string_key; + uint string_key_len; + ulong num_key; + char *s = NULL; + + zend_hash_get_current_key_ex(Z_ARRVAL_P(values), &string_key, &string_key_len, &num_key, 0, &pos_values); + + convert_to_string(*values_entry); + + if (UG(unicode)) { + int s_len; + if (zend_unicode_to_string(ZEND_U_CONVERTER(UG(runtime_encoding_conv)), + &s, &s_len, string_key.u, string_key_len TSRMLS_CC) == SUCCESS) { + php_info_print_table_row(2, s, Z_STRVAL_PP(values_entry)); + } + if (s) { + mnd_efree(s); + } + } else { + php_info_print_table_row(2, string_key.s, Z_STRVAL_PP(values_entry)); + } + + zend_hash_move_forward_ex(Z_ARRVAL_P(values), &pos_values); + } +} +#else +void mysqlnd_minfo_print_hash(zval *values) +{ + zval **values_entry; + HashPosition pos_values; + + zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), &pos_values); + while (zend_hash_get_current_data_ex(Z_ARRVAL_P(values), (void **)&values_entry, &pos_values) == SUCCESS) { + char *string_key; + uint string_key_len; + ulong num_key; + + zend_hash_get_current_key_ex(Z_ARRVAL_P(values), &string_key, &string_key_len, &num_key, 0, &pos_values); + + convert_to_string(*values_entry); + php_info_print_table_row(2, string_key, Z_STRVAL_PP(values_entry)); + + zend_hash_move_forward_ex(Z_ARRVAL_P(values), &pos_values); + } +} +#endif +/* }}} */ + + +/* {{{ PHP_MINFO_FUNCTION + */ +PHP_MINFO_FUNCTION(mysqlnd) +{ + char buf[32]; + zval values; + + php_info_print_table_start(); + php_info_print_table_header(2, "mysqlnd", "enabled"); + php_info_print_table_row(2, "Version", mysqlnd_get_client_info()); + + /* Print client stats */ + php_info_print_table_header(2, "Client statistics", ""); + mysqlnd_get_client_stats(&values); + mysqlnd_minfo_print_hash(&values); + php_info_print_table_row(2, "Collecting statistics", MYSQLND_G(collect_statistics)? "Yes":"No"); + php_info_print_table_row(2, "Collecting memory statistics", MYSQLND_G(collect_memory_statistics)? "Yes":"No"); + + snprintf(buf, sizeof(buf), "%ld", MYSQLND_G(net_cmd_buffer_size)); + php_info_print_table_row(2, "Command buffer size", buf); + snprintf(buf, sizeof(buf), "%ld", MYSQLND_G(net_read_buffer_size)); + php_info_print_table_row(2, "Read buffer size", buf); + + zval_dtor(&values); + php_info_print_table_end(); +} +/* }}} */ + + +ZEND_DECLARE_MODULE_GLOBALS(mysqlnd); + + +/* {{{ PHP_GINIT_FUNCTION + */ +static PHP_GINIT_FUNCTION(mysqlnd) +{ + mysqlnd_globals->collect_statistics = TRUE; + mysqlnd_globals->collect_memory_statistics = FALSE; + mysqlnd_globals->debug = NULL; /* The actual string */ + mysqlnd_globals->dbg = NULL; /* The DBG object*/ + mysqlnd_globals->net_cmd_buffer_size = 2048; + mysqlnd_globals->net_read_buffer_size = 32768; +} +/* }}} */ + + +/* {{{ PHP_INI_BEGIN +*/ +PHP_INI_BEGIN() + STD_PHP_INI_BOOLEAN("mysqlnd.collect_statistics", "1", PHP_INI_ALL, OnUpdateBool, collect_statistics, zend_mysqlnd_globals, mysqlnd_globals) + STD_PHP_INI_BOOLEAN("mysqlnd.collect_memory_statistics", "0", PHP_INI_SYSTEM, OnUpdateBool, collect_memory_statistics, zend_mysqlnd_globals, mysqlnd_globals) + STD_PHP_INI_ENTRY("mysqlnd.debug", NULL, PHP_INI_SYSTEM, OnUpdateString, debug, zend_mysqlnd_globals, mysqlnd_globals) + STD_PHP_INI_ENTRY("mysqlnd.net_cmd_buffer_size", "2048", PHP_INI_ALL, OnUpdateLong, net_cmd_buffer_size, zend_mysqlnd_globals, mysqlnd_globals) + STD_PHP_INI_ENTRY("mysqlnd.net_read_buffer_size", "32768",PHP_INI_ALL, OnUpdateLong, net_read_buffer_size, zend_mysqlnd_globals, mysqlnd_globals) +PHP_INI_END() +/* }}} */ + + +/* {{{ PHP_MINIT_FUNCTION + */ +static PHP_MINIT_FUNCTION(mysqlnd) +{ + REGISTER_INI_ENTRIES(); + + mysqlnd_library_init(TSRMLS_C); + return SUCCESS; +} +/* }}} */ + + +/* {{{ PHP_MSHUTDOWN_FUNCTION + */ +static PHP_MSHUTDOWN_FUNCTION(mysqlnd) +{ + mysqlnd_library_end(TSRMLS_C); + + UNREGISTER_INI_ENTRIES(); + return SUCCESS; +} +/* }}} */ + + +#ifdef PHP_DEBUG +/* {{{ PHP_RINIT_FUNCTION + */ +static PHP_RINIT_FUNCTION(mysqlnd) +{ + if (MYSQLND_G(debug)) { + MYSQLND_DEBUG *dbg = mysqlnd_debug_init(TSRMLS_C); + if (!dbg) { + return FAILURE; + } + dbg->m->set_mode(dbg, MYSQLND_G(debug)); + MYSQLND_G(dbg) = dbg; + } + return SUCCESS; +} +/* }}} */ + + +/* {{{ PHP_RSHUTDOWN_FUNCTION + */ +static PHP_RSHUTDOWN_FUNCTION(mysqlnd) +{ + MYSQLND_DEBUG *dbg = MYSQLND_G(dbg); + DBG_ENTER("RSHUTDOWN"); + if (dbg) { + dbg->m->close(dbg); + dbg->m->free_handle(dbg); + MYSQLND_G(dbg) = NULL; + } + return SUCCESS; +} +/* }}} */ +#endif + + +/* {{{ mysqlnd_module_entry + */ +zend_module_entry mysqlnd_module_entry = { + STANDARD_MODULE_HEADER, + "mysqlnd", + mysqlnd_functions, + PHP_MINIT(mysqlnd), + PHP_MSHUTDOWN(mysqlnd), +#ifdef PHP_DEBUG + PHP_RINIT(mysqlnd), + PHP_RSHUTDOWN(mysqlnd), +#else + NULL, + NULL, +#endif + PHP_MINFO(mysqlnd), + MYSQLND_VERSION, + PHP_MODULE_GLOBALS(mysqlnd), + PHP_GINIT(mysqlnd), + NULL, + NULL, + STANDARD_MODULE_PROPERTIES_EX +}; +/* }}} */ + + +/* + * 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 + */