ef1fd12b15
1) Added missing checks for CreateEvent which also required the following related changes: - changed freerdp_context_new API to BOOL - changed freerdp_peer_context_new API to BOOL - changed pRdpClientNew callback to BOOL - changed pContextNew callback to BOOL - changed psPeerAccepted callback to BOOL - changed psPeerContextNew callback to BOOL 2) Fixed lots of missing alloc and error checks in the changed code's neighbourhood. 3) Check freerdp_client_codecs_prepare result to avoid segfaults caused by using non-initialized codecs. 4) Fixed deadlocks in x11 caused by missing xf_unlock_x11() calls in some error handlers 5) Some fixes in thread pool: - DEFAULT_POOL assignment did not match TP_POOL definition - don't free the pool pointer if it points to the static DEFAULT_POOL - added error handling and cleanup in InitializeThreadpool
285 lines
5.7 KiB
C
285 lines
5.7 KiB
C
/**
|
|
* WinPR: Windows Portable Runtime
|
|
* Thread Pool API (Pool)
|
|
*
|
|
* Copyright 2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <winpr/crt.h>
|
|
#include <winpr/pool.h>
|
|
|
|
#include "pool.h"
|
|
|
|
#ifdef _WIN32
|
|
|
|
static BOOL module_initialized = FALSE;
|
|
static BOOL module_available = FALSE;
|
|
static HMODULE kernel32_module = NULL;
|
|
|
|
static PTP_POOL (WINAPI * pCreateThreadpool)(PVOID reserved);
|
|
static VOID (WINAPI * pCloseThreadpool)(PTP_POOL ptpp);
|
|
static BOOL (WINAPI * pSetThreadpoolThreadMinimum)(PTP_POOL ptpp, DWORD cthrdMic);
|
|
static VOID (WINAPI * pSetThreadpoolThreadMaximum)(PTP_POOL ptpp, DWORD cthrdMost);
|
|
|
|
static void module_init()
|
|
{
|
|
if (module_initialized)
|
|
return;
|
|
|
|
kernel32_module = LoadLibraryA("kernel32.dll");
|
|
module_initialized = TRUE;
|
|
|
|
if (!kernel32_module)
|
|
return;
|
|
|
|
module_available = TRUE;
|
|
|
|
pCreateThreadpool = (void*) GetProcAddress(kernel32_module, "CreateThreadpool");
|
|
pCloseThreadpool = (void*) GetProcAddress(kernel32_module, "CloseThreadpool");
|
|
pSetThreadpoolThreadMinimum = (void*) GetProcAddress(kernel32_module, "SetThreadpoolThreadMinimum");
|
|
pSetThreadpoolThreadMaximum = (void*) GetProcAddress(kernel32_module, "SetThreadpoolThreadMaximum");
|
|
}
|
|
|
|
#else
|
|
|
|
static TP_POOL DEFAULT_POOL =
|
|
{
|
|
0, /* DWORD Minimum */
|
|
500, /* DWORD Maximum */
|
|
NULL, /* wArrayList* Threads */
|
|
NULL, /* wQueue* PendingQueue */
|
|
NULL, /* HANDLE TerminateEvent */
|
|
NULL, /* wCountdownEvent* WorkComplete */
|
|
};
|
|
|
|
static void* thread_pool_work_func(void* arg)
|
|
{
|
|
DWORD status;
|
|
PTP_POOL pool;
|
|
PTP_WORK work;
|
|
HANDLE events[2];
|
|
PTP_CALLBACK_INSTANCE callbackInstance;
|
|
|
|
pool = (PTP_POOL) arg;
|
|
|
|
events[0] = pool->TerminateEvent;
|
|
events[1] = Queue_Event(pool->PendingQueue);
|
|
|
|
while (1)
|
|
{
|
|
status = WaitForMultipleObjects(2, events, FALSE, INFINITE);
|
|
|
|
if (status == WAIT_OBJECT_0)
|
|
break;
|
|
|
|
if (status != (WAIT_OBJECT_0 + 1))
|
|
break;
|
|
|
|
callbackInstance = (PTP_CALLBACK_INSTANCE) Queue_Dequeue(pool->PendingQueue);
|
|
|
|
if (callbackInstance)
|
|
{
|
|
work = callbackInstance->Work;
|
|
work->WorkCallback(callbackInstance, work->CallbackParameter, work);
|
|
CountdownEvent_Signal(pool->WorkComplete, 1);
|
|
free(callbackInstance);
|
|
}
|
|
}
|
|
|
|
ExitThread(0);
|
|
return NULL;
|
|
}
|
|
|
|
static void threads_close(void *thread)
|
|
{
|
|
WaitForSingleObject(thread, INFINITE);
|
|
CloseHandle(thread);
|
|
}
|
|
|
|
static BOOL InitializeThreadpool(PTP_POOL pool)
|
|
{
|
|
int index;
|
|
HANDLE thread;
|
|
|
|
if (pool->Threads)
|
|
return TRUE;
|
|
|
|
pool->Minimum = 0;
|
|
pool->Maximum = 500;
|
|
|
|
if (!(pool->PendingQueue = Queue_New(TRUE, -1, -1)))
|
|
goto fail_queue_new;
|
|
|
|
if (!(pool->WorkComplete = CountdownEvent_New(0)))
|
|
goto fail_countdown_event;
|
|
|
|
if (!(pool->TerminateEvent = CreateEvent(NULL, TRUE, FALSE, NULL)))
|
|
goto fail_terminate_event;
|
|
|
|
if (!(pool->Threads = ArrayList_New(TRUE)))
|
|
goto fail_thread_array;
|
|
|
|
pool->Threads->object.fnObjectFree = threads_close;
|
|
|
|
for (index = 0; index < 4; index++)
|
|
{
|
|
if (!(thread = CreateThread(NULL, 0,
|
|
(LPTHREAD_START_ROUTINE) thread_pool_work_func,
|
|
(void*) pool, 0, NULL)))
|
|
{
|
|
goto fail_create_threads;
|
|
}
|
|
|
|
ArrayList_Add(pool->Threads, thread);
|
|
}
|
|
|
|
return TRUE;
|
|
|
|
fail_create_threads:
|
|
SetEvent(pool->TerminateEvent);
|
|
ArrayList_Free(pool->Threads);
|
|
pool->Threads = NULL;
|
|
fail_thread_array:
|
|
CloseHandle(pool->TerminateEvent);
|
|
pool->TerminateEvent = NULL;
|
|
fail_terminate_event:
|
|
CountdownEvent_Free(pool->WorkComplete);
|
|
pool->WorkComplete = NULL;
|
|
fail_countdown_event:
|
|
Queue_Free(pool->PendingQueue);
|
|
pool->WorkComplete = NULL;
|
|
fail_queue_new:
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
PTP_POOL GetDefaultThreadpool()
|
|
{
|
|
PTP_POOL pool = NULL;
|
|
|
|
pool = &DEFAULT_POOL;
|
|
|
|
if (!InitializeThreadpool(pool))
|
|
return NULL;
|
|
|
|
return pool;
|
|
}
|
|
|
|
#endif
|
|
|
|
#ifdef WINPR_THREAD_POOL
|
|
|
|
PTP_POOL CreateThreadpool(PVOID reserved)
|
|
{
|
|
PTP_POOL pool = NULL;
|
|
|
|
#ifdef _WIN32
|
|
module_init();
|
|
|
|
if (pCreateThreadpool)
|
|
return pCreateThreadpool(reserved);
|
|
#else
|
|
if (!(pool = (PTP_POOL) calloc(1, sizeof(TP_POOL))))
|
|
return NULL;
|
|
|
|
if (!InitializeThreadpool(pool))
|
|
{
|
|
free(pool);
|
|
return NULL;
|
|
}
|
|
|
|
return pool;
|
|
#endif
|
|
}
|
|
|
|
VOID CloseThreadpool(PTP_POOL ptpp)
|
|
{
|
|
#ifdef _WIN32
|
|
module_init();
|
|
|
|
if (pCloseThreadpool)
|
|
pCloseThreadpool(ptpp);
|
|
#else
|
|
SetEvent(ptpp->TerminateEvent);
|
|
|
|
ArrayList_Free(ptpp->Threads);
|
|
Queue_Free(ptpp->PendingQueue);
|
|
CountdownEvent_Free(ptpp->WorkComplete);
|
|
CloseHandle(ptpp->TerminateEvent);
|
|
|
|
if (ptpp == &DEFAULT_POOL)
|
|
{
|
|
ptpp->Threads = NULL;
|
|
ptpp->PendingQueue = NULL;
|
|
ptpp->WorkComplete = NULL;
|
|
ptpp->TerminateEvent = NULL;
|
|
}
|
|
else
|
|
{
|
|
free(ptpp);
|
|
}
|
|
#endif
|
|
}
|
|
|
|
BOOL SetThreadpoolThreadMinimum(PTP_POOL ptpp, DWORD cthrdMic)
|
|
{
|
|
#ifdef _WIN32
|
|
module_init();
|
|
|
|
if (pSetThreadpoolThreadMinimum)
|
|
return pSetThreadpoolThreadMinimum(ptpp, cthrdMic);
|
|
#else
|
|
HANDLE thread;
|
|
|
|
ptpp->Minimum = cthrdMic;
|
|
|
|
while (ArrayList_Count(ptpp->Threads) < ptpp->Minimum)
|
|
{
|
|
thread = CreateThread(NULL, 0,
|
|
(LPTHREAD_START_ROUTINE) thread_pool_work_func,
|
|
(void*) ptpp, 0, NULL);
|
|
|
|
ArrayList_Add(ptpp->Threads, thread);
|
|
}
|
|
#endif
|
|
return TRUE;
|
|
}
|
|
|
|
VOID SetThreadpoolThreadMaximum(PTP_POOL ptpp, DWORD cthrdMost)
|
|
{
|
|
#ifdef _WIN32
|
|
module_init();
|
|
|
|
if (pSetThreadpoolThreadMaximum)
|
|
pSetThreadpoolThreadMaximum(ptpp, cthrdMost);
|
|
#else
|
|
ptpp->Maximum = cthrdMost;
|
|
#endif
|
|
}
|
|
|
|
#endif
|
|
|
|
/* dummy */
|
|
|
|
void winpr_pool_dummy()
|
|
{
|
|
|
|
}
|