PHP mysqlnd svn commit: r968 - trunk/mysqlnd

From: <ahristov(at)mysql.com>
Date: Fri Aug 31 2007 - 14:35:28 EDT

Author: ahristov
Date: 2007-08-31 20:35:27 +0200 (Fri, 31 Aug 2007) New Revision: 968

Added:

   trunk/mysqlnd/mysqlnd_structs.h
Modified:

   trunk/mysqlnd/mysqlnd.c
   trunk/mysqlnd/mysqlnd.h
   trunk/mysqlnd/mysqlnd_debug.c
   trunk/mysqlnd/mysqlnd_debug.h
   trunk/mysqlnd/mysqlnd_enum_n_def.h
   trunk/mysqlnd/mysqlnd_palloc.c
   trunk/mysqlnd/mysqlnd_priv.h
   trunk/mysqlnd/mysqlnd_ps.c
   trunk/mysqlnd/mysqlnd_ps_codec.c
   trunk/mysqlnd/mysqlnd_result_meta.c
   trunk/mysqlnd/mysqlnd_statistics.c
   trunk/mysqlnd/mysqlnd_statistics.h
   trunk/mysqlnd/mysqlnd_wireprotocol.c
   trunk/mysqlnd/mysqlnd_wireprotocol.h

Log:
- Big reorganisation.

• New option for mysqli_debug() that's mysqlnd only - m With 'm' mysqlnd will turn on memory allocation debugging. In other words, it will dump the calls the the memory allocation functions in the trace log, of course if possible ('t' threshold is not too low or even not tracing).
• More statistics - stat names renamed to mem_emalloc -> mem_emalloc_count and mem_emalloc_ammount added The same for most of the functions.

Modified: trunk/mysqlnd/mysqlnd.c

---

• trunk/mysqlnd/mysqlnd.c 2007-08-31 14:15:36 UTC (rev 967) +++ trunk/mysqlnd/mysqlnd.c 2007-08-31 18:35:27 UTC (rev 968) @@ -433,8 +433,8 @@ /* }}} */

