Hosting Provided By

PHP mysqlnd svn commit: r949 - trunk/mysqlnd

From: <ahristov(at)mysql.com>
Date: Thu Aug 23 2007 - 11:54:47 EDT

Author: ahristov
Date: 2007-08-23 17:54:47 +0200 (Thu, 23 Aug 2007) New Revision: 949

Modified:

   trunk/mysqlnd/mysqlnd_debug.h
   trunk/mysqlnd/mysqlnd_palloc.c
   trunk/mysqlnd/mysqlnd_result.c
   trunk/mysqlnd/mysqlnd_result_meta.c
   trunk/mysqlnd/mysqlnd_statistics.c
   trunk/mysqlnd/mysqlnd_wireprotocol.c

Log:
Dump less output

Modified: trunk/mysqlnd/mysqlnd_debug.h

trunk/mysqlnd/mysqlnd_debug.h 2007-08-23 15:54:10 UTC (rev 948) +++ trunk/mysqlnd/mysqlnd_debug.h 2007-08-23 15:54:47 UTC (rev 949) @@ -25,7 +25,7 @@

#include "zend_stack.h"

-#define MYSQLND_DEBUG_MEMORY 1
+#define MYSQLND_DEBUG_MEMORY 0

struct st_mysqlnd_debug_methods
{

Modified: trunk/mysqlnd/mysqlnd_palloc.c

trunk/mysqlnd/mysqlnd_palloc.c 2007-08-23 15:54:10 UTC (rev 948) +++ trunk/mysqlnd/mysqlnd_palloc.c 2007-08-23 15:54:47 UTC (rev 949) @@ -290,10 +290,12 @@ { void *ret = NULL;

+#if MYSQLND_DEBUG_MEMORY

 	DBG_ENTER("mysqlnd_palloc_get_zval");
 	DBG_INF_FMT("cache=%p *last_added=%p free_items=%d",
 				thd_cache, thd_cache? thd_cache->parent->free_list.last_added:NULL,
 				thd_cache->parent->free_items);

+#endif

 	if (thd_cache) {
 		MYSQLND_ZVAL_PCACHE *cache = thd_cache->parent;
@@ -328,8 +330,12 @@
 		ZVAL_ADDREF(&(((mysqlnd_zval *)ret)->zv));
 	}
 

+#if MYSQLND_DEBUG_MEMORY

 	DBG_INF_FMT("allocated=%d ret=%p", *allocated, ret);
 	DBG_RETURN(ret);

+#else

+	return ret;

+#endif

}
/* }}} */

Do you need help?

@@ -339,8 +345,9 @@

enum_mysqlnd_res_type type, zend_bool *copy_ctor_called TSRMLS_DC) {

MYSQLND_ZVAL_PCACHE *cache;
-#ifndef MYSQLND_SILENT
- php_printf("[mysqlnd_palloc_zval_ptr_dtor %p] parent_block=%p last_in_block=%p *zv=%p type=%d refc=%d\n",
+#if MYSQLND_DEBUG_MEMORY

+	DBG_ENTER("mysqlnd_palloc_zval_ptr_dtor");
+	DBG_INF_FMT("cache=%p parent_block=%p last_in_block=%p *zv=%p type=%d refc=%d\n",
 				thd_cache,
 				thd_cache->parent? thd_cache->parent->block:NULL,
 				thd_cache->parent? thd_cache->parent->last_in_block:NULL,
@@ -382,6 +389,9 @@
 			}
 		}
 		zval_ptr_dtor(zv);

+#if MYSQLND_DEBUG_MEMORY

+		DBG_VOID_RETURN;

+#endif

 		return;
 	}

@@ -442,6 +452,9 @@

 		UNLOCK_PCACHE(cache);
 	}

+#if MYSQLND_DEBUG_MEMORY

+	DBG_VOID_RETURN;

+#endif

}
/* }}} */

Modified: trunk/mysqlnd/mysqlnd_result.c

