dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-27 22:28:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "utils/thread.c,cosmetics: join a few lines"

Browse Source
This commit is contained in:
Pascal Massimino 2016-07-28 04:08:48 +00:00 committed by Gerrit Code Review
commit c7f66c82b3
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/thread.c
View File

@ -183,8 +183,7 @@ static int pthread_cond_wait(pthread_cond_t* const condition,
#else #else
// note that there is a consumer available so the signal isn't dropped in // note that there is a consumer available so the signal isn't dropped in
// pthread_cond_signal // pthread_cond_signal
if (!ReleaseSemaphore(condition->waiting_sem_, 1, NULL)) if (!ReleaseSemaphore(condition->waiting_sem_, 1, NULL)) return 1;
return 1;
// now unlock the mutex so pthread_cond_signal may be issued // now unlock the mutex so pthread_cond_signal may be issued
pthread_mutex_unlock(mutex); pthread_mutex_unlock(mutex);
ok = (WaitForSingleObject(condition->signal_event_, INFINITE) == ok = (WaitForSingleObject(condition->signal_event_, INFINITE) ==
@ -226,8 +225,7 @@ static THREADFN ThreadLoop(void* ptr) {
} }
// main thread state control // main thread state control
static void ChangeState(WebPWorker* const worker, static void ChangeState(WebPWorker* const worker, WebPWorkerStatus new_status) {
WebPWorkerStatus new_status) {
// No-op when attempting to change state on a thread that didn't come up. // No-op when attempting to change state on a thread that didn't come up.
// Checking status_ without acquiring the lock first would result in a data // Checking status_ without acquiring the lock first would result in a data
// race. // race.