-/* {{{ mysqlnd_start_psession */
-PHPAPI void mysqlnd_restart_psession(MYSQLND *conn)
+/* {{{ _mysqlnd_restart_psession */
+PHPAPI void _mysqlnd_restart_psession(MYSQLND *conn TSRMLS_DC)  {

 	MYSQLND_INC_CONN_STATISTIC(&conn->stats, STAT_CONNECT_REUSED);
 	/* Free here what should not be seen by the next script */

@@ -1942,6 +1942,7 @@
 static PHP_GINIT_FUNCTION(mysqlnd)
 {

 	mysqlnd_globals->collect_statistics = FALSE;
+	mysqlnd_globals->collect_memory_statistics = FALSE;
 	mysqlnd_globals->debug = NULL;
 	mysqlnd_globals->dbg = NULL;
 	mysqlnd_globals->net_cmd_buffer_size = 2048;

@@ -1954,6 +1955,7 @@
 */
 PHP_INI_BEGIN()

 	STD_PHP_INI_BOOLEAN("mysqlnd.collect_statistics",	"1", 	PHP_INI_SYSTEM, OnUpdateBool,	collect_statistics, zend_mysqlnd_globals, mysqlnd_globals)
+	STD_PHP_INI_BOOLEAN("mysqlnd.collect_memory_statistics",	"1", 	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)

Modified: trunk/mysqlnd/mysqlnd.h

---

• trunk/mysqlnd/mysqlnd.h 2007-08-31 14:15:36 UTC (rev 967) +++ trunk/mysqlnd/mysqlnd.h 2007-08-31 18:35:27 UTC (rev 968) @@ -49,648 +49,18 @@ #define MYSQLND_DO_WIRE_CHECK_BEFORE_COMMAND 1 #endif

-#include "mysqlnd_portability.h"
-

 #ifdef ZTS
 #include "TSRM.h"
 #endif
 
+#include "mysqlnd_portability.h"

 #include "mysqlnd_enum_n_def.h"
+#include "mysqlnd_structs.h"  

-/*

• /-----> CONN_CLOSE <---------------\
• | ^ \
• | | \
• CONN_READY -> CONN_QUERY_SENT -> CONN_FETCHING_DATA
• ^ |
• \-------------------------------------/
  -*/
  -typedef enum mysqlnd_connection_state
  -{
  
• CONN_ALLOCED = 0,
• CONN_READY,
• CONN_QUERY_SENT,
• CONN_SENDING_LOAD_DATA,
• CONN_FETCHING_DATA,
• CONN_NEXT_RESULT_PENDING,
• CONN_QUIT_SENT, /* object is "destroyed" at this stage */
  -} enum_mysqlnd_connection_state;
  

-
-typedef enum mysqlnd_stmt_state
-{

• MYSQLND_STMT_INITTED = 0,
• MYSQLND_STMT_PREPARED,
• MYSQLND_STMT_EXECUTED,
• MYSQLND_STMT_WAITING_USE_OR_STORE,
• MYSQLND_STMT_USE_OR_STORE_CALLED,
• MYSQLND_STMT_USER_FETCHING, /* fetch_row_buff or fetch_row_unbuf */
  -} enum_mysqlnd_stmt_state;
  -
  -
  -typedef enum param_bind_flags
  -{
  
• MYSQLND_PARAM_BIND_BLOB_USED = 1
  -} enum_param_bind_flags;
  -
  -
  -/* PS */
  -enum mysqlnd_stmt_attr
  -{
  
• STMT_ATTR_UPDATE_MAX_LENGTH,
• STMT_ATTR_CURSOR_TYPE,
• STMT_ATTR_PREFETCH_ROWS
  -};
  -
  -enum myslqnd_cursor_type
  -{
  
• CURSOR_TYPE_NO_CURSOR= 0,
• CURSOR_TYPE_READ_ONLY= 1,
• CURSOR_TYPE_FOR_UPDATE= 2,
• CURSOR_TYPE_SCROLLABLE= 4
  -};
  -
  -typedef enum mysqlnd_connection_close_type
  -{
  
• MYSQLND_CLOSE_EXPLICIT = 0,
• MYSQLND_CLOSE_IMPLICIT,
• MYSQLND_CLOSE_DISCONNECTED,
• MYSQLND_CLOSE_LAST /* for checking, should always be last */
  -} enum_connection_close_type;
  -
  -typedef enum mysqlnd_collected_stats
  -{
  
• STAT_BYTES_SENT,
• STAT_BYTES_RECEIVED,
• STAT_PACKETS_SENT,
• STAT_PACKETS_RECEIVED,
• STAT_PROTOCOL_OVERHEAD_IN,
• STAT_PROTOCOL_OVERHEAD_OUT,
• STAT_RSET_QUERY,
• STAT_NON_RSET_QUERY,
• STAT_NO_INDEX_USED,
• STAT_BAD_INDEX_USED,
• STAT_BUFFERED_SETS,
• STAT_UNBUFFERED_SETS,
• STAT_PS_BUFFERED_SETS,
• STAT_PS_UNBUFFERED_SETS,
• STAT_FLUSHED_NORMAL_SETS,
• STAT_FLUSHED_PS_SETS,
• STAT_ROWS_FETCHED_FROM_SERVER,
• STAT_ROWS_FETCHED_FROM_CLIENT,
• STAT_ROWS_SKIPPED,
• STAT_COPY_ON_WRITE_SAVED,
• STAT_COPY_ON_WRITE_PERFORMED,
• STAT_CMD_BUFFER_TOO_SMALL,
• STAT_CONNECT_SUCCESS,
• STAT_CONNECT_FAILURE,
• STAT_CONNECT_REUSED,
• STAT_RECONNECT,
• STAT_PCONNECT_SUCCESS,
• STAT_OPENED_CONNECTIONS,
• STAT_OPENED_PERSISTENT_CONNECTIONS,
• STAT_CLOSE_EXPLICIT,
• STAT_CLOSE_IMPLICIT,
• STAT_CLOSE_DISCONNECT,
• STAT_CLOSE_IN_MIDDLE,
• STAT_FREE_RESULT_EXPLICIT,
• STAT_FREE_RESULT_IMPLICIT,
• STAT_STMT_CLOSE_EXPLICIT,
• STAT_STMT_CLOSE_IMPLICIT,
• STAT_MEM_EMALLOC,
• STAT_MEM_ECALLOC,
• STAT_MEM_EREALLOC,
• STAT_MEM_EFREE,
• STAT_MEM_MALLOC,
• STAT_MEM_CALLOC,
• STAT_MEM_REALLOC,
• STAT_MEM_FREE,
• STAT_LAST /* Should be always the last */
  -} enum_mysqlnd_collected_stats;
  -
  -
  -typedef struct st_mysqlnd_cmd_buffer
  -{
  
• zend_uchar *buffer;
• size_t length;
  -} MYSQLND_CMD_BUFFER;
  -
  -
  -typedef struct st_mysqlnd_field
  -{
  
• char *name; /* Name of column */
• char *org_name; /* Original column name, if an alias */
• char *table; /* Table of column if column was a field */
• char *org_table; /* Org table name, if table was an alias */
• char *db; /* Database for table */
• char *catalog; /* Catalog for table */
• char *def; /* Default value (set by mysql_list_fields) */
• unsigned long length; /* Width of column (create length) */
• unsigned long max_length; /* Max width for selected set */
• unsigned int name_length;
• unsigned int org_name_length;
• unsigned int table_length;
• unsigned int org_table_length;
• unsigned int db_length;
• unsigned int catalog_length;
• unsigned int def_length;
• unsigned int flags; /* Diverse flags */
• unsigned int decimals; /* Number of decimals in field */
• unsigned int charsetnr; /* Character set */
• enum mysqlnd_field_types type; /* Type of field. See mysql_com.h for types */
• char *root;
• size_t root_len;
  -} MYSQLND_FIELD;
  -
  -
  -
  -typedef struct st_mysqlnd_upsert_result
  -{
  
• unsigned int warning_count;
• unsigned int server_status;
• unsigned long long affected_rows;
• unsigned long long last_insert_id;
  -} mysqlnd_upsert_status;
  -
  -
  -typedef struct st_mysqlnd_error_info
  -{
  
• char error[MYSQLND_ERRMSG_SIZE+1];
• char sqlstate[MYSQLND_SQLSTATE_LENGTH + 1];
• unsigned int error_no;
  -} mysqlnd_error_info;
  -
  -
  -typedef struct st_mysqlnd_zval_pcache MYSQLND_ZVAL_PCACHE;
  -typedef struct st_mysqlnd_thread_zval_pcache MYSQLND_THD_ZVAL_PCACHE;
  -typedef struct st_mysqlnd_qcache MYSQLND_QCACHE;
  -
  -
  -typedef struct st_mysqlnd_infile_info
  -{
  
• php_stream *fd;
• int error_no;
• char error_msg[MYSQLND_ERRMSG_SIZE + 1];
• const char *filename;
• zval *callback;
  -} MYSQLND_INFILE_INFO;
  -
  -
  -/* character set information */
  -typedef struct st_mysqlnd_charset
  -{
  
• uint nr;
• char *name;
• char *collation;
• uint char_minlen;
• uint char_maxlen;
• uint dangerous_for_escape_backslash;
• uint (*mb_charlen)(uint c);
• uint (*mb_valid)(const char *start, const char *end);
  -} MYSQLND_CHARSET;
  -
  -
  -/* local infile handler */
  -typedef struct st_mysqlnd_infile
  -{
  
• int (*local_infile_init)(void **ptr, char *filename, void **userdata TSRMLS_DC);
• int (*local_infile_read)(void *ptr, char *buf, uint buf_len TSRMLS_DC);
• int (*local_infile_error)(void *ptr, char *error_msg, uint error_msg_len TSRMLS_DC);
• void (*local_infile_end)(void *ptr TSRMLS_DC);
• zval *callback;
• void *userdata;
  -} MYSQLND_INFILE;
  -
  -typedef struct st_mysqlnd_option
  -{
  
• /* timeouts */
• uint timeout_connect;
• uint timeout_read;
• uint timeout_write;
  -
  
• ulong flags;
  -
  
• /* init commands - we need to send them to server directly after connect */
• uint num_commands;
• char **init_commands;
  -
  
• /* configuration file information */
• char *cfg_file;
• char *cfg_section;
  -
  
• /* SSL information */
• char *ssl_key;
• char *ssl_cert;
• char *ssl_ca;
• char *ssl_capath;
• char *ssl_cipher;
• zend_bool use_ssl;
  -
  
• char *charset_name;
• /* maximum allowed packet size for communication */
• ulong max_allowed_packet;
  -
  
• zend_bool numeric_and_datetime_as_unicode;
  -#ifdef MYSQLND_STRING_TO_INT_CONVERSION
  
• zend_bool int_and_year_as_int;
  -#endif
  
• unsigned int net_read_buffer_size;
  -} MYSQLND_OPTION;
  -
  -
  -typedef struct st_mysqlnd_connection MYSQLND;
  -typedef struct st_mysqlnd_res MYSQLND_RES;
  -typedef char** MYSQLND_ROW; /* return data as array of strings */
  -typedef struct st_mysqlnd_stmt MYSQLND_STMT;
  -typedef unsigned int MYSQLND_FIELD_OFFSET;
  -
  -typedef struct st_mysqlnd_param_bind MYSQLND_PARAM_BIND;
  -
  -typedef struct st_mysqlnd_result_bind MYSQLND_RESULT_BIND;
  -
  -typedef struct st_mysqlnd_result_metadata MYSQLND_RES_METADATA;
  -typedef struct st_mysqlnd_buffered_result MYSQLND_RES_BUFFERED;
  -typedef struct st_mysqlnd_unbuffered_result MYSQLND_RES_UNBUFFERED;
  -
  -typedef struct st_mysqlnd_debug MYSQLND_DEBUG;
  -
  -
  -typedef MYSQLND_RES* (*mysqlnd_stmt_use_or_store_func)(MYSQLND_STMT * const TSRMLS_DC);
  -typedef enum_func_status (*mysqlnd_fetch_row_func)(MYSQLND_RES *result,
  
• void *param,
• unsigned int flags,
• zend_bool *fetched_anything
• TSRMLS_DC);
  -
  -typedef struct st_mysqlnd_stats
  -{
  
• my_uint64 values[STAT_LAST];
  -#ifdef ZTS
  
• MUTEX_T LOCK_access;
  -#endif
  -} MYSQLND_STATS;
  -
  -
  -typedef struct st_mysqlnd_net
  -{
  
• php_stream *stream;
• /* sequence for simple checking of correct packets */
• zend_uchar packet_no;
  -
  -#ifdef MYSQLND_DO_WIRE_CHECK_BEFORE_COMMAND
  
• zend_uchar last_command;
  -#endif
  -
  
• /* cmd buffer */
• MYSQLND_CMD_BUFFER cmd_buffer;
  -} MYSQLND_NET;
  -
  -
  -struct st_mysqlnd_conn_methods
  -{
  
• ulong (*escape_string)(const MYSQLND * const conn, char *newstr, const char *escapestr, int escapestr_len TSRMLS_DC);
• enum_func_status (*set_charset)(MYSQLND * const conn, const char * const charset TSRMLS_DC);
• enum_func_status (*query)(MYSQLND *conn, const char *query, unsigned int query_len TSRMLS_DC);
• MYSQLND_RES * (*use_result)(MYSQLND * const conn TSRMLS_DC);
• MYSQLND_RES * (*store_result)(MYSQLND * const conn TSRMLS_DC);
• enum_func_status (*next_result)(MYSQLND * const conn TSRMLS_DC);
• zend_bool (*more_results)(const MYSQLND * const conn);
  -
  
• MYSQLND_STMT * (*stmt_init)(MYSQLND * const conn TSRMLS_DC);
  -
  
• enum_func_status (*shutdown_server)(MYSQLND * const conn, unsigned long level TSRMLS_DC);
• enum_func_status (*refresh_server)(MYSQLND * const conn, unsigned long options TSRMLS_DC);
  -
  
• enum_func_status (*ping)(MYSQLND * const conn TSRMLS_DC);
• enum_func_status (*kill_connection)(MYSQLND *conn, unsigned int pid TSRMLS_DC);
• enum_func_status (*select_db)(MYSQLND * const conn, const char * const db, unsigned int db_len TSRMLS_DC);
• enum_func_status (*server_dump_debug_information)(MYSQLND * const conn TSRMLS_DC);
• enum_func_status (*change_user)(MYSQLND * const conn, const char * user, const char * passwd, const char * db TSRMLS_DC);
  -
  
• unsigned int (*get_error_no)(const MYSQLND * const conn);
• const char * (*get_error_str)(const MYSQLND * const conn);
• const char * (*get_sqlstate)(const MYSQLND * const conn);
• mynd_ulonglong (*get_thread_id)(const MYSQLND * const conn);
• void (*get_statistics)(const MYSQLND * const conn, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC);
  -
  
• unsigned long (*get_server_version)(const MYSQLND * const conn);
• const char * (*get_server_information)(const MYSQLND * const conn);
• enum_func_status (*get_server_statistics)(MYSQLND *conn, char **message, unsigned int * message_len TSRMLS_DC);
• const char * (*get_host_information)(const MYSQLND * const conn);
• unsigned int (*get_protocol_information)(const MYSQLND * const conn);
• const char * (*get_last_message)(const MYSQLND * const conn);
• const char * (*charset_name)(const MYSQLND * const conn);
• MYSQLND_RES * (*list_fields)(MYSQLND *conn, const char *table, const char *achtung_wild TSRMLS_DC);
• MYSQLND_RES * (*list_method)(MYSQLND *conn, const char *query, const char *achtung_wild, char *par1 TSRMLS_DC);
  -
  
• mynd_ulonglong (*get_last_insert_id)(const MYSQLND * const conn);
• mynd_ulonglong (*get_affected_rows)(const MYSQLND * const conn);
• unsigned int (*get_warning_count)(const MYSQLND * const conn);
  -
  
• unsigned int (*get_field_count)(const MYSQLND * const conn);
  -
  
• enum_func_status (*set_server_option)(MYSQLND * const conn, enum_mysqlnd_server_option option TSRMLS_DC);
• enum_func_status (*set_client_option)(MYSQLND * const conn, enum_mysqlnd_option option, const char * const value TSRMLS_DC);
• void (*free_contents)(MYSQLND *conn TSRMLS_DC); /* private */
• enum_func_status (*close)(MYSQLND *conn, enum_connection_close_type close_type TSRMLS_DC);
• void (*dtor)(MYSQLND *conn TSRMLS_DC); /* private */
  -
  
• MYSQLND * (*get_reference)(MYSQLND * const conn);
• enum_func_status (*free_reference)(MYSQLND * const conn TSRMLS_DC);
  -};
  -
  -
  -struct st_mysqlnd_res_methods
  -{
  
• mysqlnd_fetch_row_func fetch_row;
• mysqlnd_fetch_row_func fetch_row_normal_buffered; /* private */
• mysqlnd_fetch_row_func fetch_row_normal_unbuffered; /* private */
  -
  
• MYSQLND_RES * (*use_result)(MYSQLND_RES * const result, zend_bool ps_protocol TSRMLS_DC);
• MYSQLND_RES * (*store_result)(MYSQLND_RES * result, MYSQLND * const conn, zend_bool ps TSRMLS_DC);
• void (*fetch_into)(MYSQLND_RES *result, unsigned int flags, zval *return_value, enum_mysqlnd_extension ext TSRMLS_DC ZEND_FILE_LINE_DC);
• void (*fetch_all)(MYSQLND_RES *result, unsigned int flags, zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC);
• void (*fetch_field_data)(MYSQLND_RES *result, unsigned int offset, zval *return_value TSRMLS_DC);
• mynd_ulonglong (*num_rows)(const MYSQLND_RES * const result);
• unsigned int (*num_fields)(const MYSQLND_RES * const result);
• enum_func_status (*skip_result)(MYSQLND_RES * const result TSRMLS_DC);
• enum_func_status (*seek_data)(MYSQLND_RES * result, mynd_ulonglong row TSRMLS_DC);
• MYSQLND_FIELD_OFFSET (*seek_field)(MYSQLND_RES * const result, MYSQLND_FIELD_OFFSET field_offset);
• MYSQLND_FIELD_OFFSET (*field_tell)(const MYSQLND_RES * const result);
• MYSQLND_FIELD * (*fetch_field)(MYSQLND_RES * const result TSRMLS_DC);
• MYSQLND_FIELD * (*fetch_field_direct)(const MYSQLND_RES * const result, MYSQLND_FIELD_OFFSET fieldnr TSRMLS_DC);
  -
  
• enum_func_status (*read_result_metadata)(MYSQLND_RES *result, MYSQLND *conn TSRMLS_DC);
• unsigned long * (*fetch_lengths)(MYSQLND_RES * const result);
• void (*free_result_buffers)(MYSQLND_RES * result TSRMLS_DC); /* private */
• enum_func_status (*free_result)(MYSQLND_RES * result, zend_bool implicit TSRMLS_DC);
• void (*free_result_internal)(MYSQLND_RES *result TSRMLS_DC);
• void (*free_result_contents)(MYSQLND_RES *result TSRMLS_DC);
  -};
  -
  -
  -struct st_mysqlnd_res_meta_methods
  -{
  
• MYSQLND_FIELD * (*fetch_field)(MYSQLND_RES_METADATA * const meta TSRMLS_DC);
• MYSQLND_FIELD * (*fetch_field_direct)(const MYSQLND_RES_METADATA * const meta, MYSQLND_FIELD_OFFSET fieldnr TSRMLS_DC);
• MYSQLND_FIELD_OFFSET (*field_tell)(const MYSQLND_RES_METADATA * const meta);
• enum_func_status (*read_metadata)(MYSQLND_RES_METADATA * const meta, MYSQLND *conn TSRMLS_DC);
• MYSQLND_RES_METADATA * (*clone_metadata)(const MYSQLND_RES_METADATA * const meta, zend_bool persistent TSRMLS_DC);
• void (*free_metadata)(MYSQLND_RES_METADATA *meta, zend_bool persistent TSRMLS_DC);
  -};
  -
  -
  -struct st_mysqlnd_stmt_methods
  -{
  
• enum_func_status (*prepare)(MYSQLND_STMT * const stmt, const char * const query, unsigned int query_len TSRMLS_DC);
• enum_func_status (*execute)(MYSQLND_STMT * const stmt TSRMLS_DC);
• MYSQLND_RES * (*use_result)(MYSQLND_STMT * const stmt TSRMLS_DC);
• MYSQLND_RES * (*store_result)(MYSQLND_STMT * const stmt TSRMLS_DC);
• MYSQLND_RES * (*get_result)(MYSQLND_STMT * const stmt TSRMLS_DC);
• enum_func_status (*free_result)(MYSQLND_STMT * const stmt TSRMLS_DC);
• enum_func_status (*seek_data)(const MYSQLND_STMT * const stmt, mynd_ulonglong row TSRMLS_DC);
• enum_func_status (*reset)(MYSQLND_STMT * const stmt TSRMLS_DC);
• enum_func_status (*close)(MYSQLND_STMT * const stmt, zend_bool implicit TSRMLS_DC); /* private */
• enum_func_status (*dtor)(MYSQLND_STMT * const stmt, zend_bool implicit TSRMLS_DC); /* use this for mysqlnd_stmt_close */
  -
  
• enum_func_status (*fetch)(MYSQLND_STMT * const stmt, zend_bool * const fetched_anything TSRMLS_DC);
  -
  
• enum_func_status (*bind_param)(MYSQLND_STMT * const stmt, MYSQLND_PARAM_BIND * const param_bind TSRMLS_DC);
• enum_func_status (*bind_result)(MYSQLND_STMT * const stmt, MYSQLND_RESULT_BIND * const result_bind TSRMLS_DC);
• enum_func_status (*send_long_data)(MYSQLND_STMT * const stmt, unsigned int param_num,
• const char * const data, unsigned long length TSRMLS_DC);
• MYSQLND_RES * (*get_parameter_metadata)(MYSQLND_STMT * const stmt);
• MYSQLND_RES * (*get_result_metadata)(MYSQLND_STMT * const stmt TSRMLS_DC);
  -
  
• mynd_ulonglong (*get_last_insert_id)(const MYSQLND_STMT * const stmt);
• mynd_ulonglong (*get_affected_rows)(const MYSQLND_STMT * const stmt);
• mynd_ulonglong (*get_num_rows)(const MYSQLND_STMT * const stmt);
  -
  
• unsigned int (*get_param_count)(const MYSQLND_STMT * const stmt);
• unsigned int (*get_field_count)(const MYSQLND_STMT * const stmt);
• unsigned int (*get_warning_count)(const MYSQLND_STMT * const stmt);
  -
  
• unsigned int (*get_error_no)(const MYSQLND_STMT * const stmt);
• const char * (*get_error_str)(const MYSQLND_STMT * const stmt);
• const char * (*get_sqlstate)(const MYSQLND_STMT * const stmt);
  -
  
• enum_func_status (*get_attribute)(MYSQLND_STMT * const stmt, enum mysqlnd_stmt_attr attr_type, void * const value TSRMLS_DC);
• enum_func_status (*set_attribute)(MYSQLND_STMT * const stmt, enum mysqlnd_stmt_attr attr_type, const void * const value TSRMLS_DC);
  -};
  -
  -
  -struct st_mysqlnd_connection
  -{
  -/* Operation related */
  
• MYSQLND_NET net;
  -
  -/* Information related */
  
• char *host;
• char *unix_socket;
• char *user;
• char *passwd;
• unsigned int *passwd_len;
• char *scheme;
• unsigned long long thread_id;
• char *server_version;
• char *host_info;
• unsigned char *scramble;
• const MYSQLND_CHARSET *charset;
• const MYSQLND_CHARSET *greet_charset;
• MYSQLND_INFILE infile;
• unsigned int protocol_version;
• unsigned long max_packet_size;
• unsigned int port;
• unsigned long client_flag;
• unsigned long server_capabilities;
  -
  
• int tmp_int;
  -
  -
  
• /* For UPSERT queries */
• mysqlnd_upsert_status upsert_status;
• char *last_message;
• unsigned int last_message_len;
  -
  
• /* If error packet, we use these */
• mysqlnd_error_info error_info;
  -
  
• /*
• To prevent queries during unbuffered fetches. Also to
• mark the connection as destroyed for garbage collection.
• */
• enum mysqlnd_connection_state state;
• enum_mysqlnd_query_type last_query_type;
• /* Temporary storage between query and (use|store)_result() call */
• MYSQLND_RES *current_result;
  -
  
• /*
• How many result sets reference this connection.
• It won't be freed until this number reaches 0.
• The last one, please close the door! :-)
• The result set objects can determine by inspecting
• 'quit_sent' whether the connection is still valid.
• */
• unsigned int refcount;
  -
  
• /* Temporal storage for mysql_query */
• unsigned int field_count;
  -
  
• /* persistent connection */
• zend_bool persistent;
  -
  
• /* options */
• MYSQLND_OPTION options;
  -
  
• /* zval cache */
• MYSQLND_THD_ZVAL_PCACHE *zval_cache;
  -
  
• /* qcache */
• MYSQLND_QCACHE *qcache;
  -
  
• /* stats */
• MYSQLND_STATS stats;
  -
  
• struct st_mysqlnd_conn_methods *m;
  -};
  -
  -typedef struct st_php_mysql_packet_row php_mysql_packet_row;
  -
  -
  -struct mysqlnd_field_hash_key
  -{
  
• zend_bool is_numeric;
• unsigned long key;
  -#if PHP_MAJOR_VERSION >= 6
  
• zstr ustr;
• unsigned int ulen;
  -#endif
  -};
  -
  -
  -struct st_mysqlnd_result_metadata
  -{
  
• MYSQLND_FIELD *fields;
• struct mysqlnd_field_hash_key *zend_hash_keys;
• unsigned int current_field;
• unsigned int field_count;
• /* We need this to make fast allocs in rowp_read */
• unsigned int bit_fields_count;
• size_t bit_fields_total_len; /* trailing \0 not counted */
  -
  
• struct st_mysqlnd_res_meta_methods *m;
  -};
  -
  -
  -struct st_mysqlnd_buffered_result
  -{
  
• zval ***data;
• zval ***data_cursor;
• zend_uchar **row_buffers;
• mynd_ulonglong row_count;
• zend_bool persistent;
  -
  
• MYSQLND_QCACHE *qcache;
• unsigned int references;
  -
  
• zend_bool async_invalid;
• mysqlnd_error_info error_info;
  -};
  -
  -
  -struct st_mysqlnd_unbuffered_result
  -{
  
• /* For unbuffered (both normal and PS) */
• zval **last_row_data;
• zend_uchar *last_row_buffer;
  -
  
• mynd_ulonglong row_count;
• zend_bool eof_reached;
  -};
  -
  -
  -struct st_mysqlnd_res
  -{
  
• struct st_mysqlnd_res_methods m;
  -
  
• MYSQLND *conn;
• enum_mysqlnd_res_type type;
• unsigned int field_count;
  -
  
• /* For metadata functions */
• MYSQLND_RES_METADATA *meta;
  -
  
• /* To be used with store_result() - both normal and PS */
• MYSQLND_RES_BUFFERED *data;
  -
  
• MYSQLND_RES_UNBUFFERED *unbuf;
  -
  
• /*
• Column lengths of current row - both buffered and unbuffered.
• For buffered results it duplicates the data found in **data
• */
• unsigned long *lengths;
  -
  
• php_mysql_packet_row *row_packet; /* Unused for PS */
  -
  
• /* zval cache */
• MYSQLND_THD_ZVAL_PCACHE *zval_cache;
  -};
  -
  -
  -
  -
  -#define MYSQLND_DEFAULT_PREFETCH_ROWS (ulong) 1
  -
  -struct st_mysqlnd_param_bind
  -{
  
• zval *zv;
• zend_uchar type;
• enum_param_bind_flags flags;
  -};
  -
  -struct st_mysqlnd_result_bind
  -{
  
• zval *zv;
• zend_uchar original_type;
• zend_bool bound;
  -};
  -
  -
  -struct st_mysqlnd_stmt
  -{
  
• MYSQLND *conn;
• unsigned long stmt_id;
• unsigned long flags;/* cursor is set here */
• enum_mysqlnd_stmt_state state;
• unsigned int warning_count;
• MYSQLND_RES *result;
• unsigned int field_count;
• unsigned int param_count;
• unsigned char send_types_to_server;
• MYSQLND_PARAM_BIND *param_bind;
• MYSQLND_RESULT_BIND *result_bind;
• zend_bool result_zvals_separated_once;
  -
  
• mysqlnd_upsert_status upsert_status;
  -
  
• mysqlnd_error_info error_info;
  -
  
• zend_bool update_max_length;
• unsigned long prefetch_rows;
  -
  
• zend_bool cursor_exists;
• mysqlnd_stmt_use_or_store_func default_rset_handler;
  -
  
• MYSQLND_CMD_BUFFER cmd_buffer;
  -
  
• struct st_mysqlnd_stmt_methods *m;
  -};
  -
  -
  -
  /* Library related */
  -PHPAPI void mysqlnd_restart_psession(MYSQLND *conn);
  +#define mysqlnd_restart_psession(conn) _mysqlnd_restart_psession((conn) TSRMLS_CC) +PHPAPI void _mysqlnd_restart_psession(MYSQLND *conn TSRMLS_DC); PHPAPI void mysqlnd_end_psession(MYSQLND *conn); PHPAPI void mysqlnd_minfo_print_hash(zval *values); #define mysqlnd_thread_safe() TRUE @@ -900,19 +270,27 @@ PHPAPI void _mysqlnd_get_client_stats(zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC);

 /* Persistent caching zval allocator */
-PHPAPI MYSQLND_ZVAL_PCACHE* mysqlnd_palloc_init_cache(unsigned int cache_size);
-PHPAPI void mysqlnd_palloc_free_cache(MYSQLND_ZVAL_PCACHE *cache);
-PHPAPI void mysqlnd_palloc_stats(const MYSQLND_ZVAL_PCACHE * const cache, zval *return_value);

+#define mysqlnd_palloc_init_cache(size)		_mysqlnd_palloc_init_cache((size) TSRMLS_CC)
+#define mysqlnd_palloc_free_cache(cache)	_mysqlnd_palloc_free_cache((cache) TSRMLS_CC)
Do you need more help?
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
+PHPAPI MYSQLND_ZVAL_PCACHE*		_mysqlnd_palloc_init_cache(unsigned int cache_size TSRMLS_DC);
+PHPAPI void 					_mysqlnd_palloc_free_cache(MYSQLND_ZVAL_PCACHE *cache TSRMLS_DC);
+PHPAPI void						mysqlnd_palloc_stats(const MYSQLND_ZVAL_PCACHE * const cache,
+													 zval *return_value);
 

-PHPAPI MYSQLND_THD_ZVAL_PCACHE * mysqlnd_palloc_rinit(MYSQLND_ZVAL_PCACHE * cache);
-PHPAPI void						 mysqlnd_palloc_rshutdown(MYSQLND_THD_ZVAL_PCACHE * cache);

+#define mysqlnd_palloc_rinit(cache)		_mysqlnd_palloc_rinit((cache) TSRMLS_CC)
+#define mysqlnd_palloc_rshutdown(cache)	_mysqlnd_palloc_rshutdown((cache) TSRMLS_CC)
+PHPAPI MYSQLND_THD_ZVAL_PCACHE * _mysqlnd_palloc_rinit(MYSQLND_ZVAL_PCACHE * cache TSRMLS_DC);
+PHPAPI void						 _mysqlnd_palloc_rshutdown(MYSQLND_THD_ZVAL_PCACHE * cache TSRMLS_DC);
 
 

-PHPAPI MYSQLND_THD_ZVAL_PCACHE*	mysqlnd_palloc_init_thd_cache(MYSQLND_ZVAL_PCACHE * const cache);
-MYSQLND_THD_ZVAL_PCACHE*	mysqlnd_palloc_get_thd_cache_reference(MYSQLND_THD_ZVAL_PCACHE * const cache);
-PHPAPI void					mysqlnd_palloc_free_thd_cache_reference(MYSQLND_THD_ZVAL_PCACHE **cache);

+#define mysqlnd_palloc_init_thd_cache(cache) 			_mysqlnd_palloc_init_thd_cache((cache) TSRMLS_CC)
+#define mysqlnd_palloc_free_thd_cache_reference(cache)	_mysqlnd_palloc_free_thd_cache_reference((cache) TSRMLS_CC)
 
+PHPAPI MYSQLND_THD_ZVAL_PCACHE*	_mysqlnd_palloc_init_thd_cache(MYSQLND_ZVAL_PCACHE * const cache TSRMLS_DC);
+MYSQLND_THD_ZVAL_PCACHE*		mysqlnd_palloc_get_thd_cache_reference(MYSQLND_THD_ZVAL_PCACHE * const cache);
+PHPAPI void						_mysqlnd_palloc_free_thd_cache_reference(MYSQLND_THD_ZVAL_PCACHE **cache TSRMLS_DC);
 

+
 /* There two should not be used from outside */

 void *	mysqlnd_palloc_get_zval(MYSQLND_THD_ZVAL_PCACHE * const cache, zend_bool *allocated TSRMLS_DC);
 void	mysqlnd_palloc_zval_ptr_dtor(zval **zv, MYSQLND_THD_ZVAL_PCACHE * const cache,

@@ -951,6 +329,7 @@  

 ZEND_BEGIN_MODULE_GLOBALS(mysqlnd)

 	zend_bool		collect_statistics;
+	zend_bool		collect_memory_statistics;
 	char*			debug;
 	MYSQLND_DEBUG	*dbg;
 	long			net_cmd_buffer_size;

Modified: trunk/mysqlnd/mysqlnd_debug.c

---

• trunk/mysqlnd/mysqlnd_debug.c 2007-08-31 14:15:36 UTC (rev 967) +++ trunk/mysqlnd/mysqlnd_debug.c 2007-08-31 18:35:27 UTC (rev 968) @@ -35,15 +35,30 @@ #define MYSQLND_ZTS(self) #endif

-#define MYSQLND_DEBUG_DUMP_TIME 1
-#define MYSQLND_DEBUG_DUMP_TRACE 2
-#define MYSQLND_DEBUG_DUMP_PID 4
-#define MYSQLND_DEBUG_DUMP_LINE 8
-#define MYSQLND_DEBUG_DUMP_FILE 16
-#define MYSQLND_DEBUG_DUMP_LEVEL 32
-#define MYSQLND_DEBUG_APPEND 64
-#define MYSQLND_DEBUG_FLUSH 128

+#define MYSQLND_DEBUG_DUMP_TIME				1
+#define MYSQLND_DEBUG_DUMP_TRACE			2
+#define MYSQLND_DEBUG_DUMP_PID				4
+#define MYSQLND_DEBUG_DUMP_LINE				8
+#define MYSQLND_DEBUG_DUMP_FILE				16
Can we help you?
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
+#define MYSQLND_DEBUG_DUMP_LEVEL			32
+#define MYSQLND_DEBUG_APPEND				64
+#define MYSQLND_DEBUG_FLUSH					128
+#define MYSQLND_DEBUG_TRACE_MEMORY_CALLS	256
 
+static const char * mysqlnd_emalloc_name	= "_mysqlnd_emalloc";
+static const char * mysqlnd_pemalloc_name	= "_mysqlnd_pemalloc";
+static const char * mysqlnd_ecalloc_name	= "_mysqlnd_ecalloc";
+static const char * mysqlnd_pecalloc_name	= "_mysqlnd_pecalloc";
+static const char * mysqlnd_erealloc_name	= "_mysqlnd_erealloc";
+static const char * mysqlnd_perealloc_name	= "_mysqlnd_perealloc";
+static const char * mysqlnd_efree_name		= "_mysqlnd_efree";
+static const char * mysqlnd_pefree_name		= "_mysqlnd_pefree";
+static const char * mysqlnd_malloc_name		= "_mysqlnd_malloc";
+static const char * mysqlnd_calloc_name		= "_mysqlnd_calloc";
+static const char * mysqlnd_realloc_name	= "_mysqlnd_realloc";
+static const char * mysqlnd_free_name		= "_mysqlnd_free";

+
+
 /* {{{ mysqlnd_debug::open */
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_debug, open)(MYSQLND_DEBUG * self, zend_bool reopen) @@ -80,7 +95,6 @@  

 	if (!self->stream) {
 		if (FAIL == self->m->open(self, FALSE)) {

-			self->m->free(self);

 			return FAIL;
 		}
 	}

@@ -181,7 +195,6 @@  

 	if (!self->stream) {
 		if (FAIL == self->m->open(self, FALSE)) {

-			self->m->free(self);

 			return FAIL;
 		}
 	}

@@ -268,16 +281,33 @@
 }
 /* }}} */  

-/* FALSE */

+
+/* FALSE - The DBG_ calls won't be traced, TRUE - will be traced */  /* {{{ mysqlnd_res_meta::func_enter */
 static zend_bool
 MYSQLND_METHOD(mysqlnd_debug, func_enter)(MYSQLND_DEBUG * self,

 										  unsigned int line, const char * const file,
 										  char * func_name, size_t func_name_len)
 {
+	if ((self->flags & MYSQLND_DEBUG_DUMP_TRACE) == 0 || self->file_name == NULL) {
+		return FALSE;
+	}
 	if (zend_stack_count(&self->call_stack) >= self->nest_level_limit) {
 		return FALSE;
 	}
+
+	if ((self->flags & MYSQLND_DEBUG_TRACE_MEMORY_CALLS) == 0 && 
+		(func_name == mysqlnd_emalloc_name	|| func_name == mysqlnd_pemalloc_name	||
+		 func_name == mysqlnd_ecalloc_name	|| func_name == mysqlnd_pecalloc_name	||
+		 func_name == mysqlnd_erealloc_name || func_name == mysqlnd_perealloc_name	||
+		 func_name == mysqlnd_efree_name	|| func_name == mysqlnd_pefree_name		|| 
Can't find what you're looking for?
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
+		 func_name == mysqlnd_efree_name	|| func_name == mysqlnd_pefree_name		|| 
+		 func_name == mysqlnd_malloc_name	|| func_name == mysqlnd_calloc_name		|| 
+		 func_name == mysqlnd_realloc_name	|| func_name == mysqlnd_free_name)) {
+		zend_stack_push(&self->call_stack, "", sizeof(""));
+	   	return FALSE;
+	}
+
 	zend_stack_push(&self->call_stack, func_name, func_name_len + 1);
 
 	if (zend_hash_num_elements(&self->not_filtered_functions) &&
@@ -298,13 +328,24 @@
 										  const char * const file)
 {
 	char *func_name;
+
+	if ((self->flags & MYSQLND_DEBUG_DUMP_TRACE) == 0 || self->file_name == NULL) {
+		return PASS;
+	}
+	if (zend_stack_count(&self->call_stack) >= self->nest_level_limit) {
+		return PASS;
+	}
+
 	zend_stack_top(&self->call_stack, (void **)&func_name);
 

-	if (!zend_hash_num_elements(&self->not_filtered_functions) ||

+	if (func_name[0] == '\0') {
+		; /* don't log that function */
+	} else if (!zend_hash_num_elements(&self->not_filtered_functions) ||
 		1 == zend_hash_exists(&self->not_filtered_functions, func_name, strlen(func_name) + 1))
 	{
 		self->m->log_va(self, line, file, zend_stack_count(&self->call_stack) - 1, NULL, "<%s", func_name);
 	}
+
 	return zend_stack_del_top(&self->call_stack) == SUCCESS? PASS:FAIL;

 }
 /* }}} */
@@ -374,7 +415,7 @@

 				self->flags |= MYSQLND_DEBUG_APPEND;
 			case 'o':
 			case 'O':

-				if (mode[i+1] == ',') {

+				if (i + 1 < mode_len && mode[i+1] == ',') {
 					unsigned int j = i + 2;
 					while (j < mode_len) {
 						if (mode[j] == ':') {
@@ -398,7 +439,7 @@
 				state = PARSER_WAIT_MODIFIER;
 				break;
 			case 'f': /* limit output to these functions */

-				if (mode[i+1] == ',') {

+				if (i + 1 < mode_len && mode[i+1] == ',') {
 					unsigned int j = i + 2;
 					i++;
 					while (j < mode_len) {
@@ -438,14 +479,13 @@
 			case 'g':
 			case 'p':
 				/* unsupported */

-				if (mode[i+1] == ',') {

+				if ((i + 1) < mode_len && mode[i+1] == ',') {
Don't know where to look next?
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
 					i+= 2;
 					while (i < mode_len) {
 						if (mode[i++] == ':') {
 							break;
 						}
 					}

-					state = PARSER_WAIT_VALUE;

 				}
 				state = PARSER_WAIT_COLON;
 				break;
@@ -481,9 +521,9 @@
 					}
 					i = j;
 				} else {

-					self->flags |= MYSQLND_DEBUG_DUMP_TRACE;

 					self->nest_level_limit = 200; /* default value for FF DBUG */
 				}
+				self->flags |= MYSQLND_DEBUG_DUMP_TRACE;
 				state = PARSER_WAIT_COLON;
 				break;
 			case 'T':
@@ -496,9 +536,21 @@
 			case 'S':
 				state = PARSER_WAIT_COLON;
 				break;
+			case 'm': /* mysqlnd extension - trace memory functions */
+				self->flags |= MYSQLND_DEBUG_TRACE_MEMORY_CALLS;
+				state = PARSER_WAIT_COLON;
+				break;
 			default:
 				if (state == PARSER_WAIT_MODIFIER) {
 					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unrecognized format '%c'", mode[i]);
+					if (i+1 < mode_len && mode[i+1] == ',') {
+						i+= 2;
+						while (i < mode_len) {
+							if (mode[i++] == ':') {
+								break;
+							}
+						}
+					}
 					state = PARSER_WAIT_COLON;
 				} else if (state == PARSER_WAIT_COLON) {
 					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Colon expected, '%c' found", mode[i]);				

@@ -542,6 +594,7 @@
 /* }}} */    

+/* {{{ _mysqlnd_debug */
 void _mysqlnd_debug(const char *mode TSRMLS_DC)  {
 #ifdef PHP_DEBUG
@@ -560,45 +613,61 @@

         }
 #endif
 }
+/* }}} */    

-void * _mysqlnd_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+/* {{{ _mysqlnd_emalloc */
+void * _mysqlnd_emalloc(size_t size MYSQLND_MEM_D)  {

 	void *ret;

-	TSRMLS_FETCH();
-	DBG_ENTER("mysqlnd_emalloc");

+	DBG_ENTER("_mysqlnd_emalloc");
 	DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno);
 	DBG_INF_FMT("before: %lu", zend_memory_usage(FALSE TSRMLS_CC));
 	ret = emalloc(size);
 	DBG_INF_FMT("after : %lu", zend_memory_usage(FALSE TSRMLS_CC));
 	DBG_INF_FMT("size=%lu ptr=%p", size, ret); 
 

-	MYSQLND_INC_GLOBAL_STATISTIC(STAT_MEM_EMALLOC);

+	if (MYSQLND_G(collect_memory_statistics)) {
+		MYSQLND_INC_GLOBAL_STATISTIC2_W_VALUE(STAT_MEM_EMALLOC_COUNT, 1, STAT_MEM_EMALLOC_AMMOUNT, size);
+	}
 	DBG_RETURN(ret);

 }
+/* }}} */  

-void * _mysqlnd_pemalloc(size_t size, zend_bool persistent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)

+
+/* {{{ _mysqlnd_pemalloc */
+void * _mysqlnd_pemalloc(size_t size, zend_bool persistent MYSQLND_MEM_D)
 {
 	void *ret;

-	TSRMLS_FETCH();
-	DBG_ENTER("mysqlnd_pemalloc");

+	DBG_ENTER("_mysqlnd_pemalloc");
Call Pantek today for Open Source Technical Support at 1-877-546-8934 - 24/7/365
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
 	DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno);

-	DBG_INF_FMT("before: %lu", zend_memory_usage(persistent TSRMLS_CC));

+	if (persistent == FALSE) {
+		DBG_INF_FMT("before: %lu", zend_memory_usage(persistent TSRMLS_CC));
+	}
 
 	ret = pemalloc(size, persistent);

-
-	DBG_INF_FMT("after : %lu", zend_memory_usage(persistent TSRMLS_CC));

 	DBG_INF_FMT("size=%lu ptr=%p persistent=%d", size, ret, persistent); 
 

-	MYSQLND_INC_GLOBAL_STATISTIC(persistent? STAT_MEM_EMALLOC:STAT_MEM_MALLOC);

+	if (persistent == FALSE) {
+		DBG_INF_FMT("after : %lu", zend_memory_usage(persistent TSRMLS_CC));
+	}
+
+	if (MYSQLND_G(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_AMMOUNT:STAT_MEM_EMALLOC_AMMOUNT;
+		MYSQLND_INC_GLOBAL_STATISTIC2_W_VALUE(s1, 1, s2, size);
+	}
+
 	DBG_RETURN(ret);

 }
+/* }}} */  

-void * _mysqlnd_ecalloc(uint nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)

+
+/* {{{ _mysqlnd_ecalloc */
+void * _mysqlnd_ecalloc(uint nmemb, size_t size MYSQLND_MEM_D)
 {
 	void *ret;

-	TSRMLS_FETCH();
-	DBG_ENTER("_mysqlnd_calloc");

+	DBG_ENTER("_mysqlnd_ecalloc");
 	DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno);
 	DBG_INF_FMT("before: %lu", zend_memory_usage(FALSE TSRMLS_CC));
 

@@ -606,32 +675,47 @@  

 	DBG_INF_FMT("after : %lu", zend_memory_usage(FALSE TSRMLS_CC));
 	DBG_INF_FMT("size=%lu ptr=%p", size, ret); 

-	MYSQLND_INC_GLOBAL_STATISTIC(STAT_MEM_ECALLOC);

+	if (MYSQLND_G(collect_memory_statistics)) {
+		MYSQLND_INC_GLOBAL_STATISTIC2_W_VALUE(STAT_MEM_ECALLOC_COUNT, 1, STAT_MEM_ECALLOC_AMMOUNT, size);
+	}
 	DBG_RETURN(ret);

 }
+/* }}} */  

-void * _mysqlnd_pecalloc(uint nmemb, size_t size, zend_bool persistent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)

+
+/* {{{ _mysqlnd_pecalloc */
+void * _mysqlnd_pecalloc(uint nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D)
 {
 	void *ret;

-	TSRMLS_FETCH();
-	DBG_ENTER("_mysqlnd_calloc");

+	DBG_ENTER("_mysqlnd_pecalloc");
 	DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno);

-	DBG_INF_FMT("before: %lu", zend_memory_usage(persistent TSRMLS_CC));

+	if (persistent == FALSE) {
+		DBG_INF_FMT("before: %lu", zend_memory_usage(persistent TSRMLS_CC));
+	}
 
 	ret = pecalloc(nmemb, size, persistent);

-
-	DBG_INF_FMT("after : %lu", zend_memory_usage(persistent TSRMLS_CC));

 	DBG_INF_FMT("size=%lu ptr=%p", size, ret); 
Do you need help?
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
 

-	MYSQLND_INC_GLOBAL_STATISTIC(persistent? STAT_MEM_ECALLOC:STAT_MEM_CALLOC);

+	if (persistent == FALSE) {
+		DBG_INF_FMT("after : %lu", zend_memory_usage(persistent TSRMLS_CC));
+	}
+
+	if (MYSQLND_G(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_AMMOUNT:STAT_MEM_ECALLOC_AMMOUNT;
+		MYSQLND_INC_GLOBAL_STATISTIC2_W_VALUE(s1, 1, s2, size);
+	}
+
 	DBG_RETURN(ret);

 }
+/* }}} */  

-void * _mysqlnd_erealloc(void *ptr, size_t new_size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)

+
+/* {{{ _mysqlnd_erealloc */
+void * _mysqlnd_erealloc(void *ptr, size_t new_size MYSQLND_MEM_D)
 {
 	void *ret;

-	TSRMLS_FETCH();
-	DBG_ENTER("mysqlnd_erealloc");

+	DBG_ENTER("_mysqlnd_erealloc");
 	DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno);
 	DBG_INF_FMT("ptr=%p new_size=%lu", ptr, new_size); 
 	DBG_INF_FMT("before: %lu", zend_memory_usage(FALSE TSRMLS_CC));

@@ -640,122 +724,154 @@  

 	DBG_INF_FMT("after : %lu", zend_memory_usage(FALSE TSRMLS_CC));
 	DBG_INF_FMT("new_ptr=%p", ret); 

-	MYSQLND_INC_GLOBAL_STATISTIC(STAT_MEM_EREALLOC);

+	if (MYSQLND_G(collect_memory_statistics)) {
+		MYSQLND_INC_GLOBAL_STATISTIC2_W_VALUE(STAT_MEM_EREALLOC_COUNT, 1, STAT_MEM_EREALLOC_AMMOUNT, new_size);
+	}
 	DBG_RETURN(ret);

 }
+/* }}} */  

-void * _mysqlnd_perealloc(void *ptr, size_t new_size, zend_bool persistent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)

+
+/* {{{ _mysqlnd_perealloc */
+void * _mysqlnd_perealloc(void *ptr, size_t new_size, zend_bool persistent MYSQLND_MEM_D)
 {
 	void *ret;

-	TSRMLS_FETCH();
-	DBG_ENTER("mysqlnd_erealloc");

+	DBG_ENTER("_mysqlnd_perealloc");
 	DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno);
 	DBG_INF_FMT("ptr=%p new_size=%lu persist=%d", ptr, new_size, persistent); 

-	DBG_INF_FMT("before: %lu", zend_memory_usage(persistent TSRMLS_CC));

+	if (persistent == FALSE) {
+		DBG_INF_FMT("before: %lu", zend_memory_usage(persistent TSRMLS_CC));
+	}
 
 	ret = perealloc(ptr, new_size, persistent);
 

-	DBG_INF_FMT("after : %lu", zend_memory_usage(persistent TSRMLS_CC));

 	DBG_INF_FMT("new_ptr=%p", ret); 

-	MYSQLND_INC_GLOBAL_STATISTIC(persistent? STAT_MEM_EREALLOC:STAT_MEM_REALLOC);

+
+	if (persistent == FALSE) {
+		DBG_INF_FMT("after : %lu", zend_memory_usage(persistent TSRMLS_CC));
+	}
+	MYSQLND_INC_GLOBAL_STATISTIC(persistent? STAT_MEM_EREALLOC_COUNT:STAT_MEM_REALLOC_COUNT);
Can we help you?
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
+	if (MYSQLND_G(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_AMMOUNT:STAT_MEM_EREALLOC_AMMOUNT;
+		MYSQLND_INC_GLOBAL_STATISTIC2_W_VALUE(s1, 1, s2, new_size);
+	}
 	DBG_RETURN(ret);

 }
+/* }}} */  

-void _mysqlnd_efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)

+
+/* {{{ _mysqlnd_efree */
+void _mysqlnd_efree(void *ptr MYSQLND_MEM_D)
 {

-	TSRMLS_FETCH();
-	DBG_ENTER("mysqlnd_efree");

+	DBG_ENTER("_mysqlnd_efree");
 	DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno);
 	DBG_INF_FMT("ptr=%p", ptr); 
 	DBG_INF_FMT("before: %lu", zend_memory_usage(FALSE TSRMLS_CC));

-	MYSQLND_INC_GLOBAL_STATISTIC(STAT_MEM_EFREE);

+	MYSQLND_INC_GLOBAL_STATISTIC(STAT_MEM_EFREE_COUNT);
 
 	efree(ptr);
 
 	DBG_INF_FMT("after : %lu", zend_memory_usage(FALSE TSRMLS_CC));
 	DBG_VOID_RETURN;

 }
+/* }}} */  

-void _mysqlnd_pefree(void *ptr, zend_bool persistent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)

+
+/* {{{ _mysqlnd_pefree */
+void _mysqlnd_pefree(void *ptr, zend_bool persistent MYSQLND_MEM_D)
 {

-	TSRMLS_FETCH();
-	DBG_ENTER("mysqlnd_efree");

+	DBG_ENTER("_mysqlnd_pefree");
 	DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno);
 	DBG_INF_FMT("ptr=%p persistent=%d", ptr, persistent); 

-	DBG_INF_FMT("before: %lu", zend_memory_usage(persistent TSRMLS_CC));
-	MYSQLND_INC_GLOBAL_STATISTIC(persistent? STAT_MEM_EFREE:STAT_MEM_FREE);

+	if (persistent == FALSE) {
+		DBG_INF_FMT("before: %lu", zend_memory_usage(persistent TSRMLS_CC));
+	}
 
 	pefree(ptr, persistent);
 

-	DBG_INF_FMT("after : %lu", zend_memory_usage(persistent TSRMLS_CC));

+	if (persistent == FALSE) {
+		DBG_INF_FMT("after : %lu", zend_memory_usage(persistent TSRMLS_CC));
+	}
+	if (MYSQLND_G(collect_memory_statistics)) {
+		MYSQLND_INC_GLOBAL_STATISTIC(persistent? STAT_MEM_FREE_COUNT:STAT_MEM_EFREE_COUNT);
+	}
 	DBG_VOID_RETURN;

 }    

-void * _mysqlnd_malloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+/* {{{ _mysqlnd_malloc */
+void * _mysqlnd_malloc(size_t size MYSQLND_MEM_D)  {

 	void *ret;

-	TSRMLS_FETCH();
-	DBG_ENTER("mysqlnd_malloc");

+	DBG_ENTER("_mysqlnd_malloc");
 	DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno);

-	DBG_INF_FMT("before: %lu", zend_memory_usage(TRUE TSRMLS_CC));

 
 	ret = malloc(size);
 

-	DBG_INF_FMT("after : %lu", zend_memory_usage(TRUE TSRMLS_CC));

 	DBG_INF_FMT("size=%lu ptr=%p", size, ret); 

-	MYSQLND_INC_GLOBAL_STATISTIC(STAT_MEM_MALLOC);

+	if (MYSQLND_G(collect_memory_statistics)) {
Can't find what you're looking for?
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
+		MYSQLND_INC_GLOBAL_STATISTIC2_W_VALUE(STAT_MEM_MALLOC_COUNT, 1, STAT_MEM_MALLOC_AMMOUNT, size);
+	}
 	DBG_RETURN(ret);

 }
+/* }}} */  

-void * _mysqlnd_calloc(uint nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)

+
+/* {{{ _mysqlnd_calloc */
+void * _mysqlnd_calloc(uint nmemb, size_t size MYSQLND_MEM_D)
 {
 	void *ret;

-	TSRMLS_FETCH();

 	DBG_ENTER("_mysqlnd_calloc");
 	DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno);

-	DBG_INF_FMT("before: %lu", zend_memory_usage(TRUE TSRMLS_CC));

 
 	ret = calloc(nmemb, size);
 

-	DBG_INF_FMT("after : %lu", zend_memory_usage(TRUE TSRMLS_CC));

 	DBG_INF_FMT("size=%lu ptr=%p", size, ret); 

-	MYSQLND_INC_GLOBAL_STATISTIC(STAT_MEM_CALLOC);

+	if (MYSQLND_G(collect_memory_statistics)) {
+		MYSQLND_INC_GLOBAL_STATISTIC2_W_VALUE(STAT_MEM_CALLOC_COUNT, 1, STAT_MEM_CALLOC_AMMOUNT, size);
+	}
 	DBG_RETURN(ret);

 }
+/* }}} */    

-void * _mysqlnd_realloc(void *ptr, size_t new_size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)
+/* {{{ _mysqlnd_realloc */
+void * _mysqlnd_realloc(void *ptr, size_t new_size MYSQLND_MEM_D)  {

 	void *ret;

-	TSRMLS_FETCH();
-	DBG_ENTER("mysqlnd_realloc");

+	DBG_ENTER("_mysqlnd_realloc");
 	DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno);
 	DBG_INF_FMT("ptr=%p new_size=%lu ", new_size, ptr); 
 	DBG_INF_FMT("before: %lu", zend_memory_usage(TRUE TSRMLS_CC));
 
 	ret = realloc(ptr, new_size);
 

-	DBG_INF_FMT("after : %lu", zend_memory_usage(TRUE TSRMLS_CC));
-	DBG_INF_FMT("new_ptr=%p", ret); 
-	MYSQLND_INC_GLOBAL_STATISTIC(STAT_MEM_REALLOC);

+	DBG_INF_FMT("new_ptr=%p", ret);
+
+	if (MYSQLND_G(collect_memory_statistics)) {
+		MYSQLND_INC_GLOBAL_STATISTIC2_W_VALUE(STAT_MEM_REALLOC_COUNT, 1, STAT_MEM_REALLOC_AMMOUNT, new_size);
+	}
 	DBG_RETURN(ret);

 }
