aboutsummaryrefslogtreecommitdiff
path: root/src/stable
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/stable/client.cpp11
-rw-r--r--src/stable/client.h10
-rw-r--r--src/stable/server.cpp22
-rw-r--r--src/stable/server.h8
4 files changed, 50 insertions, 1 deletions
diff --git a/src/stable/client.cpp b/src/stable/client.cpp
index f6feb7c..56c5094 100644
--- a/src/stable/client.cpp
+++ b/src/stable/client.cpp
@@ -16,6 +16,13 @@
16 16
17/** Read buffer size. */ 17/** Read buffer size. */
18#define RBS (2000) // 1500 is the nominal MTU for ethernet, it's a good guess 18#define RBS (2000) // 1500 is the nominal MTU for ethernet, it's a good guess
19#ifdef PROFILE_BU_SERVER
20#define BU_PROFILE_START( x ) Bu::Profiler::getInstance().startEvent( x )
21#define BU_PROFILE_END( x ) Bu::Profiler::getInstance().endEvent( x )
22#else
23#define BU_PROFILE_START( x ) (void)0
24#define BU_PROFILE_END( x ) (void)0
25#endif
19 26
20Bu::Client::Client( Bu::TcpSocket *pSocket, 27Bu::Client::Client( Bu::TcpSocket *pSocket,
21 class Bu::ClientLinkFactory *pfLink ) : 28 class Bu::ClientLinkFactory *pfLink ) :
@@ -47,6 +54,7 @@ void Bu::Client::processInput()
47 char buf[RBS]; 54 char buf[RBS];
48 Bu::size nRead, nTotal=0; 55 Bu::size nRead, nTotal=0;
49 56
57 BU_PROFILE_START("client.read");
50 for(;;) 58 for(;;)
51 { 59 {
52 try 60 try
@@ -72,6 +80,7 @@ void Bu::Client::processInput()
72 break; 80 break;
73 } 81 }
74 } 82 }
83 BU_PROFILE_END("client.read");
75 mRead.unlock(); 84 mRead.unlock();
76 85
77 if( nTotal == 0 ) 86 if( nTotal == 0 )
@@ -82,7 +91,9 @@ void Bu::Client::processInput()
82 91
83 if( pProto && nTotal ) 92 if( pProto && nTotal )
84 { 93 {
94 BU_PROFILE_START("client.process");
85 pProto->onNewData( this ); 95 pProto->onNewData( this );
96 BU_PROFILE_END("client.process");
86 } 97 }
87} 98}
88 99
diff --git a/src/stable/client.h b/src/stable/client.h
index 119e2f7..abde682 100644
--- a/src/stable/client.h
+++ b/src/stable/client.h
@@ -16,6 +16,14 @@
16#include "bu/mutex.h" 16#include "bu/mutex.h"
17#include "bu/readwritemutex.h" 17#include "bu/readwritemutex.h"
18 18
19#ifndef PROFILE_BU_SERVER
20// #define PROFILE_BU_SERVER 1
21#endif
22
23#ifdef PROFILE_BU_SERVER
24#include "bu/profiler.h"
25#endif
26
19namespace Bu 27namespace Bu
20{ 28{
21 class Protocol; 29 class Protocol;
@@ -29,7 +37,7 @@ namespace Bu
29 class Client : public Bu::Stream 37 class Client : public Bu::Stream
30 { 38 {
31 public: 39 public:
32 Client( Bu::TcpSocket *pSocket, Bu::ClientLinkFactory *pfLink ); 40 Client( Bu::TcpSocket *pSocket, Bu::ClientLinkFactory *pfLink);
33 virtual ~Client(); 41 virtual ~Client();
34 42
35 void processInput(); 43 void processInput();
diff --git a/src/stable/server.cpp b/src/stable/server.cpp
index 3c42bf4..0552510 100644
--- a/src/stable/server.cpp
+++ b/src/stable/server.cpp
@@ -13,17 +13,27 @@
13#include "bu/tcpsocket.h" 13#include "bu/tcpsocket.h"
14#include "bu/config.h" 14#include "bu/config.h"
15 15
16#ifdef PROFILE_BU_SERVER
17#define BU_PROFILE_START( x ) Bu::Profiler::getInstance().startEvent( x )
18#define BU_PROFILE_END( x ) Bu::Profiler::getInstance().endEvent( x )
19#else
20#define BU_PROFILE_START( x ) (void)0
21#define BU_PROFILE_END( x ) (void)0
22#endif
23
16Bu::Server::Server() : 24Bu::Server::Server() :
17 nTimeoutSec( 0 ), 25 nTimeoutSec( 0 ),
18 nTimeoutUSec( 0 ), 26 nTimeoutUSec( 0 ),
19 bAutoTick( false ) 27 bAutoTick( false )
20{ 28{
29 BU_PROFILE_START("server");
21 FD_ZERO( &fdActive ); 30 FD_ZERO( &fdActive );
22} 31}
23 32
24Bu::Server::~Server() 33Bu::Server::~Server()
25{ 34{
26 shutdown(); 35 shutdown();
36 BU_PROFILE_START("server");
27} 37}
28 38
29void Bu::Server::addPort( int nPort, int nPoolSize ) 39void Bu::Server::addPort( int nPort, int nPoolSize )
@@ -50,6 +60,7 @@ void Bu::Server::setTimeout( int nTimeoutSec, int nTimeoutUSec )
50 60
51void Bu::Server::scan() 61void Bu::Server::scan()
52{ 62{
63 BU_PROFILE_START("scan");
53 struct timeval xTimeout = { nTimeoutSec, nTimeoutUSec }; 64 struct timeval xTimeout = { nTimeoutSec, nTimeoutUSec };
54 65
55 fd_set fdRead = fdActive; 66 fd_set fdRead = fdActive;
@@ -68,6 +79,7 @@ void Bu::Server::scan()
68 { 79 {
69 char buf[1024]; 80 char buf[1024];
70 strerror_r( errno, buf, 1024 ); 81 strerror_r( errno, buf, 1024 );
82 BU_PROFILE_END("scan");
71 throw ExceptionBase( 83 throw ExceptionBase(
72 Bu::String("Error attempting to scan open connections: %1: %2").arg( errno ).arg( buf ).end().getStr() 84 Bu::String("Error attempting to scan open connections: %1: %2").arg( errno ).arg( buf ).end().getStr()
73 ); 85 );
@@ -85,7 +97,9 @@ void Bu::Server::scan()
85 else 97 else
86 { 98 {
87 Client *pClient = hClients.get( j ); 99 Client *pClient = hClients.get( j );
100 BU_PROFILE_START("processInput");
88 pClient->processInput(); 101 pClient->processInput();
102 BU_PROFILE_END("processInput");
89 if( !pClient->isOpen() ) 103 if( !pClient->isOpen() )
90 { 104 {
91 closeClient( j ); 105 closeClient( j );
@@ -99,7 +113,9 @@ void Bu::Server::scan()
99 Client *pClient = hClients.get( j ); 113 Client *pClient = hClients.get( j );
100 try 114 try
101 { 115 {
116 BU_PROFILE_START("processOutput");
102 pClient->processOutput(); 117 pClient->processOutput();
118 BU_PROFILE_END("processOutput");
103 } 119 }
104 catch( Bu::TcpSocketException &e ) 120 catch( Bu::TcpSocketException &e )
105 { 121 {
@@ -133,10 +149,13 @@ void Bu::Server::scan()
133 149
134 if( bAutoTick ) 150 if( bAutoTick )
135 tick(); 151 tick();
152
153 BU_PROFILE_END("scan");
136} 154}
137 155
138void Bu::Server::addClient( socket_t nSocket, int nPort ) 156void Bu::Server::addClient( socket_t nSocket, int nPort )
139{ 157{
158 BU_PROFILE_START("addClient");
140 FD_SET( nSocket, &fdActive ); 159 FD_SET( nSocket, &fdActive );
141 160
142 Client *c = new Client( 161 Client *c = new Client(
@@ -146,6 +165,7 @@ void Bu::Server::addClient( socket_t nSocket, int nPort )
146 hClients.insert( nSocket, c ); 165 hClients.insert( nSocket, c );
147 166
148 onNewConnection( c, nPort ); 167 onNewConnection( c, nPort );
168 BU_PROFILE_END("addClient");
149} 169}
150 170
151Bu::Server::SrvClientLink::SrvClientLink( Bu::Client *pClient ) : 171Bu::Server::SrvClientLink::SrvClientLink( Bu::Client *pClient ) :
@@ -208,11 +228,13 @@ void Bu::Server::shutdown()
208 228
209void Bu::Server::closeClient( socket_t iSocket ) 229void Bu::Server::closeClient( socket_t iSocket )
210{ 230{
231 BU_PROFILE_START("closeClient");
211 Bu::Client *pClient = hClients.get( iSocket ); 232 Bu::Client *pClient = hClients.get( iSocket );
212 onClosedConnection( pClient ); 233 onClosedConnection( pClient );
213 pClient->close(); 234 pClient->close();
214 hClients.erase( iSocket ); 235 hClients.erase( iSocket );
215 FD_CLR( iSocket, &fdActive ); 236 FD_CLR( iSocket, &fdActive );
216 delete pClient; 237 delete pClient;
238 BU_PROFILE_END("closeClient");
217} 239}
218 240
diff --git a/src/stable/server.h b/src/stable/server.h
index ee76fd2..d3f0903 100644
--- a/src/stable/server.h
+++ b/src/stable/server.h
@@ -23,6 +23,14 @@
23 23
24#include "bu/config.h" 24#include "bu/config.h"
25 25
26#ifndef PROFILE_BU_SERVER
27// #define PROFILE_BU_SERVER 1
28#endif
29
30#ifdef PROFILE_BU_SERVER
31#include "bu/profiler.h"
32#endif
33
26namespace Bu 34namespace Bu
27{ 35{
28 class TcpServerSocket; 36 class TcpServerSocket;