thread fixes

1 files changed, 233 insertions, 233 deletions

diff --git a/cpp/src/IceUtil/Cond.cpp b/cpp/src/IceUtil/Cond.cpp
index 52e69510be3..cffa290dc4a 100644
--- a/cpp/src/IceUtil/Cond.cpp
+++ b/cpp/src/IceUtil/Cond.cpp
@@ -1,233 +1,233 @@
-// **********************************************************************
-//
-// Copyright (c) 2001
-// Mutable Realms, Inc.
-// Huntsville, AL, USA
-//
-// All Rights Reserved
-//
-// **********************************************************************
-
-#include <IceUtil/Cond.h>
-
-#ifndef _WIN32
-#    include <sys/time.h>
-#endif
-
-#ifdef _WIN32
-
-IceUtil::Semaphore::Semaphore(long initial)
-{
-    _sem = CreateSemaphore(0, initial, 0x7fffffff, 0);
-    if(_sem == INVALID_HANDLE_VALUE)
-    {
-	throw SyscallException(SyscallException::errorToString(GetLastError()), __FILE__, __LINE__);
-    }
-}
-
-IceUtil::Semaphore::~Semaphore()
-{
-    CloseHandle(_sem);
-}
-
-void
-IceUtil::Semaphore::wait() const
-{
-    int rc = WaitForSingleObject(_sem, INFINITE);
-    if(rc != WAIT_OBJECT_0)
-    {
-	throw SyscallException(SyscallException::errorToString(GetLastError()), __FILE__, __LINE__);
-    }
-}
-
-bool
-IceUtil::Semaphore::timedWait(const Time& timeout) const
-{
-    timeval tv = timeout;
-    long msec = (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
-
-    int rc = WaitForSingleObject(_sem, msec);
-    if(rc != WAIT_TIMEOUT && rc != WAIT_OBJECT_0)
-    {
-	throw SyscallException(SyscallException::errorToString(GetLastError()), __FILE__, __LINE__);
-    }
-    return rc != WAIT_TIMEOUT;
-}
-
-void
-IceUtil::Semaphore::post(int count) const
-{
-    int rc = ReleaseSemaphore(_sem, count, 0);
-    if(rc == 0)
-    {
-	throw SyscallException(SyscallException::errorToString(GetLastError()), __FILE__, __LINE__);
-    }
-}
-
-IceUtil::Cond::Cond() :
-    _gate(1),
-    _blocked(0),
-    _unblocked(0),
-    _toUnblock(0)
-{
-}
-
-IceUtil::Cond::~Cond()
-{
-}
-
-void
-IceUtil::Cond::signal()
-{
-    wake(false);
-}
-
-void
-IceUtil::Cond::broadcast()
-{
-    wake(true);
-}
-
-void
-IceUtil::Cond::wake(bool broadcast)
-{
-    //
-    // Lock gate & mutex.
-    //
-    _gate.wait();
-    _internal.lock();
-
-    if(_unblocked != 0)
-    {
-	_blocked -= _unblocked;
-	_unblocked = 0;
-    }
-
-    if(_blocked > 0)
-    {
-	//
-	// Unblock some number of waiters.
-	//
-	_toUnblock = (broadcast) ? _blocked : 1;
-	_internal.unlock();
-	_queue.post();
-    }
-    else
-    {
-	//
-	// Otherwise no blocked waiters, release gate & mutex.
-	//
-	_gate.post();
-	_internal.unlock();
-    }
-}
-
-void
-IceUtil::Cond::preWait() const
-{
-    _gate.wait();
-    _blocked++;
-    _gate.post();
-}
-
-void
-IceUtil::Cond::postWait(bool timedOut) const
-{
-    _internal.lock();
-    _unblocked++;
-
-    if(_toUnblock != 0)
-    {
-	bool last = --_toUnblock == 0;
-	_internal.unlock();
-	
-	if(timedOut)
-	{
-	    _queue.wait();
-	}
-	
-	if(last)
-	{
-	    _gate.post();
-	}
-	else
-	{
-	    _queue.post();
-	}
-    }
-    else
-    {
-	_internal.unlock();
-    }
-}
-
-void
-IceUtil::Cond::dowait() const
-{
-    try
-    {
-	_queue.wait();
-	postWait(false);
-    }
-    catch(...)
-    {
-	postWait(false);
-	throw;
-    }
-}
-
-bool
-IceUtil::Cond::timedDowait(const Time& timeout) const
-{
-    try
-    {
-	bool rc = _queue.timedWait(timeout);
-	postWait(!rc);
-	return rc;
-    }
-    catch(...)
-    {
-	postWait(false);
-	throw;
-    }
-}
-
-#else
-
-IceUtil::Cond::Cond()
-{
-    int rc = pthread_cond_init(&_cond, 0);
-    if(rc != 0)
-    {
-	throw SyscallException(strerror(rc), __FILE__, __LINE__);
-    }
-}
-
-IceUtil::Cond::~Cond()
-{
-    int rc = 0;
-    rc = pthread_cond_destroy(&_cond);
-    assert(rc == 0);
-}
-
-void
-IceUtil::Cond::signal()
-{
-    int rc = pthread_cond_signal(&_cond);
-    if(rc != 0)
-    {
-	throw SyscallException(strerror(rc), __FILE__, __LINE__);
-    }
-}
-
-void
-IceUtil::Cond::broadcast()
-{
-    int rc = pthread_cond_broadcast(&_cond);
-    if(rc != 0)
-    {
-	throw SyscallException(strerror(rc), __FILE__, __LINE__);
-    }
-}
-
-#endif
+// **********************************************************************

+//

+// Copyright (c) 2001

+// Mutable Realms, Inc.

+// Huntsville, AL, USA

+//

+// All Rights Reserved

+//

+// **********************************************************************

+

+#include <IceUtil/Cond.h>

+

+#ifndef _WIN32

+#    include <sys/time.h>

+#endif

+

+#ifdef _WIN32

+

+IceUtil::Semaphore::Semaphore(long initial)

+{

+    _sem = CreateSemaphore(0, initial, 0x7fffffff, 0);

+    if(_sem == INVALID_HANDLE_VALUE)

+    {

+	throw ThreadSyscallException(__FILE__, __LINE__);

+    }

+}

+

+IceUtil::Semaphore::~Semaphore()

+{

+    CloseHandle(_sem);

+}

+

+void

+IceUtil::Semaphore::wait() const

+{

+    int rc = WaitForSingleObject(_sem, INFINITE);

+    if(rc != WAIT_OBJECT_0)

+    {

+	throw ThreadSyscallException(__FILE__, __LINE__);

+    }

+}

+

+bool

+IceUtil::Semaphore::timedWait(const Time& timeout) const

+{

+    timeval tv = timeout;

+    long msec = (tv.tv_sec * 1000) + (tv.tv_usec / 1000);

+

+    int rc = WaitForSingleObject(_sem, msec);

+    if(rc != WAIT_TIMEOUT && rc != WAIT_OBJECT_0)

+    {

+	throw ThreadSyscallException(__FILE__, __LINE__);

+    }

+    return rc != WAIT_TIMEOUT;

+}

+

+void

+IceUtil::Semaphore::post(int count) const

+{

+    int rc = ReleaseSemaphore(_sem, count, 0);

+    if(rc == 0)

+    {

+	throw ThreadSyscallException(__FILE__, __LINE__);

+    }

+}

+

+IceUtil::Cond::Cond() :

+    _gate(1),

+    _blocked(0),

+    _unblocked(0),

+    _toUnblock(0)

+{

+}

+

+IceUtil::Cond::~Cond()

+{

+}

+

+void

+IceUtil::Cond::signal()

+{

+    wake(false);

+}

+

+void

+IceUtil::Cond::broadcast()

+{

+    wake(true);

+}

+

+void

+IceUtil::Cond::wake(bool broadcast)

+{

+    //

+    // Lock gate & mutex.

+    //

+    _gate.wait();

+    _internal.lock();

+

+    if(_unblocked != 0)

+    {

+	_blocked -= _unblocked;

+	_unblocked = 0;

+    }

+

+    if(_blocked > 0)

+    {

+	//

+	// Unblock some number of waiters.

+	//

+	_toUnblock = (broadcast) ? _blocked : 1;

+	_internal.unlock();

+	_queue.post();

+    }

+    else

+    {

+	//

+	// Otherwise no blocked waiters, release gate & mutex.

+	//

+	_gate.post();

+	_internal.unlock();

+    }

+}

+

+void

+IceUtil::Cond::preWait() const

+{

+    _gate.wait();

+    _blocked++;

+    _gate.post();

+}

+

+void

+IceUtil::Cond::postWait(bool timedOut) const

+{

+    _internal.lock();

+    _unblocked++;

+

+    if(_toUnblock != 0)

+    {

+	bool last = --_toUnblock == 0;

+	_internal.unlock();

+	

+	if(timedOut)

+	{

+	    _queue.wait();

+	}

+	

+	if(last)

+	{

+	    _gate.post();

+	}

+	else

+	{

+	    _queue.post();

+	}

+    }

+    else

+    {

+	_internal.unlock();

+    }

+}

+

+void

+IceUtil::Cond::dowait() const

+{

+    try

+    {

+	_queue.wait();

+	postWait(false);

+    }

+    catch(...)

+    {

+	postWait(false);

+	throw;

+    }

+}

+

+bool

+IceUtil::Cond::timedDowait(const Time& timeout) const

+{

+    try

+    {

+	bool rc = _queue.timedWait(timeout);

+	postWait(!rc);

+	return rc;

+    }

+    catch(...)

+    {

+	postWait(false);

+	throw;

+    }

+}

+

+#else

+

+IceUtil::Cond::Cond()

+{

+    int rc = pthread_cond_init(&_cond, 0);

+    if(rc != 0)

+    {

+	throw ThreadSyscallException(strerror(rc), __FILE__, __LINE__);

+    }

+}

+

+IceUtil::Cond::~Cond()

+{

+    int rc = 0;

+    rc = pthread_cond_destroy(&_cond);

+    assert(rc == 0);

+}

+

+void

+IceUtil::Cond::signal()

+{

+    int rc = pthread_cond_signal(&_cond);

+    if(rc != 0)

+    {

+	throw ThreadSyscallException(strerror(rc), __FILE__, __LINE__);

+    }

+}

+

+void

+IceUtil::Cond::broadcast()

+{

+    int rc = pthread_cond_broadcast(&_cond);

+    if(rc != 0)

+    {

+	throw ThreadSyscallException(strerror(rc), __FILE__, __LINE__);

+    }

+}

+

+#endif