+/* }}} */  

-void _mysqlnd_free(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC)

+
+/* {{{ _mysqlnd_free */
+void _mysqlnd_free(void *ptr MYSQLND_MEM_D)
 {

-	TSRMLS_FETCH();
-	DBG_ENTER("mysqlnd_free");

+	DBG_ENTER("_mysqlnd_free");
 	DBG_INF_FMT("file=%-15s line=%4d", strrchr(__zend_filename, PHP_DIR_SEPARATOR) + 1, __zend_lineno);
 	DBG_INF_FMT("ptr=%p", ptr); 

-	DBG_INF_FMT("before: %lu", zend_memory_usage(TRUE TSRMLS_CC));
-	MYSQLND_INC_GLOBAL_STATISTIC(STAT_MEM_FREE);

 
 	free(ptr);
 

-	DBG_INF_FMT("after : %lu", zend_memory_usage(TRUE TSRMLS_CC));

+	if (MYSQLND_G(collect_memory_statistics)) {
+		MYSQLND_INC_GLOBAL_STATISTIC(STAT_MEM_FREE_COUNT);
+	}
 	DBG_VOID_RETURN;

 }
+/* }}} */    

 /*

Modified: trunk/mysqlnd/mysqlnd_debug.h

---

• trunk/mysqlnd/mysqlnd_debug.h 2007-08-31 14:15:36 UTC (rev 967) +++ trunk/mysqlnd/mysqlnd_debug.h 2007-08-31 18:35:27 UTC (rev 968) @@ -25,7 +25,7 @@

 #include "zend_stack.h"  

-#define MYSQLND_DEBUG_MEMORY 0

+#define MYSQLND_DEBUG_MEMORY 1  

 struct st_mysqlnd_debug_methods
 {
@@ -60,20 +60,22 @@  

 MYSQLND_DEBUG *mysqlnd_debug_init(TSRMLS_D);  

+#define MYSQLND_MEM_D TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC  

-void * _mysqlnd_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-void * _mysqlnd_pemalloc(size_t size, zend_bool persistent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-void * _mysqlnd_ecalloc(uint nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-void * _mysqlnd_pecalloc(uint nmemb, size_t size, zend_bool persistent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-void * _mysqlnd_erealloc(void *ptr, size_t new_size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-void * _mysqlnd_perealloc(void *ptr, size_t new_size, zend_bool persistent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-void _mysqlnd_efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-void _mysqlnd_pefree(void *ptr, zend_bool persistent ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-void * _mysqlnd_malloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-void * _mysqlnd_calloc(uint nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-void * _mysqlnd_realloc(void *ptr, size_t new_size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
-void _mysqlnd_free(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC);
 

+void *	_mysqlnd_emalloc(size_t size MYSQLND_MEM_D);
+void *	_mysqlnd_pemalloc(size_t size, zend_bool persistent MYSQLND_MEM_D);
+void *	_mysqlnd_ecalloc(uint nmemb, size_t size MYSQLND_MEM_D);
+void *	_mysqlnd_pecalloc(uint nmemb, size_t size, zend_bool persistent MYSQLND_MEM_D);
Confused? Frustrated?
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
+void *	_mysqlnd_erealloc(void *ptr, size_t new_size MYSQLND_MEM_D);
+void *	_mysqlnd_perealloc(void *ptr, size_t new_size, zend_bool persistent MYSQLND_MEM_D);
+void 	_mysqlnd_efree(void *ptr MYSQLND_MEM_D);
+void 	_mysqlnd_pefree(void *ptr, zend_bool persistent MYSQLND_MEM_D);
+void *	_mysqlnd_malloc(size_t size MYSQLND_MEM_D);
+void *	_mysqlnd_calloc(uint nmemb, size_t size MYSQLND_MEM_D);
+void *	_mysqlnd_realloc(void *ptr, size_t new_size MYSQLND_MEM_D);
+void	_mysqlnd_free(void *ptr MYSQLND_MEM_D);
+
 #if PHP_DEBUG && !defined(PHP_WIN32)

 #define DBG_INF(msg) do { if (dbg_skip_trace == FALSE) MYSQLND_G(dbg)->m->log(MYSQLND_G(dbg), __LINE__, __FILE__, -1, "info : ", (msg)); } while (0)  #define DBG_ERR(msg) do { if (dbg_skip_trace == FALSE) MYSQLND_G(dbg)->m->log(MYSQLND_G(dbg), __LINE__, __FILE__, -1, "error: ", (msg)); } while (0) @@ -98,20 +100,21 @@  

 #endif  

+
 #if MYSQLND_DEBUG_MEMORY  

-#define mnd_emalloc(size) _mysqlnd_emalloc((size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define mnd_pemalloc(size, pers) _mysqlnd_pemalloc((size), (pers) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define mnd_ecalloc(nmemb, size) _mysqlnd_ecalloc((nmemb), (size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define mnd_pecalloc(nmemb, size, p) _mysqlnd_pecalloc((nmemb), (size), (p) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define mnd_erealloc(ptr, new_size) _mysqlnd_erealloc((ptr), (new_size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define mnd_perealloc(ptr, new_size, p) _mysqlnd_perealloc((ptr), (new_size), (p) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define mnd_efree(ptr) _mysqlnd_efree((ptr) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define mnd_pefree(ptr, pers) _mysqlnd_pefree((ptr), (pers) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define mnd_malloc(size) _mysqlnd_malloc((size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define mnd_calloc(nmemb, size) _mysqlnd_calloc((nmemb), (size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define mnd_realloc(ptr, new_size) _mysqlnd_realloc((ptr), (new_size) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
-#define mnd_free(ptr) _mysqlnd_free((ptr) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)

+#define mnd_emalloc(size)				_mysqlnd_emalloc((size) TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define mnd_pemalloc(size, pers)		_mysqlnd_pemalloc((size), (pers) TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define mnd_ecalloc(nmemb, size)		_mysqlnd_ecalloc((nmemb), (size) TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define mnd_pecalloc(nmemb, size, p)	_mysqlnd_pecalloc((nmemb), (size), (p) TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define mnd_erealloc(ptr, new_size)		_mysqlnd_erealloc((ptr), (new_size) TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define mnd_perealloc(ptr, new_size, p)	_mysqlnd_perealloc((ptr), (new_size), (p) TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define mnd_efree(ptr)					_mysqlnd_efree((ptr) TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define mnd_pefree(ptr, pers)			_mysqlnd_pefree((ptr), (pers) TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define mnd_malloc(size)				_mysqlnd_malloc((size) TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define mnd_calloc(nmemb, size)			_mysqlnd_calloc((nmemb), (size) TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
Do you need help?
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
+#define mnd_realloc(ptr, new_size)		_mysqlnd_realloc((ptr), (new_size) TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
+#define mnd_free(ptr)					_mysqlnd_free((ptr) TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC)
 

 #else  

Modified: trunk/mysqlnd/mysqlnd_enum_n_def.h

---

• trunk/mysqlnd/mysqlnd_enum_n_def.h 2007-08-31 14:15:36 UTC (rev 967) +++ trunk/mysqlnd/mysqlnd_enum_n_def.h 2007-08-31 18:35:27 UTC (rev 968) @@ -220,6 +220,128 @@ /* see mysqlnd_charset.c for more information */ #define MYSQLND_BINARY_CHARSET_NR 63

