[Playerstage-commit] code/player/server server.cc, 1.32.2.4, 1.32.2.5

[Brian G. <ge...@us...>]

Update of /cvsroot/playerstage/code/player/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12092/server

Modified Files:
      Tag: release-2-0-patches
	server.cc 
Log Message:
backported fixed playertcp mutex management from HEAD

Index: server.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/server.cc,v
retrieving revision 1.32.2.4
retrieving revision 1.32.2.5
diff -C2 -d -r1.32.2.4 -r1.32.2.5
*** server.cc	9 Oct 2007 20:53:37 -0000	1.32.2.4
--- server.cc	11 Dec 2007 19:15:28 -0000	1.32.2.5
***************
*** 206,210 ****
      }
  
!     if(ptcp->Read(100) < 0)
      {
        PLAYER_ERROR("failed while reading from TCP clients");
--- 206,210 ----
      }
  
!     if(ptcp->Read(100,false) < 0)
      {
        PLAYER_ERROR("failed while reading from TCP clients");
***************
*** 214,218 ****
      deviceTable->UpdateDevices();
  
!     if(ptcp->Write() < 0)
      {
        PLAYER_ERROR("failed while writing to TCP clients");
--- 214,218 ----
      deviceTable->UpdateDevices();
  
!     if(ptcp->Write(false) < 0)
      {
        PLAYER_ERROR("failed while writing to TCP clients");