less trace info

Author: faizshukri

ext/mysqlnd/mysqlnd.c

@@ -138,47 +138,38 @@ MYSQLND_METHOD(mysqlnd_conn, free_contents)(MYSQLND * conn TSRMLS_DC)
 	DBG_INF("Freeing memory of members");
 
 	if (conn->host) {
-		DBG_INF("Freeing host");
 		mnd_pefree(conn->host, pers);
 		conn->host = NULL;
 	}
 	if (conn->user) {
-		DBG_INF("Freeing user");
 		mnd_pefree(conn->user, pers);
 		conn->user = NULL;
 	}
 	if (conn->passwd) {
-		DBG_INF("Freeing passwd");
 		mnd_pefree(conn->passwd, pers);
 		conn->passwd = NULL;
 	}
 	if (conn->connect_or_select_db) {
-		DBG_INF("Freeing connect_or_select_db");
 		mnd_pefree(conn->connect_or_select_db, pers);
 		conn->connect_or_select_db = NULL;
 	}
 	if (conn->unix_socket) {
-		DBG_INF("Freeing unix_socket");
 		mnd_pefree(conn->unix_socket, pers);
 		conn->unix_socket = NULL;
 	}
 	if (conn->scheme) {
-		DBG_INF("Freeing scheme");
 		mnd_pefree(conn->scheme, pers);
 		conn->scheme = NULL;
 	}
 	if (conn->server_version) {
-		DBG_INF("Freeing server_version");
 		mnd_pefree(conn->server_version, pers);
 		conn->server_version = NULL;
 	}
 	if (conn->host_info) {
-		DBG_INF("Freeing host_info");
 		mnd_pefree(conn->host_info, pers);
 		conn->host_info = NULL;
 	}
 	if (conn->auth_plugin_data) {
-		DBG_INF("Freeing auth_plugin_data");
 		mnd_pefree(conn->auth_plugin_data, pers);
 		conn->auth_plugin_data = NULL;
 	}
@@ -205,13 +196,11 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_conn, dtor)(MYSQLND * conn TSRMLS_DC)
 	conn->m->free_options(conn TSRMLS_CC);
 
 	if (conn->net) {
-		DBG_INF("Freeing net");
 		mysqlnd_net_free(conn->net TSRMLS_CC);
 		conn->net = NULL;
 	}
 
 	if (conn->protocol) {
-		DBG_INF("Freeing protocol");
 		mysqlnd_protocol_free(conn->protocol TSRMLS_CC);
 		conn->protocol = NULL;
 	}