+
+/*
+          /-----> CONN_CLOSE  <---------------\
+         |           ^                         \
+         |           |                         \
+	CONN_READY -> CONN_QUERY_SENT -> CONN_FETCHING_DATA
+	    ^                                      |
+		\-------------------------------------/
+*/
+typedef enum mysqlnd_connection_state
+{
+	CONN_ALLOCED = 0,
+	CONN_READY,
+	CONN_QUERY_SENT,
+	CONN_SENDING_LOAD_DATA,
+	CONN_FETCHING_DATA,
+	CONN_NEXT_RESULT_PENDING,
+	CONN_QUIT_SENT, /* object is "destroyed" at this stage */
+} enum_mysqlnd_connection_state;
+
+
+typedef enum mysqlnd_stmt_state
+{
+	MYSQLND_STMT_INITTED = 0,
+	MYSQLND_STMT_PREPARED,
+	MYSQLND_STMT_EXECUTED,
+	MYSQLND_STMT_WAITING_USE_OR_STORE,
+	MYSQLND_STMT_USE_OR_STORE_CALLED,
+	MYSQLND_STMT_USER_FETCHING, /* fetch_row_buff or fetch_row_unbuf */
+} enum_mysqlnd_stmt_state;
+
+
+typedef enum param_bind_flags
+{
+	MYSQLND_PARAM_BIND_BLOB_USED = 1
+} enum_param_bind_flags;
+
+
+/* PS */
+enum mysqlnd_stmt_attr
+{
+	STMT_ATTR_UPDATE_MAX_LENGTH,
+	STMT_ATTR_CURSOR_TYPE,
+	STMT_ATTR_PREFETCH_ROWS
+};
+
+enum myslqnd_cursor_type
+{
+	CURSOR_TYPE_NO_CURSOR= 0,
+	CURSOR_TYPE_READ_ONLY= 1,
+	CURSOR_TYPE_FOR_UPDATE= 2,
+	CURSOR_TYPE_SCROLLABLE= 4
+};
+
+typedef enum mysqlnd_connection_close_type
+{
+	MYSQLND_CLOSE_EXPLICIT = 0,
+	MYSQLND_CLOSE_IMPLICIT,
+	MYSQLND_CLOSE_DISCONNECTED,
+	MYSQLND_CLOSE_LAST	/* for checking, should always be last */
+} enum_connection_close_type;
+
+typedef enum mysqlnd_collected_stats
+{
+	STAT_BYTES_SENT,
Do you need more help?
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
+	STAT_BYTES_RECEIVED,
+	STAT_PACKETS_SENT,
+	STAT_PACKETS_RECEIVED,
+	STAT_PROTOCOL_OVERHEAD_IN,
+	STAT_PROTOCOL_OVERHEAD_OUT,
+	STAT_RSET_QUERY,
+	STAT_NON_RSET_QUERY,
+	STAT_NO_INDEX_USED,
+	STAT_BAD_INDEX_USED,
+	STAT_BUFFERED_SETS,
+	STAT_UNBUFFERED_SETS,
+	STAT_PS_BUFFERED_SETS,
+	STAT_PS_UNBUFFERED_SETS,
+	STAT_FLUSHED_NORMAL_SETS,
+	STAT_FLUSHED_PS_SETS,
+	STAT_ROWS_FETCHED_FROM_SERVER,
+	STAT_ROWS_FETCHED_FROM_CLIENT,
+	STAT_ROWS_SKIPPED,
+	STAT_COPY_ON_WRITE_SAVED,
+	STAT_COPY_ON_WRITE_PERFORMED,
+	STAT_CMD_BUFFER_TOO_SMALL,
+	STAT_CONNECT_SUCCESS,
+	STAT_CONNECT_FAILURE,
+	STAT_CONNECT_REUSED,
+	STAT_RECONNECT,
+	STAT_PCONNECT_SUCCESS,
+	STAT_OPENED_CONNECTIONS,
+	STAT_OPENED_PERSISTENT_CONNECTIONS,
+	STAT_CLOSE_EXPLICIT,
+	STAT_CLOSE_IMPLICIT,
+	STAT_CLOSE_DISCONNECT,
+	STAT_CLOSE_IN_MIDDLE,
+	STAT_FREE_RESULT_EXPLICIT,
+	STAT_FREE_RESULT_IMPLICIT,
+	STAT_STMT_CLOSE_EXPLICIT,
+	STAT_STMT_CLOSE_IMPLICIT,
+	STAT_MEM_EMALLOC_COUNT,
+	STAT_MEM_EMALLOC_AMMOUNT,
+	STAT_MEM_ECALLOC_COUNT,
+	STAT_MEM_ECALLOC_AMMOUNT,
+	STAT_MEM_EREALLOC_COUNT,
+	STAT_MEM_EREALLOC_AMMOUNT,
+	STAT_MEM_EFREE_COUNT,
+	STAT_MEM_MALLOC_COUNT,
+	STAT_MEM_MALLOC_AMMOUNT,
+	STAT_MEM_CALLOC_COUNT,
+	STAT_MEM_CALLOC_AMMOUNT,
+	STAT_MEM_REALLOC_COUNT,
+	STAT_MEM_REALLOC_AMMOUNT,
+	STAT_MEM_FREE_COUNT,
+	STAT_LAST /* Should be always the last */
+} enum_mysqlnd_collected_stats;
+
+
+#define MYSQLND_DEFAULT_PREFETCH_ROWS (ulong) 1
+
+
 #endif	/* MYSQLND_ENUM_N_DEF_H */
 
 

