Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-05 20:45:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

reduce logging; and fix valgrind-found problem using wrong

Browse source 
synchronization primative.
This commit is contained in:
Eric House 2011-06-29 21:37:33 -07:00
parent 04740486fb
commit 8e31fd88c3
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
xwords4/relay/tpool.cpp
View file

@ -95,6 +95,8 @@ XWThreadPool::Setup( int nThreads, packet_func pFunc, kill_func kFunc )
int result = pthread_create( &thread, NULL, listener_main, this ); int result = pthread_create( &thread, NULL, listener_main, this );
assert( result == 0 ); assert( result == 0 );
result = pthread_detach( thread );
assert( result == 0 );
} }
void void
@ -113,7 +115,6 @@ XWThreadPool::Stop()
void void
XWThreadPool::AddSocket( int socket, SockType stype ) XWThreadPool::AddSocket( int socket, SockType stype )
{ {
logf( XW_LOGINFO, "%s(%d)", __func__, socket );
{ {
RWWriteLock ml( &m_activeSocketsRWLock ); RWWriteLock ml( &m_activeSocketsRWLock );
m_activeSockets.push_back( pair<int,SockType>(socket, stype) ); m_activeSockets.push_back( pair<int,SockType>(socket, stype) );
@ -146,7 +147,7 @@ XWThreadPool::CloseSocket( int socket )
{ {
/* bool do_interrupt = false; */ /* bool do_interrupt = false; */
if ( !RemoveSocket( socket ) ) { if ( !RemoveSocket( socket ) ) {
RWWriteLock rwl( &m_activeSocketsRWLock ); MutexLock ml( &m_queueMutex );
deque<QueuePr>::iterator iter = m_queue.begin(); deque<QueuePr>::iterator iter = m_queue.begin();
while ( iter != m_queue.end() ) { while ( iter != m_queue.end() ) {
if ( iter->m_socket == socket ) { if ( iter->m_socket == socket ) {
@ -368,7 +369,6 @@ XWThreadPool::real_listener()
} }
if ( 0 != (fds[curfd].revents & (POLLIN | POLLPRI)) ) { if ( 0 != (fds[curfd].revents & (POLLIN | POLLPRI)) ) {
logf( XW_LOGINFO, "enqueuing %d", socket );
enqueue( socket, stypes[curfd] ); enqueue( socket, stypes[curfd] );
} else { } else {
logf( XW_LOGERROR, "odd revents: %x", logf( XW_LOGERROR, "odd revents: %x",
@ -409,15 +409,12 @@ XWThreadPool::enqueue( int socket, SockType stype, QAction act )
MutexLock ml( &m_queueMutex ); MutexLock ml( &m_queueMutex );
m_queue.push_back( pr ); m_queue.push_back( pr );
logf( XW_LOGINFO, "calling pthread_cond_signal" );
pthread_cond_signal( &m_queueCondVar ); pthread_cond_signal( &m_queueCondVar );
/* implicit unlock */
} }
void void
XWThreadPool::grab_elem_locked( QueuePr* prp ) XWThreadPool::grab_elem_locked( QueuePr* prp )
{ {
logf( XW_LOGINFO, "%s()", __func__ );
bool found = false; bool found = false;
prp->m_socket = -1; prp->m_socket = -1;
deque<QueuePr>::iterator iter; deque<QueuePr>::iterator iter;
@ -433,8 +430,6 @@ XWThreadPool::grab_elem_locked( QueuePr* prp )
} }
print_in_use(); print_in_use();
logf( XW_LOGINFO, "%s()=>%d", __func__, prp->m_socket );
} /* grab_elem_locked */ } /* grab_elem_locked */
void void