|
From: Brian G. <ge...@us...> - 2007-12-11 08:46:13
|
Update of /cvsroot/playerstage/code/player/libplayertcp In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23242 Modified Files: playertcp.cc playerudp.cc Log Message: took out recursive mutex code Index: playerudp.cc =================================================================== RCS file: /cvsroot/playerstage/code/player/libplayertcp/playerudp.cc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** playerudp.cc 7 Dec 2007 01:50:15 -0000 1.11 --- playerudp.cc 11 Dec 2007 16:46:16 -0000 1.12 *************** *** 118,128 **** //this->client_ufds = (struct pollfd*)NULL; ! pthread_mutexattr_t mutex_attr; ! pthread_mutexattr_init(&mutex_attr); ! // TODO: see what happens if recursive mutexes are not available ! #ifdef PTHREAD_MUTEX_RECURSIVE ! pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE); ! #endif ! pthread_mutex_init(&this->clients_mutex,&mutex_attr); this->num_listeners = 0; --- 118,122 ---- //this->client_ufds = (struct pollfd*)NULL; ! pthread_mutex_init(&this->clients_mutex,NULL); this->num_listeners = 0; Index: playertcp.cc =================================================================== RCS file: /cvsroot/playerstage/code/player/libplayertcp/playertcp.cc,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** playertcp.cc 11 Dec 2007 01:58:01 -0000 1.72 --- playertcp.cc 11 Dec 2007 16:46:16 -0000 1.73 *************** *** 127,137 **** this->client_ufds = (struct pollfd*)NULL; ! pthread_mutexattr_t mutex_attr; ! pthread_mutexattr_init(&mutex_attr); ! // TODO: see what happens if recursive mutexes are not available ! #ifdef PTHREAD_MUTEX_RECURSIVE ! pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE); ! #endif ! pthread_mutex_init(&this->clients_mutex,&mutex_attr); this->num_listeners = 0; --- 127,131 ---- this->client_ufds = (struct pollfd*)NULL; ! pthread_mutex_init(&this->clients_mutex,NULL); this->num_listeners = 0; |