Modified: trunk/mysqlnd/mysqlnd_palloc.c

---

• trunk/mysqlnd/mysqlnd_palloc.c 2007-08-31 14:15:36 UTC (rev 967) +++ trunk/mysqlnd/mysqlnd_palloc.c 2007-08-31 18:35:27 UTC (rev 968) @@ -44,8 +44,8 @@ #endif

-/* {{{ mysqlnd_palloc_init_cache */
-PHPAPI MYSQLND_ZVAL_PCACHE* mysqlnd_palloc_init_cache(unsigned int cache_size)
+/* {{{ _mysqlnd_palloc_init_cache */
+PHPAPI MYSQLND_ZVAL_PCACHE* _mysqlnd_palloc_init_cache(unsigned int cache_size TSRMLS_DC)  {

 	MYSQLND_ZVAL_PCACHE *ret = calloc(1, sizeof(MYSQLND_ZVAL_PCACHE));
 	unsigned int i;

@@ -106,7 +106,7 @@

   to the free list after usage. We ZVAL_NULL() them when we allocate them in the    constructor of the cache.
 */
-void mysqlnd_palloc_free_cache(MYSQLND_ZVAL_PCACHE *cache)
+void _mysqlnd_palloc_free_cache(MYSQLND_ZVAL_PCACHE *cache TSRMLS_DC)  {
 #ifndef MYSQLND_SILENT

         php_printf("[mysqlnd_palloc_free_cache %p]\n", cache); @@ -124,8 +124,8 @@
 /* }}} */    

-/* {{{ mysqlnd_palloc_init_thd_cache */
-PHPAPI MYSQLND_THD_ZVAL_PCACHE* mysqlnd_palloc_init_thd_cache(MYSQLND_ZVAL_PCACHE * const cache)
+/* {{{ _mysqlnd_palloc_init_thd_cache */ +PHPAPI MYSQLND_THD_ZVAL_PCACHE* _mysqlnd_palloc_init_thd_cache(MYSQLND_ZVAL_PCACHE * const cache TSRMLS_DC)  {

         MYSQLND_THD_ZVAL_PCACHE *ret = calloc(1, sizeof(MYSQLND_THD_ZVAL_PCACHE));  #ifndef MYSQLND_SILENT
@@ -170,7 +170,7 @@

   constructor of the cache.
 */
 static
-void mysqlnd_palloc_free_thd_cache(MYSQLND_THD_ZVAL_PCACHE *cache)
+void mysqlnd_palloc_free_thd_cache(MYSQLND_THD_ZVAL_PCACHE *cache TSRMLS_DC)  {
 #ifndef MYSQLND_SILENT

         php_printf("[mysqlnd_palloc_free_thd_cache %p]\n", cache); @@ -182,8 +182,8 @@
 /* }}} */    

-/* {{{ mysqlnd_palloc_free_thd_cache_reference */
-PHPAPI void mysqlnd_palloc_free_thd_cache_reference(MYSQLND_THD_ZVAL_PCACHE **cache)
+/* {{{ _mysqlnd_palloc_free_thd_cache_reference */ +PHPAPI void _mysqlnd_palloc_free_thd_cache_reference(MYSQLND_THD_ZVAL_PCACHE **cache TSRMLS_DC)  {

         if (*cache) {
 #ifndef MYSQLND_SILENT
@@ -192,7 +192,7 @@

                 --(*cache)->parent->references;  

 		if (--(*cache)->references == 0) {

-			mysqlnd_palloc_free_thd_cache(*cache);

+			mysqlnd_palloc_free_thd_cache(*cache TSRMLS_CC);
 		}
 		*cache = NULL;
 	}

@@ -459,16 +459,16 @@
 /* }}} */    

-/* {{{ mysqlnd_palloc_rinit */
-PHPAPI MYSQLND_THD_ZVAL_PCACHE * mysqlnd_palloc_rinit(MYSQLND_ZVAL_PCACHE * cache)
+/* {{{ _mysqlnd_palloc_rinit */
+PHPAPI MYSQLND_THD_ZVAL_PCACHE * _mysqlnd_palloc_rinit(MYSQLND_ZVAL_PCACHE * cache TSRMLS_DC)  {

         return mysqlnd_palloc_init_thd_cache(cache);  }
 /* }}} */    

-/* {{{ mysqlnd_palloc_rshutdown */
-PHPAPI void mysqlnd_palloc_rshutdown(MYSQLND_THD_ZVAL_PCACHE * thd_cache)
+/* {{{ _mysqlnd_palloc_rshutdown */
+PHPAPI void _mysqlnd_palloc_rshutdown(MYSQLND_THD_ZVAL_PCACHE * thd_cache TSRMLS_DC)  {

 	MYSQLND_ZVAL_PCACHE *cache;
 	mysqlnd_zval **p;

Modified: trunk/mysqlnd/mysqlnd_priv.h

---

• trunk/mysqlnd/mysqlnd_priv.h 2007-08-31 14:15:36 UTC (rev 967) +++ trunk/mysqlnd/mysqlnd_priv.h 2007-08-31 18:35:27 UTC (rev 968) @@ -172,9 +172,6 @@

 void _mysqlnd_init_ps_subsystem();/* This one is private, mysqlnd_library_init() will call it */  

-void mysqlnd_stmt_execute_store_params(MYSQLND_STMT *stmt, zend_uchar **buf, zend_uchar **p,

• size_t *buf_len, unsigned int null_byte_offset);
  -
  void ps_fetch_from_1_to_8_bytes(zval *zv, const MYSQLND_FIELD * const field, uint pack_len, zend_uchar **row, zend_bool as_unicode, unsigned int byte_count TSRMLS_DC);

Modified: trunk/mysqlnd/mysqlnd_ps.c

---

• trunk/mysqlnd/mysqlnd_ps.c 2007-08-31 14:15:36 UTC (rev 967) +++ trunk/mysqlnd/mysqlnd_ps.c 2007-08-31 18:35:27 UTC (rev 968) @@ -43,7 +43,7 @@

 /* Exported by mysqlnd_ps_codec.c */
 zend_uchar* mysqlnd_stmt_execute_generate_request(MYSQLND_STMT *stmt, size_t *request_len,
- zend_bool *free_buffer);

+ zend_bool *free_buffer TSRMLS_DC);    

 MYSQLND_RES * _mysqlnd_stmt_use_result(MYSQLND_STMT *stmt TSRMLS_DC); @@ -433,7 +433,7 @@

 		DBG_RETURN(FAIL);
 	}
 

-	request = mysqlnd_stmt_execute_generate_request(stmt, &request_len, &free_request);

+	request = mysqlnd_stmt_execute_generate_request(stmt, &request_len, &free_request TSRMLS_CC);
Don't know where to look next?
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:
Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql