ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make threadpool_destroy wait until all threads are finished

Browse source 
adds a state to each threadpool which can be only offline or online.
One can not acquire new threads when the pool is offline.

no need for waits in the teststuite anymore.
This commit is contained in:
Christian Thaeter 2010-01-18 17:53:33 +01:00
parent 7371db8a2c
commit 020908d623
3 changed files with 64 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
src/backend/threadpool.c
View file

@ -39,6 +39,7 @@ static lumiera_threadpool threadpool;
*/
NOBUG_DEFINE_FLAG_PARENT (threadpool, threads_dbg); /*TODO insert a suitable/better parent flag here */
LUMIERA_ERROR_DEFINE(THREADPOOL_OFFLINE, "tried to acquire thread while threadpool is not available");
//code goes here//
@ -56,6 +57,7 @@ lumiera_threadpool_init(void)
llist_init (&threadpool.pool[i].idle_list);
threadpool.pool[i].thread_count = 0;
threadpool.pool[i].idle_thread_count = 0;
threadpool.pool[i].status = LUMIERA_THREADPOOL_ONLINE;
//TODO: configure each pools' pthread_attrs appropriately
pthread_attr_init (&threadpool.pool[i].pthread_attrs);
@ -70,9 +72,27 @@ lumiera_threadpool_destroy(void)
{
TRACE (threadpool);
/* set all threadpools offline must be done first, since running threads may attempt to start new ones */
for (int i = 0; i < LUMIERA_THREADCLASS_COUNT; ++i)
LUMIERA_CONDITION_SECTION (threadpool, &threadpool.pool[i].sync)
threadpool.pool[i].status = LUMIERA_THREADPOOL_OFFLINE;
/* wait that all theads have finished */
for (int i = 0; i < LUMIERA_THREADCLASS_COUNT; ++i)
{
LUMIERA_CONDITION_SECTION (threadpool, &threadpool.pool[i].sync)
{
TODO ("check threads deadlines, kill them when they are stalled");
TODO ("for threads without deadline use a timeout from config system, 500ms or so by default");
LUMIERA_CONDITION_WAIT(llist_is_empty (&threadpool.pool[i].working_list));
}
}
/* now we can delete all threads */
for (int i = 0; i < LUMIERA_THREADCLASS_COUNT; ++i)
{
TRACE (threadpool, "destroying individual pool #%d", i);
LUMIERA_CONDITION_SECTION (threadpool, &threadpool.pool[i].sync)
{
REQUIRE (threadpool.pool[i].thread_count
@ -100,11 +120,14 @@ lumiera_threadpool_destroy(void)
}
}
/**
*
* @return thread handle or NULL on error (lumiera error will be set)
*/
LumieraThread
lumiera_threadpool_acquire_thread(enum lumiera_thread_class kind,
const char* purpose,
struct nobug_flag* flag)
lumiera_threadpool_acquire_thread (enum lumiera_thread_class kind,
const char* purpose,
struct nobug_flag* flag)
{
TRACE (threadpool);
LumieraThread ret = NULL;
@ -113,34 +136,39 @@ lumiera_threadpool_acquire_thread(enum lumiera_thread_class kind,
LUMIERA_CONDITION_SECTION (threadpool, &threadpool.pool[kind].sync)
{
if (llist_is_empty (&threadpool.pool[kind].idle_list))
if (threadpool.pool[kind].status != LUMIERA_THREADPOOL_ONLINE)
LUMIERA_ERROR_SET_WARNING (threadpool, THREADPOOL_OFFLINE, purpose);
else
{
ret = lumiera_thread_new (kind, purpose, flag,
&threadpool.pool[kind].pthread_attrs);
ENSURE (ret, "did not create a valid thread");
TODO ("no error handing, let the resourcecollector do it, no need when returning the thread");
threadpool.pool[kind].thread_count++;
LUMIERA_CONDITION_WAIT (!llist_is_empty (&threadpool.pool[kind].idle_list));
if (llist_is_empty (&threadpool.pool[kind].idle_list))
{
ret = lumiera_thread_new (kind, purpose, flag,
&threadpool.pool[kind].pthread_attrs);
ENSURE (ret, "did not create a valid thread");
TODO ("no error handing, let the resourcecollector do it, no need when returning the thread");
threadpool.pool[kind].thread_count++;
LUMIERA_CONDITION_WAIT (!llist_is_empty (&threadpool.pool[kind].idle_list));
}
// use an existing thread, pick the first one
// remove it from the pool's list
ret = (LumieraThread) (llist_head (&threadpool.pool[kind].idle_list));
ENSURE (ret, "did not find a valid thread");
REQUIRE (ret->state == LUMIERA_THREADSTATE_IDLE, "trying to return a non-idle thread (state=%s)", lumiera_threadstate_names[ret->state]);
// move thread to the working_list
llist_insert_head (&threadpool.pool[kind].working_list, &ret->node);
threadpool.pool[kind].idle_thread_count--; // cheaper than using llist_count
REQUIRE ((int)(llist_count (&threadpool.pool[kind].working_list)
+ llist_count (&threadpool.pool[kind].idle_list))
== threadpool.pool[kind].thread_count,
"threadpool counter miscalculation (working_list count = %u, idle_list count = %u, thread_count = %d )",
llist_count (&threadpool.pool[kind].working_list),
llist_count (&threadpool.pool[kind].idle_list),
threadpool.pool[kind].thread_count);
}
// use an existing thread, pick the first one
// remove it from the pool's list
ret = (LumieraThread) (llist_head (&threadpool.pool[kind].idle_list));
ENSURE (ret, "did not find a valid thread");
REQUIRE (ret->state == LUMIERA_THREADSTATE_IDLE, "trying to return a non-idle thread (state=%s)", lumiera_threadstate_names[ret->state]);
// move thread to the working_list
llist_insert_head (&threadpool.pool[kind].working_list, &ret->node);
threadpool.pool[kind].idle_thread_count--; // cheaper than using llist_count
REQUIRE ((int)(llist_count (&threadpool.pool[kind].working_list)
+ llist_count (&threadpool.pool[kind].idle_list))
== threadpool.pool[kind].thread_count,
"threadpool counter miscalculation (working_list count = %u, idle_list count = %u, thread_count = %d )",
llist_count (&threadpool.pool[kind].working_list),
llist_count (&threadpool.pool[kind].idle_list),
threadpool.pool[kind].thread_count);
}
return ret;
}

6
src/backend/threadpool.h
View file

@ -64,6 +64,11 @@ lumiera_threadpool_release_thread(LumieraThread thread);
typedef struct lumiera_threadpool_struct lumiera_threadpool;
typedef lumiera_threadpool* LumieraThreadpool;
enum lumiera_threadpool_state {
LUMIERA_THREADPOOL_OFFLINE,
LUMIERA_THREADPOOL_ONLINE
};
struct lumiera_threadpool_struct
{
struct
@ -74,6 +79,7 @@ struct lumiera_threadpool_struct
int idle_thread_count;
pthread_attr_t pthread_attrs;
lumiera_condition sync;
enum lumiera_threadpool_state status;
} pool[LUMIERA_THREADCLASS_COUNT];
};

4
tests/backend/test-threadpool.c
View file

@ -172,8 +172,6 @@ TEST ("no-function")
&NOBUG_FLAG(NOBUG_ON));
// cleanup
ECHO("wait 1 sec");
usleep(1000000);
ECHO("finished waiting");
lumiera_threadpool_destroy();
}
@ -195,8 +193,6 @@ TEST ("process-function")
&NOBUG_FLAG(NOBUG_ON)); // struct nobug_flag* flag)
// cleanup
ECHO("wait 1 sec");
usleep(1000000);
ECHO("finished waiting");
lumiera_threadpool_destroy();
}