@@ -2168,12 +2157,10 @@ MYSQLND_METHOD(mysqlnd_conn, set_client_option)(MYSQLND * const conn,
 #endif
 #ifdef MYSQLND_STRING_TO_INT_CONVERSION
 		case MYSQLND_OPT_INT_AND_FLOAT_NATIVE:
-			DBG_INF("MYSQLND_OPT_INT_AND_FLOAT_NATIVE");
 			conn->options.int_and_float_native = *(unsigned int*) value;
 			break;
 #endif
 		case MYSQL_OPT_LOCAL_INFILE:
-			DBG_INF("MYSQL_OPT_LOCAL_INFILE");
 			if (!value || (*(unsigned int*) value) ? 1 : 0) {
 				conn->options.flags |= CLIENT_LOCAL_FILES;
 			} else {
@@ -2184,8 +2171,6 @@ MYSQLND_METHOD(mysqlnd_conn, set_client_option)(MYSQLND * const conn,
 		{
 			char ** new_init_commands;
 			char * new_command;
-			DBG_INF("MYSQL_INIT_COMMAND");
-			DBG_INF_FMT("command=%s", value);
 			/* when num_commands is 0, then realloc will be effectively a malloc call, internally */
 			/* Don't assign to conn->options.init_commands because in case of OOM we will lose the pointer and leak */
 			new_init_commands = mnd_perealloc(conn->options.init_commands, sizeof(char *) * (conn->options.num_commands + 1), conn->persistent);
@@ -2212,7 +2197,6 @@ MYSQLND_METHOD(mysqlnd_conn, set_client_option)(MYSQLND * const conn,
 		case MYSQL_SET_CHARSET_NAME:
 		{
 			char * new_charset_name = mnd_pestrdup(value, conn->persistent);
-			DBG_INF("MYSQL_SET_CHARSET_NAME");
 			if (!new_charset_name) {
 				goto oom;
 			}
@@ -2251,7 +2235,6 @@ MYSQLND_METHOD(mysqlnd_conn, set_client_option)(MYSQLND * const conn,
 		case MYSQLND_OPT_AUTH_PROTOCOL:
 		{
 			char * new_auth_protocol = value? mnd_pestrdup(value, conn->persistent) : NULL;
-			DBG_INF("MYSQLND_OPT_AUTH_PROTOCOL");
 			if (value && !new_auth_protocol) {
 				goto oom;
 			}
@@ -2294,8 +2277,7 @@ MYSQLND_METHOD(mysqlnd_conn, use_result)(MYSQLND * const conn TSRMLS_DC)
 
 	/* Nothing to store for UPSERT/LOAD DATA */
 	if (conn->last_query_type != QUERY_SELECT || CONN_GET_STATE(conn) != CONN_FETCHING_DATA) {
-		SET_CLIENT_ERROR(conn->error_info, CR_COMMANDS_OUT_OF_SYNC, UNKNOWN_SQLSTATE,
-						 mysqlnd_out_of_sync);
+		SET_CLIENT_ERROR(conn->error_info, CR_COMMANDS_OUT_OF_SYNC, UNKNOWN_SQLSTATE, mysqlnd_out_of_sync);
 		DBG_ERR("Command out of sync");
 		DBG_RETURN(NULL);
 	}
@@ -2330,8 +2312,7 @@ MYSQLND_METHOD(mysqlnd_conn, store_result)(MYSQLND * const conn TSRMLS_DC)
 
 	/* Nothing to store for UPSERT/LOAD DATA*/
 	if (conn->last_query_type != QUERY_SELECT || CONN_GET_STATE(conn) != CONN_FETCHING_DATA) {
-		SET_CLIENT_ERROR(conn->error_info, CR_COMMANDS_OUT_OF_SYNC, UNKNOWN_SQLSTATE,
-						 mysqlnd_out_of_sync);
+		SET_CLIENT_ERROR(conn->error_info, CR_COMMANDS_OUT_OF_SYNC, UNKNOWN_SQLSTATE, mysqlnd_out_of_sync);
 		DBG_ERR("Command out of sync");
 		DBG_RETURN(NULL);
 	}
@@ -2355,7 +2336,6 @@ MYSQLND_METHOD(mysqlnd_conn, get_connection_stats)(const MYSQLND * const conn,
 												   TSRMLS_DC ZEND_FILE_LINE_DC)
 {
 	DBG_ENTER("mysqlnd_conn::get_connection_stats");
-	DBG_INF_FMT("conn=%llu", conn->thread_id);
 	mysqlnd_fill_stats_hash(conn->stats, mysqlnd_stats_values_names, return_value TSRMLS_CC ZEND_FILE_LINE_CC);
 	DBG_VOID_RETURN;
 }

ext/mysqlnd/mysqlnd_net.c

@@ -68,7 +68,7 @@ MYSQLND_METHOD(mysqlnd_net, network_read)(MYSQLND * conn, zend_uchar * buffer, s
 	size_t to_read = count, ret;
 	size_t old_chunk_size = conn->net->stream->chunk_size;
 	DBG_ENTER("mysqlnd_net::network_read");
-	DBG_INF_FMT("count=%u", count);
+	DBG_INF_FMT("count="MYSQLND_SZ_T_SPEC, count);
 	conn->net->stream->chunk_size = MIN(to_read, conn->net->options.net_read_buffer_size);
 	while (to_read) {
 		if (!(ret = php_stream_read(conn->net->stream, (char *) buffer, to_read))) {
@@ -240,7 +240,7 @@ MYSQLND_METHOD(mysqlnd_net, send)(MYSQLND * const conn, zend_uchar * const buf,
 	size_t to_be_sent;
 
 	DBG_ENTER("mysqlnd_net::send");
-	DBG_INF_FMT("conn=%llu count=%lu compression=%u", conn->thread_id, count, net->compressed);
+	DBG_INF_FMT("conn=%llu count=" MYSQLND_SZ_T_SPEC " compression=%u", conn->thread_id, count, net->compressed);
 
 	net->stream->chunk_size = MYSQLND_MAX_PACKET_SIZE;
 
@@ -665,11 +665,9 @@ MYSQLND_METHOD(mysqlnd_net, set_client_option)(MYSQLND_NET * const net, enum mys
 			break;
 #ifdef WHEN_SUPPORTED_BY_MYSQLI
 		case MYSQL_OPT_READ_TIMEOUT:
-			DBG_INF("MYSQL_OPT_READ_TIMEOUT");
 			net->options.timeout_read = *(unsigned int*) value;
 			break;
 		case MYSQL_OPT_WRITE_TIMEOUT:
-			DBG_INF("MYSQL_OPT_WRITE_TIMEOUT");
 			net->options.timeout_write = *(unsigned int*) value;
 			break;
 #endif
@@ -748,19 +746,16 @@ MYSQLND_METHOD(mysqlnd_net, enable_ssl)(MYSQLND_NET * const net TSRMLS_DC)
 	if (net->options.ssl_key) {
 		zval key_zval;
 		ZVAL_STRING(&key_zval, net->options.ssl_key, 0);
-		DBG_INF("key");
 		php_stream_context_set_option(context, "ssl", "local_pk", &key_zval);
 	}
 	if (net->options.ssl_verify_peer) {
 		zval verify_peer_zval;
 		ZVAL_TRUE(&verify_peer_zval);
-		DBG_INF("verify peer");
 		php_stream_context_set_option(context, "ssl", "verify_peer", &verify_peer_zval);
 	}
 	if (net->options.ssl_cert) {
 		zval cert_zval;
 		ZVAL_STRING(&cert_zval, net->options.ssl_cert, 0);
-		DBG_INF_FMT("local_cert=%s", net->options.ssl_cert);
 		php_stream_context_set_option(context, "ssl", "local_cert", &cert_zval);
 		if (!net->options.ssl_key) {
 			php_stream_context_set_option(context, "ssl", "local_pk", &cert_zval);
@@ -769,13 +764,11 @@ MYSQLND_METHOD(mysqlnd_net, enable_ssl)(MYSQLND_NET * const net TSRMLS_DC)
 	if (net->options.ssl_ca) {
 		zval cafile_zval;
 		ZVAL_STRING(&cafile_zval, net->options.ssl_ca, 0);
-		DBG_INF_FMT("cafile=%s", net->options.ssl_ca);
 		php_stream_context_set_option(context, "ssl", "cafile", &cafile_zval);
 	}
 	if (net->options.ssl_capath) {
 		zval capath_zval;
 		ZVAL_STRING(&capath_zval, net->options.ssl_capath, 0);
-		DBG_INF_FMT("capath=%s", net->options.ssl_capath);
 		php_stream_context_set_option(context, "ssl", "cafile", &capath_zval);
 	}
 	if (net->options.ssl_passphrase) {
@@ -786,7 +779,6 @@ MYSQLND_METHOD(mysqlnd_net, enable_ssl)(MYSQLND_NET * const net TSRMLS_DC)
 	if (net->options.ssl_cipher) {
 		zval cipher_zval;
 		ZVAL_STRING(&cipher_zval, net->options.ssl_cipher, 0);
-		DBG_INF_FMT("ciphers=%s", net->options.ssl_cipher);
 		php_stream_context_set_option(context, "ssl", "ciphers", &cipher_zval);
 	}
 	php_stream_context_set(net->stream, context);

ext/mysqlnd/mysqlnd_ps.c

@@ -226,7 +226,6 @@ MYSQLND_METHOD(mysqlnd_stmt, next_result)(MYSQLND_STMT * s TSRMLS_DC)
 	}
 
 	DBG_INF_FMT("server_status=%u cursor=%u", stmt->upsert_status.server_status, stmt->upsert_status.server_status & SERVER_STATUS_CURSOR_EXISTS);
-	DBG_INF_FMT("server_status=%u cursor=%u", conn->upsert_status.server_status, conn->upsert_status.server_status & SERVER_STATUS_CURSOR_EXISTS);
 
 	/* Free space for next result */
 	s->m->free_stmt_content(s TSRMLS_CC);
@@ -838,7 +837,7 @@ mysqlnd_stmt_fetch_row_unbuffered(MYSQLND_RES *result, void *param, unsigned int
 
 	if (result->unbuf->eof_reached) {
 		/* No more rows obviously */
-		DBG_INF("eof reached");
+		DBG_INF("EOF already reached");
 		DBG_RETURN(PASS);
 	}
 	if (CONN_GET_STATE(result->conn) != CONN_FETCHING_DATA) {
@@ -864,7 +863,6 @@ mysqlnd_stmt_fetch_row_unbuffered(MYSQLND_RES *result, void *param, unsigned int
 		if (!row_packet->skip_extraction) {
 			result->m.unbuffered_free_last_data(result TSRMLS_CC);
 
-			DBG_INF("extracting data");
 			result->unbuf->last_row_data = row_packet->fields;
 			result->unbuf->last_row_buffer = row_packet->row_buffer;
 			row_packet->fields = NULL;
@@ -986,7 +984,6 @@ MYSQLND_METHOD(mysqlnd_stmt, use_result)(MYSQLND_STMT * s TSRMLS_DC)
 	MYSQLND_INC_CONN_STATISTIC(stmt->conn->stats, STAT_PS_UNBUFFERED_SETS);
 	result = stmt->result;
 
-	DBG_INF_FMT("%scursor exists", stmt->cursor_exists? "":"no ");
 	result->m.use_result(stmt->result, TRUE TSRMLS_CC);
 	result->m.fetch_row	= stmt->cursor_exists? mysqlnd_fetch_stmt_row_cursor:
 											   mysqlnd_stmt_fetch_row_unbuffered;
@@ -1048,11 +1045,9 @@ mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES *result, void *param, unsigned int fla
 	if (PASS == (ret = PACKET_READ(row_packet, result->conn)) && !row_packet->eof) {
 		unsigned int i, field_count = result->field_count;
 
-		DBG_INF_FMT("skip_extraction=%u", row_packet->skip_extraction); 
 		if (!row_packet->skip_extraction) {
 			result->m.unbuffered_free_last_data(result TSRMLS_CC);
 
-			DBG_INF("extracting data");
 			result->unbuf->last_row_data = row_packet->fields;
 			result->unbuf->last_row_buffer = row_packet->row_buffer;
 			row_packet->fields = NULL;
@@ -1468,8 +1463,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_one_parameter)(MYSQLND_STMT * const s, unsigne
 	if (!stmt || !stmt->conn) {
 		DBG_RETURN(FAIL);
 	}
-	DBG_INF_FMT("stmt=%lu param_no=%u param_count=%u type=%u",
-				stmt->stmt_id, param_no, stmt->param_count, type);
+	DBG_INF_FMT("stmt=%lu param_no=%u param_count=%u type=%u", stmt->stmt_id, param_no, stmt->param_count, type);
 
 	if (stmt->state < MYSQLND_STMT_PREPARED) {
 		SET_STMT_ERROR(stmt, CR_NO_PREPARE_STMT, UNKNOWN_SQLSTATE, mysqlnd_stmt_not_prepared);
@@ -1539,7 +1533,6 @@ MYSQLND_METHOD(mysqlnd_stmt, refresh_bind_param)(MYSQLND_STMT * const s TSRMLS_D
 	if (stmt->param_count) {
 		stmt->send_types_to_server = 1;
 	}
-	DBG_INF("PASS");
 	DBG_RETURN(PASS);
 }
 /* }}} */
@@ -1987,8 +1980,7 @@ mysqlnd_stmt_separate_result_bind(MYSQLND_STMT * const s TSRMLS_DC)
 	if (!stmt) {
 		DBG_VOID_RETURN;
 	}
-	DBG_INF_FMT("stmt=%lu result_bind=%p field_count=%u",
-				stmt->stmt_id, stmt->result_bind, stmt->field_count);
+	DBG_INF_FMT("stmt=%lu result_bind=%p field_count=%u", stmt->stmt_id, stmt->result_bind, stmt->field_count);
 
 	if (!stmt->result_bind) {
 		DBG_VOID_RETURN;
@@ -2042,8 +2034,7 @@ mysqlnd_stmt_separate_one_result_bind(MYSQLND_STMT * const s, unsigned int param
 	if (!stmt) {
 		DBG_VOID_RETURN;
 	}
-	DBG_INF_FMT("stmt=%lu result_bind=%p field_count=%u param_no=%u",
-				stmt->stmt_id, stmt->result_bind, stmt->field_count, param_no);
+	DBG_INF_FMT("stmt=%lu result_bind=%p field_count=%u param_no=%u", stmt->stmt_id, stmt->result_bind, stmt->field_count, param_no);
 
 	if (!stmt->result_bind) {
 		DBG_VOID_RETURN;
@@ -2093,8 +2084,7 @@ MYSQLND_METHOD(mysqlnd_stmt, free_stmt_content)(MYSQLND_STMT * const s TSRMLS_DC
 	if (!stmt) {
 		DBG_VOID_RETURN;
 	}
-	DBG_INF_FMT("stmt=%lu param_bind=%p param_count=%u",
-				stmt->stmt_id, stmt->param_bind, stmt->param_count);
+	DBG_INF_FMT("stmt=%lu param_bind=%p param_count=%u", stmt->stmt_id, stmt->param_bind, stmt->param_count);
 
 	/* Destroy the input bind */
 	if (stmt->param_bind) {
@@ -2159,7 +2149,6 @@ MYSQLND_METHOD_PRIVATE(mysqlnd_stmt, net_close)(MYSQLND_STMT * const s, zend_boo
 	  clean.
 	*/
 	do {
-		DBG_INF_FMT("stmt->state=%u", stmt->state);
 		if (stmt->state == MYSQLND_STMT_WAITING_USE_OR_STORE) {
 			DBG_INF("fetching result set header");
 			stmt->default_rset_handler(s TSRMLS_CC);
@@ -2229,7 +2218,6 @@ MYSQLND_METHOD(mysqlnd_stmt, dtor)(MYSQLND_STMT * const s, zend_bool implicit TS
 
 	DBG_ENTER("mysqlnd_stmt::dtor");
 	if (stmt) {
-
 		DBG_INF_FMT("stmt=%p", stmt);
 
 		MYSQLND_INC_GLOBAL_STATISTIC(implicit == TRUE?	STAT_STMT_CLOSE_IMPLICIT: