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

thread.c: drop WebPWorker prefix from static funcs

Browse Source 
Change-Id: I7cd39c9e41bbf11157c488aff18631ef17fde464
This commit is contained in:
James Zern 2013-07-31 19:22:44 -07:00
parent 1aed8f2afc
commit 8924a3a704
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/utils/thread.c
View File

@ -133,7 +133,7 @@ static int pthread_cond_wait(pthread_cond_t* const condition,
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
static THREADFN WebPWorkerThreadLoop(void *ptr) { // thread loop static THREADFN ThreadLoop(void* ptr) { // thread loop
WebPWorker* const worker = (WebPWorker*)ptr; WebPWorker* const worker = (WebPWorker*)ptr;
int done = 0; int done = 0;
while (!done) { while (!done) {
@ -157,8 +157,8 @@ static THREADFN WebPWorkerThreadLoop(void *ptr) { // thread loop
} }
// main thread state control // main thread state control
static void WebPWorkerChangeState(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
if (worker->status_ < OK) return; if (worker->status_ < OK) return;
@ -186,7 +186,7 @@ void WebPWorkerInit(WebPWorker* const worker) {
int WebPWorkerSync(WebPWorker* const worker) { int WebPWorkerSync(WebPWorker* const worker) {
#ifdef WEBP_USE_THREAD #ifdef WEBP_USE_THREAD
WebPWorkerChangeState(worker, OK); ChangeState(worker, OK);
#endif #endif
assert(worker->status_ <= OK); assert(worker->status_ <= OK);
return !worker->had_error; return !worker->had_error;
@ -202,7 +202,7 @@ int WebPWorkerReset(WebPWorker* const worker) {
return 0; return 0;
} }
pthread_mutex_lock(&worker->mutex_); pthread_mutex_lock(&worker->mutex_);
ok = !pthread_create(&worker->thread_, NULL, WebPWorkerThreadLoop, worker); ok = !pthread_create(&worker->thread_, NULL, ThreadLoop, worker);
if (ok) worker->status_ = OK; if (ok) worker->status_ = OK;
pthread_mutex_unlock(&worker->mutex_); pthread_mutex_unlock(&worker->mutex_);
#else #else
@ -217,7 +217,7 @@ int WebPWorkerReset(WebPWorker* const worker) {
void WebPWorkerLaunch(WebPWorker* const worker) { void WebPWorkerLaunch(WebPWorker* const worker) {
#ifdef WEBP_USE_THREAD #ifdef WEBP_USE_THREAD
WebPWorkerChangeState(worker, WORK); ChangeState(worker, WORK);
#else #else
if (worker->hook) if (worker->hook)
worker->had_error |= !worker->hook(worker->data1, worker->data2); worker->had_error |= !worker->hook(worker->data1, worker->data2);
@ -227,7 +227,7 @@ void WebPWorkerLaunch(WebPWorker* const worker) {
void WebPWorkerEnd(WebPWorker* const worker) { void WebPWorkerEnd(WebPWorker* const worker) {
if (worker->status_ >= OK) { if (worker->status_ >= OK) {
#ifdef WEBP_USE_THREAD #ifdef WEBP_USE_THREAD
WebPWorkerChangeState(worker, NOT_OK); ChangeState(worker, NOT_OK);
pthread_join(worker->thread_, NULL); pthread_join(worker->thread_, NULL);
pthread_mutex_destroy(&worker->mutex_); pthread_mutex_destroy(&worker->mutex_);
pthread_cond_destroy(&worker->condition_); pthread_cond_destroy(&worker->condition_);