update hook connect

Author: [email protected]

co_hook_sys_call.cpp

@@ -262,10 +262,8 @@ int connect(int fd, const struct sockaddr *address, socklen_t address_len)
 
 	if( sizeof(lp->dest) >= address_len )
 	{
-		}
+		 memcpy( &(lp->dest),address,(int)address_len );
 	}
-	rpchook_t *lp = get_by_fd( fd );
-	if( lp )
 	if( O_NONBLOCK & lp->user_flag ) 
 	{
 		return ret;
@@ -978,11 +976,3 @@ struct hostent *co_gethostbyname(const char *name)
 	}
 }
 
-
-//gzrd_Lib_CPP_Version_ID--start
-#ifndef GZRD_SVN_ATTR
-#define GZRD_SVN_ATTR "0"
-#endif
-static char gzrd_Lib_CPP_Version_ID[] __attribute__((used))="$HeadURL$ $Id$ " GZRD_SVN_ATTR "__file__";
-// gzrd_Lib_CPP_Version_ID--end
-

co_routine.cpp

@@ -323,7 +323,7 @@ struct stTimeoutItem_t
 
 	enum
 	{
-		eMaxTimeout = 40 * 1000 //20s
+		eMaxTimeout = 40 * 1000 //40s
 	};
 	stTimeoutItem_t *pPrev;
 	stTimeoutItem_t *pNext;
@@ -673,6 +673,8 @@ static uint32_t PollEvent2Epoll( short events )
 	if( events & POLLOUT )  e |= EPOLLOUT;
 	if( events & POLLHUP ) 	e |= EPOLLHUP;
 	if( events & POLLERR )	e |= EPOLLERR;
+	if( events & POLLRDNORM ) e |= EPOLLRDNORM;
+	if( events & POLLWRNORM ) e |= EPOLLWRNORM;
 	return e;
 }
 static short EpollEvent2Poll( uint32_t events )
@@ -682,16 +684,17 @@ static short EpollEvent2Poll( uint32_t events )
 	if( events & EPOLLOUT ) e |= POLLOUT;
 	if( events & EPOLLHUP ) e |= POLLHUP;
 	if( events & EPOLLERR ) e |= POLLERR;
+	if( events & EPOLLRDNORM ) e |= POLLRDNORM;
+	if( events & EPOLLWRNORM ) e |= POLLWRNORM;
 	return e;
 }
 
-static stCoRoutineEnv_t* g_arrCoEnvPerThread[ 102400 ] = { 0 };
+static stCoRoutineEnv_t* g_arrCoEnvPerThread[ 204800 ] = { 0 };
 void co_init_curr_thread_env()
 {
 	pid_t pid = GetPid();	
 	g_arrCoEnvPerThread[ pid ] = (stCoRoutineEnv_t*)calloc( 1,sizeof(stCoRoutineEnv_t) );
 	stCoRoutineEnv_t *env = g_arrCoEnvPerThread[ pid ];
-	printf("init pid %ld env %p\n",(long)pid,env);
 
 	env->iCallStackSize = 0;
 	struct stCoRoutine_t *self = co_create_env( env, NULL, NULL,NULL );
@@ -1132,5 +1135,3 @@ stCoCondItem_t *co_cond_pop( stCoCond_t *link )
 	}
 	return p;
 }
-
-