trunk/mysqlnd/mysqlnd_result.c 2007-08-23 15:54:10 UTC (rev 948) +++ trunk/mysqlnd/mysqlnd_result.c 2007-08-23 15:54:47 UTC (rev 949) @@ -99,11 +99,15 @@ zend_bool copy_ctor_called; mysqlnd_palloc_zval_ptr_dtor(&(current_row[col]), zval_cache, result->type, &copy_ctor_called TSRMLS_CC);
+#if MYSQLND_DEBUG_MEMORY
DBG_INF_FMT("Copy_ctor_called=%d", copy_ctor_called);
+#endif
MYSQLND_INC_GLOBAL_STATISTIC(copy_ctor_called? STAT_COPY_ON_WRITE_PERFORMED: STAT_COPY_ON_WRITE_SAVED); }
+#if MYSQLND_DEBUG_MEMORY
DBG_INF("Freeing current_row & current_buffer");
+#endif
pefree(current_row, set->persistent); pefree(current_buffer, set->persistent); }

Modified: trunk/mysqlnd/mysqlnd_result_meta.c

trunk/mysqlnd/mysqlnd_result_meta.c 2007-08-23 15:54:10 UTC (rev 948) +++ trunk/mysqlnd/mysqlnd_result_meta.c 2007-08-23 15:54:47 UTC (rev 949) @@ -34,12 +34,16 @@ { if (meta) { if (meta->root) {
+#if MYSQLND_DEBUG_MEMORY
DBG_INF("Freeing field metadata root");
+#endif
mnd_pefree(meta->root, persistent); meta->root = NULL; } if (meta->def) {
+#if MYSQLND_DEBUG_MEMORY
DBG_INF("Freeing field def");
+#endif
mnd_pefree(meta->def, persistent); meta->def = NULL; }

Modified: trunk/mysqlnd/mysqlnd_statistics.c

trunk/mysqlnd/mysqlnd_statistics.c 2007-08-23 15:54:10 UTC (rev 948) +++ trunk/mysqlnd/mysqlnd_statistics.c 2007-08-23 15:54:47 UTC (rev 949) @@ -23,6 +23,7 @@ #include "mysqlnd.h" #include "mysqlnd_priv.h" #include "mysqlnd_statistics.h"
+#include "mysqlnd_debug.h"

typedef struct st_mysqlnd_string
@@ -123,12 +124,13 @@
PHPAPI void _mysqlnd_get_client_stats(zval *return_value TSRMLS_DC ZEND_FILE_LINE_DC) {

Do you need more help?

MYSQLND_STATS stats, *stats_ptr = mysqlnd_global_stats; -

+	DBG_ENTER("_mysqlnd_get_client_stats");
 	if (!stats_ptr) {
 		memset(&stats, 0, sizeof(stats));
 		stats_ptr = &stats;
 	}
 	mysqlnd_fill_stats_hash(stats_ptr, return_value TSRMLS_CC ZEND_FILE_LINE_CC);
+	DBG_VOID_RETURN;

}

Modified: trunk/mysqlnd/mysqlnd_wireprotocol.c

trunk/mysqlnd/mysqlnd_wireprotocol.c 2007-08-23 15:54:10 UTC (rev 948) +++ trunk/mysqlnd/mysqlnd_wireprotocol.c 2007-08-23 15:54:47 UTC (rev 949) @@ -28,14 +28,15 @@ #include "ext/standard/sha1.h" #include "php_network.h" #include "zend_ini.h" + #ifndef PHP_WIN32 #include <netinet/tcp.h> -#else - #endif

#define USE_CORK 0

+#define MYSQLND_SILENT 1

+
#define MYSQLND_DUMP_HEADER_N_BODY2
#define MYSQLND_DUMP_HEADER_N_BODY_FULL2

@@ -423,8 +424,9 @@

 	char *p = buffer;
 	int to_read = MYSQLND_HEADER_SIZE, ret;
 

+#if !MYSQLND_SILENT

 	DBG_ENTER("mysqlnd_read_header");

-
+#endif

 	do {
 		if (!(ret= php_stream_read(net->stream, p, to_read))) {
 			DBG_ERR_FMT("Error while reading header from socket");

@@ -452,14 +454,22 @@
#ifdef MYSQLND_DUMP_HEADER_N_BODY

DBG_ERR_FMT("HEADER: packet_no=%d size=%3d", header->packet_no, header->size); #endif
+#if !MYSQLND_SILENT

DBG_RETURN(PASS);
+#else

+ return PASS;
+#endif

}

 	DBG_ERR_FMT("Packets out of order. Expected %d received %d. Packet size=%d",
 				net->packet_no, header->packet_no, header->size);
 	php_error(E_WARNING, "Packets out of order. Expected %d received %d. Packet size=%d. PID=%d",
 			  net->packet_no, header->packet_no, header->size, getpid());
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

+#if !MYSQLND_SILENT

 	DBG_RETURN(FAIL);

+#else

+	return FAIL;

+#endif

}
/* }}} */

Can we help you?

@@ -470,14 +480,18 @@
{

 	size_t ret;
 	char *p = (char *)buf;
-	size_t enlarged = zend_memory_usage(FALSE TSRMLS_CC);
 	int iter = 0;
 	MYSQLND_NET *net = &conn->net;
 	size_t old_chunk_size = net->stream->chunk_size;

+#if MYSQLND_DEBUG_MEMORY

+	size_t start = zend_memory_usage(FALSE TSRMLS_CC);

+#endif

+#if !MYSQLND_SILENT

 	DBG_ENTER("mysqlnd_read_body");
+	DBG_INF_FMT("chunk_size=%d", net->stream->chunk_size);

+#endif

DBG_INF_FMT("chunk_size=%d", net->stream->chunk_size); net->stream->chunk_size = MIN(size, conn->options.net_read_buffer_size); do { size -= (ret = php_stream_read(net->stream, p, size)); @@ -487,10 +501,13 @@ } p += ret; } while (size > 0);
enlarged = zend_memory_usage(FALSE TSRMLS_CC) - enlarged;
DBG_INF_FMT("Streams ate %lu to increase the read buffer", enlarged);
+#if MYSQLND_DEBUG_MEMORY
+ DBG_INF_FMT("Streams ate %lu to increase the read buffer", zend_memory_usage(FALSE TSRMLS_CC) - start);
+#endif
+ MYSQLND_INC_CONN_STATISTIC_W_VALUE(&conn->stats, STAT_BYTES_RECEIVED, p - (char*)buf); net->stream->chunk_size = old_chunk_size; + #ifdef MYSQLND_DUMP_HEADER_N_BODY_FULL { int i; @@ -511,7 +528,11 @@ } #endif

+#if !MYSQLND_SILENT

DBG_RETURN(p - (char*)buf);
+#else

+ return p - (char*)buf;
+#endif

}
/* }}} */

@@ -1194,10 +1215,10 @@

 		*(root_ptr +=len) = '\0';
 		root_ptr++;
 	}

-
+/*

 	DBG_INF_FMT("FIELD=[%s.%s.%s]", meta->db? meta->db:"*NA*", meta->table? meta->table:"*NA*",
 				meta->name? meta->name:"*NA*");

-
+*/

DBG_RETURN(PASS); faulty_fake:
@@ -1232,7 +1253,6 @@

 	mysqlnd_packet_header header;
 	zend_uchar *new_buf = NULL, *p = *buf;
 	zend_bool first_iteration = TRUE;
-	MYSQLND_NET *net = &conn->net;
 
 	DBG_ENTER("php_mysqlnd_read_row_ex");

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com

Received on Thu Aug 23 11:54:54 2007

This message: [ Message body ]
Next message: U-ROWVWADEjas: "bk commit into 6.0-falcon tree (jas:1.2695)"
Previous message: ahristov(at)mysql.com: "PHP mysqlnd svn commit: r948 - in trunk: php5/ext/mysqli php6/ext/mysqli"

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]

This archive was generated by hypermail 2.1.8 : Sun Oct 07 2007 - 08:45:04 EDT