Fixed remove serv->connect_count, replace with maxfd

examples/server/echo.php

@@ -2,17 +2,18 @@
 $serv = new swoole_server("0.0.0.0", 9501);
 $serv->set(array(
 	//'tcp_defer_accept' => 5,
-	'worker_num' => 1,
+	'worker_num' => 2,
 	//'daemonize' => true,
 	//'log_file' => '/tmp/swoole.log'
 ));
 $serv->on('timer', function($serv, $interval) {
 	echo "onTimer: $interval\n";
 });
 $serv->on('start', function($serv) {
-       $serv->addtimer(1000);
+       //$serv->addtimer(1000);
 });
 $serv->on('workerStart', function($serv, $worker_id) {
+	//echo "server start\n";
 	//if($worker_id == 0) $serv->addtimer(1000);
 });
 $serv->on('connect', function ($serv, $fd, $from_id){

include/Server.h

@@ -241,10 +241,6 @@ struct swServer_s
 	 */
 	uint32_t max_conn;
 
-	/**
-	 * connect count
-	 */
-	uint32_t connect_count;
 	/**
 	 * worker process max request
 	 */

src/network/Connection.c

@@ -51,9 +51,9 @@ SWINLINE void swConnection_close(swServer *serv, int fd, int notify)
 	swReactor *reactor;
 	swEvent notify_ev;
 
-	if(conn == NULL)
+	if (conn == NULL)
 	{
-		swWarn("[Master]connection not found. fd=%d|max_fd=%d", fd, swServer_get_maxfd(serv));
+		swWarn("[Reactor]connection not found. fd=%d|max_fd=%d", fd, swServer_get_maxfd(serv));
 		return;
 	}
 
@@ -145,14 +145,6 @@ SWINLINE int swServer_new_connection(swServer *serv, swEvent *ev)
 	{
 		swServer_set_maxfd(serv, conn_fd);
 
-		/**
-		 * Correction of the number of connections
-		 */
-		if (serv->connect_count > conn_fd)
-		{
-			serv->connect_count = conn_fd;
-		}
-
 #ifdef SW_CONNECTION_LIST_EXPAND
 	//新的fd超过了最大fd
 
@@ -172,6 +164,7 @@ SWINLINE int swServer_new_connection(swServer *serv, swEvent *ev)
 			}
 		}
 #endif
+
 	}
 
 	connection = &(serv->connection_list[conn_fd]);
@@ -294,7 +287,6 @@ SWINLINE void swConnection_clear_string_buffer(swConnection *conn)
 
 int swConnection_send_in_buffer(swConnection *conn)
 {
-	swServer *serv = SwooleG.serv;
 	swFactory *factory = SwooleG.factory;
 	swEventData _send;
 
@@ -306,6 +298,7 @@ int swConnection_send_in_buffer(swConnection *conn)
 
 #ifdef SW_USE_RINGBUFFER
 
+	swServer *serv = SwooleG.serv;
 	swMemoryPool *pool = serv->reactor_threads[conn->from_id].pool;
 	swPackage package;
 

src/network/ReactorProcess.c

@@ -202,8 +202,6 @@ static int swReactorProcess_onClose(swReactor *reactor, swEvent *event)
 	{
 		serv->onClose(serv, event->fd, event->from_id);
 	}
-
-	serv->connect_count--;
 	return SW_OK;
 }
 

src/network/Server.c

@@ -63,7 +63,6 @@ static int swServer_master_onClose(swReactor *reactor, swEvent *event)
 	{
 		fd = queue[i];
 		conn = swServer_get_connection(serv, fd);
-		serv->connect_count--;
 
 		if (serv->onMasterClose != NULL)
 		{
@@ -83,13 +82,6 @@ static int swServer_master_onClose(swReactor *reactor, swEvent *event)
 			for (; serv->connection_list[find_max_fd].active == 0 && find_max_fd > swServer_get_minfd(serv); find_max_fd--);
 			swServer_set_maxfd(serv, find_max_fd);
 
-			/**
-			 * Correction of the number of connections
-			 */
-			if (serv->connect_count > find_max_fd)
-			{
-				serv->connect_count = find_max_fd;
-			}
 			swTrace("set_maxfd=%d|close_fd=%d", find_max_fd, fd);
 		}
 	}
