PHP mysqlnd svn commit: r883 - trunk/php6/ext/mysqli

[ahristov]

Author: ahristov
Date: 2007-08-13 16:08:37 +0200 (Mon, 13 Aug 2007)
New Revision: 883

Modified:
   trunk/php6/ext/mysqli/mysqli.c
   trunk/php6/ext/mysqli/mysqli_nonapi.c
   trunk/php6/ext/mysqli/php_mysqli_structs.h
Log:
more info for phpinfo(). max_persistent & num_persistent are stubs


Modified: trunk/php6/ext/mysqli/mysqli.c
===================================================================
--- trunk/php6/ext/mysqli/mysqli.c	2007-08-13 12:15:21 UTC (rev 882)
+++ trunk/php6/ext/mysqli/mysqli.c	2007-08-13 14:08:37 UTC (rev 883)
@@ -527,7 +527,9 @@
 static PHP_GINIT_FUNCTION(mysqli)
 {
 	mysqli_globals->num_links = 0;
+	mysqli_globals->num_persistent = 0;
 	mysqli_globals->max_links = -1;
+	mysqli_globals->max_persistent = -1;
 	mysqli_globals->default_port = 0;
 	mysqli_globals->default_host = NULL;
 	mysqli_globals->default_user = NULL;
@@ -813,6 +815,8 @@
  */
 PHP_MINFO_FUNCTION(mysqli)
 {
+	char buf[32];
+
 	php_info_print_table_start();
 	php_info_print_table_header(2, "MysqlI Support", "enabled");
 	php_info_print_table_row(2, "Client API library version", mysql_get_client_info());
@@ -820,6 +824,10 @@
 	php_info_print_table_row(2, "Client API header version", MYSQL_SERVER_VERSION);
 	php_info_print_table_row(2, "MYSQLI_SOCKET", MYSQL_UNIX_ADDR);
 #else
+	snprintf(buf, sizeof(buf), "%ld", MyG(num_persistent));
+	php_info_print_table_row(2, "Active Persistent Links", buf);
+	snprintf(buf, sizeof(buf), "%ld", MyG(num_links));
+	php_info_print_table_row(2, "Active Links", buf);
 	{
 		zval values;
 

Modified: trunk/php6/ext/mysqli/mysqli_nonapi.c
===================================================================
--- trunk/php6/ext/mysqli/mysqli_nonapi.c	2007-08-13 12:15:21 UTC (rev 882)
+++ trunk/php6/ext/mysqli/mysqli_nonapi.c	2007-08-13 14:08:37 UTC (rev 883)
@@ -120,6 +120,15 @@
 			}	
 		}
 	}
+#if A0
+	if (MyG(max_links) != -1 && MyG(num_links) >= MyG(max_links)) {
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Too many open links (%ld)",
MyG(num_links));
+		if (persistent) {
+			efree(hash_key);
+		}
+		RETURN_FALSE;	
+	}
+#endif
 
 #if !defined(HAVE_MYSQLND)
 	if (!(mysql->mysql = mysql_init(NULL))) {
@@ -207,6 +216,7 @@
 	if (persistent) {
 		efree(hash_key);
 	}
+	MyG(num_links)++;
 
 #if !defined(HAVE_MYSQLND)
 	mysql->multi_query = 0;

Modified: trunk/php6/ext/mysqli/php_mysqli_structs.h
===================================================================
--- trunk/php6/ext/mysqli/php_mysqli_structs.h	2007-08-13 12:15:21 UTC (rev 882)
+++ trunk/php6/ext/mysqli/php_mysqli_structs.h	2007-08-13 14:08:37 UTC (rev 883)
@@ -347,6 +347,8 @@
 	long			default_link;
 	long			num_links;
 	long			max_links;
+	long 			num_persistent;
+	long			max_persistent;
 	long			cache_size;
 	unsigned long	default_port;
 	char			*default_host;