From 3ce835a7b598478a787b80672f231797bd1bdc9a Mon Sep 17 00:00:00 2001 From: "Vanilla I. Shu" Date: Mon, 14 Dec 2009 07:13:07 +0000 Subject: Upgrade to 0.9.5. --- net/spserver/files/patch-speventcb.cpp | 78 +++------------------------------- 1 file changed, 7 insertions(+), 71 deletions(-) (limited to 'net/spserver/files/patch-speventcb.cpp') diff --git a/net/spserver/files/patch-speventcb.cpp b/net/spserver/files/patch-speventcb.cpp index 34ebbc9a0810..4b9d1ad3c622 100644 --- a/net/spserver/files/patch-speventcb.cpp +++ b/net/spserver/files/patch-speventcb.cpp @@ -1,66 +1,6 @@ ---- spserver/speventcb.cpp.orig 2008-10-23 22:08:00.000000000 +0800 -+++ spserver/speventcb.cpp 2009-07-02 11:44:48.000000000 +0800 -@@ -177,14 +177,16 @@ - addEvent( session, EV_READ, -1 ); - } else { - int saved = errno; -- sp_syslog( LOG_NOTICE, "session(%d.%d) read error, errno %d, status %d", -- sid.mKey, sid.mSeq, errno, session->getStatus() ); -+ if( 0 != errno ) { -+ sp_syslog( LOG_WARNING, "session(%d.%d) read error, errno %d, status %d", -+ sid.mKey, sid.mSeq, errno, session->getStatus() ); -+ } - - if( EAGAIN != saved ) { - if( 0 == session->getRunning() ) { - SP_EventHelper::doError( session ); - } else { -- addEvent( session, EV_READ, -1 ); -+ //addEvent( session, EV_READ, -1 ); - sp_syslog( LOG_NOTICE, "session(%d.%d) busy, process session error later", - sid.mKey, sid.mSeq ); - } -@@ -196,7 +198,7 @@ - if( 0 == session->getRunning() ) { - SP_EventHelper::doTimeout( session ); - } else { -- addEvent( session, EV_READ, -1 ); -+ //addEvent( session, EV_READ, -1 ); - sp_syslog( LOG_NOTICE, "session(%d.%d) busy, process session timeout later", - sid.mKey, sid.mSeq ); - } -@@ -230,7 +232,7 @@ - sid.mKey, sid.mSeq, errno, session->getStatus(), session->getOutList()->getCount() ); - SP_EventHelper::doError( session ); - } else { -- addEvent( session, EV_WRITE, -1 ); -+ //addEvent( session, EV_WRITE, -1 ); - sp_syslog( LOG_NOTICE, "session(%d.%d) busy, process session error later, errno [%d]", - sid.mKey, sid.mSeq, errno ); - } -@@ -244,10 +246,10 @@ - if( SP_Session::eExit == session->getStatus() ) { - ret = -1; - if( 0 == session->getRunning() ) { -- sp_syslog( LOG_NOTICE, "session(%d.%d) normal exit", sid.mKey, sid.mSeq ); -+ sp_syslog( LOG_WARNING, "session(%d.%d) normal exit", sid.mKey, sid.mSeq ); - SP_EventHelper::doClose( session ); - } else { -- addEvent( session, EV_WRITE, -1 ); -+ //addEvent( session, EV_WRITE, -1 ); - sp_syslog( LOG_NOTICE, "session(%d.%d) busy, terminate session later", - sid.mKey, sid.mSeq ); - } -@@ -269,7 +271,7 @@ - if( 0 == session->getRunning() ) { - SP_EventHelper::doTimeout( session ); - } else { -- addEvent( session, EV_WRITE, -1 ); -+ //addEvent( session, EV_WRITE, -1 ); - sp_syslog( LOG_NOTICE, "session(%d.%d) busy, process session timeout later", - sid.mKey, sid.mSeq ); - } -@@ -409,7 +411,7 @@ +--- spserver/speventcb.cpp.orig 2009-12-13 10:02:38.000000000 +0800 ++++ spserver/speventcb.cpp 2009-12-14 14:11:18.000000000 +0800 +@@ -422,7 +422,7 @@ void SP_EventHelper :: doWork( SP_Sessio char buffer[ 16 ] = { 0 }; session->getInBuffer()->take( buffer, sizeof( buffer ) ); sp_syslog( LOG_WARNING, "session(%d.%d) status is %d, ignore [%s...] (%dB)", @@ -69,7 +9,7 @@ session->getInBuffer()->reset(); } } -@@ -473,7 +475,7 @@ +@@ -486,7 +486,7 @@ void SP_EventHelper :: error( void * arg sp_syslog( LOG_WARNING, "session(%d.%d) error, r %d(%d), w %d(%d), i %d, o %d, s %d(%d)", sid.mKey, sid.mSeq, session->getTotalRead(), session->getReading(), session->getTotalWrite(), session->getWriting(), @@ -78,7 +18,7 @@ eventArg->getSessionManager()->getCount(), eventArg->getSessionManager()->getFreeCount() ); // onResponse will ignore this session, so it's safe to destroy session here -@@ -524,8 +526,8 @@ +@@ -537,8 +537,8 @@ void SP_EventHelper :: timeout( void * a sp_syslog( LOG_WARNING, "session(%d.%d) timeout, r %d(%d), w %d(%d), i %d, o %d, s %d(%d)", sid.mKey, sid.mSeq, session->getTotalRead(), session->getReading(), session->getTotalWrite(), session->getWriting(), @@ -89,12 +29,8 @@ // onResponse will ignore this session, so it's safe to destroy session here session->getHandler()->close(); -@@ -553,10 +555,10 @@ - SP_EventArg * eventArg = (SP_EventArg*)session->getArg(); - SP_Sid_t sid = session->getSid(); - -- sp_syslog( LOG_NOTICE, "session(%d.%d) close, r %d(%d), w %d(%d), i %d, o %d, s %d(%d)", -+ sp_syslog( LOG_WARNING, "session(%d.%d) close, r %d(%d), w %d(%d), i %d, o %d, s %d(%d)", +@@ -569,7 +569,7 @@ void SP_EventHelper :: myclose( void * a + sp_syslog( LOG_DEBUG, "session(%d.%d) close, r %d(%d), w %d(%d), i %d, o %d, s %d(%d)", sid.mKey, sid.mSeq, session->getTotalRead(), session->getReading(), session->getTotalWrite(), session->getWriting(), - session->getInBuffer()->getSize(), session->getOutList()->getCount(), -- cgit v1.2.3