@@ -166,12 +158,13 @@ int swServer_master_onAccept(swReactor *reactor, swEvent *event)
 				return SW_OK;
 			}
 		}
-		swTrace("[Master]accept.event->fd=%d|event->from_id=%d|conn=%d", event->fd, event->from_id, new_fd);
+
+		swTrace("[Master] Accept new connection. maxfd=%d|reactor_id=%d|conn=%d", swServer_get_maxfd(serv), reactor->id, new_fd);
 
 		//too many connection
-		if (serv->connect_count >= serv->max_conn)
+		if (swServer_get_maxfd(serv) >= serv->max_conn)
 		{
-			swWarn("Too many connections [now: %d].", serv->connect_count);
+			swWarn("Too many connections [now: %d].", swServer_get_maxfd(serv));
 			close(new_fd);
 			return SW_OK;
 		}
@@ -191,6 +184,7 @@ int swServer_master_onAccept(swReactor *reactor, swEvent *event)
 			int keep_idle = serv->tcp_keepidle;
 			int keep_interval = serv->tcp_keepinterval;
 			int keep_count = serv->tcp_keepcount;
+
 #ifdef TCP_KEEPIDLE
 			setsockopt(new_fd, SOL_SOCKET, SO_KEEPALIVE, (void *)&keepalive , sizeof(keepalive));
 			setsockopt(new_fd, IPPROTO_TCP, TCP_KEEPIDLE, (void*)&keep_idle , sizeof(keep_idle));
@@ -214,6 +208,7 @@ int swServer_master_onAccept(swReactor *reactor, swEvent *event)
 			swServer_reactor_schedule(serv);
 		}
 #endif
+
 		connEv.type = SW_EVENT_CONNECT;
 		connEv.from_id = reactor_id;
 		connEv.fd = new_fd;
@@ -235,8 +230,6 @@ int swServer_master_onAccept(swReactor *reactor, swEvent *event)
 		}
 		else
 		{
-			serv->connect_count++;
-
 			if(serv->onMasterConnect != NULL)
 			{
 				serv->onMasterConnect(serv, new_fd, reactor_id);

swoole.c

@@ -1153,15 +1153,15 @@ PHP_FUNCTION(swoole_server_handler)
 			"onManagerStart",
 			"onManagerStop",
 	};
-	for(i=0; i<PHP_SERVER_CALLBACK_NUM; i++)
+	for (i=0; i<PHP_SERVER_CALLBACK_NUM; i++)
 	{
 		if(strncasecmp(callback[i], ha_name, len) == 0)
 		{
 			ret = php_swoole_set_callback(i, cb TSRMLS_CC);
 			break;
 		}
 	}
-	if(ret < 0)
+	if (ret < 0)
 	{
 		php_error_docref(NULL TSRMLS_CC, E_ERROR, "swoole_server_handler: unkown handler[%s].", ha_name);
 	}
@@ -1217,7 +1217,8 @@ PHP_FUNCTION(swoole_server_on)
 			"managerStart",
 			"managerStop",
 	};
-	for(i=0; i<PHP_SERVER_CALLBACK_NUM; i++)
+
+	for (i=0; i<PHP_SERVER_CALLBACK_NUM; i++)
 	{
 		if(strncasecmp(callback[i], ha_name, len) == 0)
 		{
@@ -1274,6 +1275,7 @@ PHP_FUNCTION(swoole_server_close)
 		serv->onClose(serv, ev.fd, ev.from_id);
 		RETURN_TRUE;
 	}
+
 	RETURN_FALSE;
 }