mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2801 from bmiklautz/fix/thread

Browse Source 
winpr/thread: small cleanups
This commit is contained in:
Marc-André Moreau 2015-07-28 08:47:06 -04:00
commit 611c194f80
1 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
winpr/libwinpr/thread/thread.c
View File

@ -281,42 +281,39 @@ static void* thread_launcher(void* arg)
DWORD res = -1; DWORD res = -1;
void* rc = NULL; void* rc = NULL;
WINPR_THREAD* thread = (WINPR_THREAD*) arg; WINPR_THREAD* thread = (WINPR_THREAD*) arg;
void *(*fkt)(void*);
if (!thread) if (!thread)
{ {
WLog_ERR(TAG, "Called with invalid argument %p", arg); WLog_ERR(TAG, "Called with invalid argument %p", arg);
goto exit; goto exit;
} }
else
if (!(fkt = (void*) thread->lpStartAddress))
{ {
void *(*fkt)(void*) = (void*) thread->lpStartAddress; WLog_ERR(TAG, "Thread function argument is %p", fkt);
goto exit;
if (!fkt)
{
WLog_ERR(TAG, "Thread function argument is %p", fkt);
goto exit;
}
if (pthread_mutex_lock(&thread->threadIsReadyMutex))
goto exit;
if (!ListDictionary_Contains(thread_list, &thread->thread))
{
if (pthread_cond_wait(&thread->threadIsReady, &thread->threadIsReadyMutex) != 0)
{
WLog_ERR(TAG, "The thread could not be made ready");
pthread_mutex_unlock(&thread->threadIsReadyMutex);
goto exit;
}
}
if (pthread_mutex_unlock(&thread->threadIsReadyMutex))
goto exit;
assert(ListDictionary_Contains(thread_list, &thread->thread));
rc = fkt(thread->lpParameter);
} }
if (pthread_mutex_lock(&thread->threadIsReadyMutex))
goto exit;
if (!ListDictionary_Contains(thread_list, &thread->thread))
{
if (pthread_cond_wait(&thread->threadIsReady, &thread->threadIsReadyMutex) != 0)
{
WLog_ERR(TAG, "The thread could not be made ready");
pthread_mutex_unlock(&thread->threadIsReadyMutex);
goto exit;
}
}
if (pthread_mutex_unlock(&thread->threadIsReadyMutex))
goto exit;
assert(ListDictionary_Contains(thread_list, &thread->thread));
rc = fkt(thread->lpParameter);
exit: exit:
if (thread) if (thread)
@ -330,7 +327,6 @@ exit:
if (thread->detached || !thread->started) if (thread->detached || !thread->started)
cleanup_handle(thread); cleanup_handle(thread);
} }
pthread_exit((void*) (size_t) res);
return rc; return rc;
} }
@ -685,7 +681,13 @@ DWORD ResumeThread(HANDLE hThread)
return (DWORD)-1; return (DWORD)-1;
if (!thread->started) if (!thread->started)
winpr_StartThread(thread); {
if (!winpr_StartThread(thread))
{
pthread_mutex_unlock(&thread->mutex);
return (DWORD)-1;
}
}
else else
WLog_WARN(TAG, "Thread already started!"); WLog_WARN(TAG, "Thread already started!");
@ -703,6 +705,7 @@ DWORD SuspendThread(HANDLE hThread)
BOOL SwitchToThread(VOID) BOOL SwitchToThread(VOID)
{ {
WLog_ERR(TAG, "Function not implemented!");
return TRUE; return TRUE;
} }