Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-28 07:58:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't alloc storage for fds and log buffer each time through poll

Browse source 
loop; instead reuse and realloc when needs to grow.
This commit is contained in:
ehouse 2009-07-28 05:08:15 +00:00
parent 8c7c457a54
commit 6b1cf247bf
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
xwords4/relay/tpool.cpp
View file

@ -250,18 +250,25 @@ XWThreadPool::real_listener()
{ {
int flags = POLLIN | POLLERR | POLLHUP; int flags = POLLIN | POLLERR | POLLHUP;
TimerMgr* tmgr = TimerMgr::GetTimerMgr(); TimerMgr* tmgr = TimerMgr::GetTimerMgr();
int nSocketsAllocd = 1;
struct pollfd* fds = (pollfd*)calloc( nSocketsAllocd, sizeof(fds[0]) );
char* log = (char*)malloc( 4 * nSocketsAllocd );
for ( ; ; ) { for ( ; ; ) {
pthread_rwlock_rdlock( &m_activeSocketsRWLock ); pthread_rwlock_rdlock( &m_activeSocketsRWLock );
int nSockets = m_activeSockets.size() + 1; /* for pipe */ int nSockets = m_activeSockets.size() + 1; /* for pipe */
/* Don't malloc this thing every time!!! */ /* Don't malloc this thing every time!!! */
pollfd* fds = (pollfd*)calloc( nSockets, sizeof(fds[0]) );
pollfd* curfd = fds;
int logCapacity = 4 * nSockets; int logCapacity = 4 * nSockets;
char* log = (char*)malloc( logCapacity );
log[0] = '\0';
int logLen = 0; int logLen = 0;
if ( nSockets > nSocketsAllocd ) {
fds = (struct pollfd*)realloc( fds, nSockets * sizeof(fds[0]) );
log = (char*)realloc( log, nSockets * 4 );
nSocketsAllocd = nSockets;
}
struct pollfd* curfd = fds;
curfd->fd = m_pipeRead; curfd->fd = m_pipeRead;
curfd->events = flags; curfd->events = flags;
@ -334,9 +341,6 @@ XWThreadPool::real_listener()
} }
assert( nEvents == 0 ); assert( nEvents == 0 );
} }
free( fds );
free( log );
} }
logf( XW_LOGINFO, "real_listener returning" ); logf( XW_LOGINFO, "real_listener returning" );