Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed AICurlThread::mWakeUpMutex --> AICurlThread::mWakeUpFlagMutex

Browse Source
This commit is contained in:
Aleric Inglewood
2013-02-23 21:40:19 +01:00
parent b6cbed838f
commit 803e92020b
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
indra/llmessage/aicurlthread.cpp
View File

@@ -832,8 +832,8 @@ class AICurlThread : public LLThread
{ {
public: public:
static AICurlThread* sInstance; static AICurlThread* sInstance;
LLMutex mWakeUpMutex; LLMutex mWakeUpFlagMutex; // Set when the curl thread is sleeping (in or about to enter select()).
bool mWakeUpFlag; // Protected by mWakeUpMutex. bool mWakeUpFlag; // Protected by mWakeUpFlagMutex.
public: public:
// MAIN-THREAD // MAIN-THREAD
@@ -1082,10 +1082,10 @@ void AICurlThread::wakeup_thread(bool stop_thread)
mRunning = false; mRunning = false;
// Try if curl thread is still awake and if so, pass the new commands directly. // Try if curl thread is still awake and if so, pass the new commands directly.
if (mWakeUpMutex.tryLock()) if (mWakeUpFlagMutex.tryLock())
{ {
mWakeUpFlag = true; mWakeUpFlag = true;
mWakeUpMutex.unlock(); mWakeUpFlagMutex.unlock();
return; return;
} }
@@ -1247,9 +1247,9 @@ void AICurlThread::process_commands(AICurlMultiHandle_wat const& multi_handle_w)
command_queue_wat command_queue_w(command_queue); command_queue_wat command_queue_w(command_queue);
if (command_queue_w->empty()) if (command_queue_w->empty())
{ {
mWakeUpMutex.lock(); mWakeUpFlagMutex.lock();
mWakeUpFlag = false; mWakeUpFlag = false;
mWakeUpMutex.unlock(); mWakeUpFlagMutex.unlock();
break; break;
} }
// Move the next command from the queue into command_being_processed. // Move the next command from the queue into command_being_processed.
@@ -1312,10 +1312,10 @@ void AICurlThread::run(void)
// Process every command in command_queue before filling the fd_set passed to select(). // Process every command in command_queue before filling the fd_set passed to select().
for(;;) for(;;)
{ {
mWakeUpMutex.lock(); mWakeUpFlagMutex.lock();
if (mWakeUpFlag) if (mWakeUpFlag)
{ {
mWakeUpMutex.unlock(); mWakeUpFlagMutex.unlock();
process_commands(multi_handle_w); process_commands(multi_handle_w);
continue; continue;
} }
@@ -1324,7 +1324,7 @@ void AICurlThread::run(void)
// wakeup_thread() is also called after setting mRunning to false. // wakeup_thread() is also called after setting mRunning to false.
if (!mRunning) if (!mRunning)
{ {
mWakeUpMutex.unlock(); mWakeUpFlagMutex.unlock();
break; break;
} }
@@ -1400,7 +1400,7 @@ void AICurlThread::run(void)
#endif #endif
#endif #endif
ready = select(nfds, read_fd_set, write_fd_set, NULL, &timeout); ready = select(nfds, read_fd_set, write_fd_set, NULL, &timeout);
mWakeUpMutex.unlock(); mWakeUpFlagMutex.unlock();
#ifdef CWDEBUG #ifdef CWDEBUG
#ifdef DEBUG_CURLIO #ifdef DEBUG_CURLIO
Dout(dc::finish|cond_error_cf(ready == -1), ready); Dout(dc::finish|cond_error_cf(ready == -1), ready);