summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfcolin2007-02-01 13:05:24 +0000
committerfcolin2007-02-01 13:05:24 +0000
commitc2bb70794d78f4eb33a9915023b8c7b6924b50ef (patch)
treee5e8720c9154c6227ad573a8e9f760b436d727e2
parentf1bce63c55af4208ccabbecfc1fbd0df110f8af3 (diff)
downloadivy-cplusplus-c2bb70794d78f4eb33a9915023b8c7b6924b50ef.zip
ivy-cplusplus-c2bb70794d78f4eb33a9915023b8c7b6924b50ef.tar.gz
ivy-cplusplus-c2bb70794d78f4eb33a9915023b8c7b6924b50ef.tar.bz2
ivy-cplusplus-c2bb70794d78f4eb33a9915023b8c7b6924b50ef.tar.xz
Utilisateur : Fcolin Date : 23/01/04 Heure : 16:30 Archivé dans $/Bus/Ivy Commentaire: (vss 19)
-rw-r--r--Bus/Ivy/ThreadedSocket.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/Bus/Ivy/ThreadedSocket.cxx b/Bus/Ivy/ThreadedSocket.cxx
index 42a8216..2f32a26 100644
--- a/Bus/Ivy/ThreadedSocket.cxx
+++ b/Bus/Ivy/ThreadedSocket.cxx
@@ -133,12 +133,12 @@ void CThreadedSocket::Close()
//if ( thread ) // On fait de l'auto delete mais dans le cas de terminaison anormale l'object reste ????!!!
// delete thread;
// TRACE("CThreadedSocket waiting for thread end ...\n");
- if ( h_reader ) WaitForSingleObject( h_reader, INFINITE );
+ if ( h_reader ) WaitForSingleObject( h_reader, 5000 );
// wake up writer
if ( h_writer )
{
err = ReleaseSemaphore(send_count, 1, &PreviousCount);
- WaitForSingleObject( h_writer, INFINITE );
+ WaitForSingleObject( h_writer, 5000 );
}
// TRACE("CThreadedSocket all thread ended\n");
}
@@ -456,7 +456,7 @@ UINT CThreadedSocket::SocketReader( )
if (m_hSocket != INVALID_SOCKET)
Close();
h_reader = NULL;
-// TRACE( "CThreadedSocket::SocketReader( END thread_id =( 0x%x) )\n",reader_id);
+ TRACE( "CThreadedSocket::SocketReader( END thread_id =( 0x%x) )\n",reader_id);
return 0;
}