Merge pull request #1701 from vitalikvoip/2.4_fix_tcpchild_busy_counter

Fix TCP connections load balancing to use all TCP workers evenly
(cherry picked from commit 55d95ec)

net/net_tcp.c

@@ -1206,6 +1206,8 @@ inline static int handle_tcp_worker(struct tcp_child* tcp_c, int fd_i)
 			break;
 		case ASYNC_WRITE:
 			tcp_c->busy--;
+			/* fall through*/
+		case ASYNC_WRITE2:
 			if (tcpconn->state==S_CONN_BAD){
 				tcpconn_destroy(tcpconn);
 				break;
@@ -1220,6 +1222,8 @@ inline static int handle_tcp_worker(struct tcp_child* tcp_c, int fd_i)
 		case CONN_EOF:
 			/* WARNING: this will auto-dec. refcnt! */
 			tcp_c->busy--;
+			/* fall through*/
+		case CONN_ERROR2:
 			if ((tcpconn->flags & F_CONN_REMOVED) != F_CONN_REMOVED &&
 				(tcpconn->s!=-1)){
 				reactor_del_all( tcpconn->s, -1, IO_FD_CLOSING);

net/net_tcp_proc.c

@@ -79,11 +79,11 @@ void tcp_conn_release(struct tcp_connection* c, int pending_data)
 	if (c->state==S_CONN_BAD) {
 		c->lifetime=0;
 		/* CONN_ERROR will auto-dec refcnt => we must not call tcpconn_put !!*/
-		tcpconn_release(c, CONN_ERROR,1);
+		tcpconn_release(c, CONN_ERROR2,1);
 		return;
 	}
 	if (pending_data) {
-		tcpconn_release(c, ASYNC_WRITE,1);
+		tcpconn_release(c, ASYNC_WRITE2,1);
 		return;
 	}
 	tcpconn_put(c);

net/tcp_conn.h

@@ -58,8 +58,8 @@
 
 
 /* fd communication commands - internal usage ONLY */
-enum conn_cmds { CONN_DESTROY=-3, CONN_ERROR=-2, CONN_EOF=-1, CONN_RELEASE,
-		CONN_GET_FD, CONN_NEW, ASYNC_CONNECT, ASYNC_WRITE, CONN_RELEASE_WRITE };
+enum conn_cmds { CONN_DESTROY=-4, CONN_ERROR=-3,CONN_ERROR2=-2, CONN_EOF=-1, CONN_RELEASE,
+		CONN_GET_FD, CONN_NEW, ASYNC_CONNECT, ASYNC_WRITE, ASYNC_WRITE2, CONN_RELEASE_WRITE };
 /* CONN_RELEASE, EOF, ERROR, DESTROY can be used by "reader" processes
  * CONN_GET_FD, NEW, ERROR only by writers */