benn/lumiera_documentation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix compilation errors

Browse source
This commit is contained in:
Michael Ploujnikov 2010-01-14 16:46:27 -05:00
parent 523e898fbe
commit f62513dea8
5 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/backend/threadpool.c
View file

@ -76,7 +76,7 @@ lumiera_threadpool_destroy(void)
LUMIERA_CONDITION_SECTION (threadpool, &threadpool.pool[i].sync)
{
REQUIRE (0 == threadpool.pool[i].working_thread_count &&
0 = llist_count (&threadpool.pool[i].working_list),
0 == llist_count (&threadpool.pool[i].working_list),
"%d(%d) threads are still running",
threadpool.pool[i].working_thread_count,
llist_count (&threadpool.pool[i].working_list));
@ -111,7 +111,7 @@ lumiera_threadpool_acquire_thread(enum lumiera_thread_class kind,
&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");
LUMIERA_CONDITION_WAIT (!llist_is_empty (&threadpool.pool[kind].idel_list));
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
@ -122,7 +122,7 @@ lumiera_threadpool_acquire_thread(enum lumiera_thread_class kind,
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);
llist_insert_head (&threadpool.pool[kind].working_list, &ret->node);
threadpool.pool[kind].working_thread_count++;
threadpool.pool[kind].idle_thread_count--; // cheaper than using llist_count
@ -161,16 +161,16 @@ lumiera_threadpool_release_thread(LumieraThread thread)
threadpool.pool[thread->kind].idle_thread_count++; // cheaper than using llist_count
ENSURE (threadpool.pool[thread->kind].idle_thread_count ==
llist_count (&threadpool.pool[thread->kind].list),
llist_count (&threadpool.pool[thread->kind].idle_list),
"idle thread count %d is wrong, should be %d",
threadpool.pool[thread->kind].idle_thread_count,
llist_count (&threadpool.pool[thread->kind].list));
llist_count (&threadpool.pool[thread->kind].idle_list));
ENSURE (threadpool.pool[thread->kind].working_thread_count ==
llist_count (&threadpool.pool[thread->kind].working_list),
"working thread count %d is wrong, should be %d",
threadpool.pool[thread->kind].working_thread_count,
llist_count (&threadpool.pool[thread->kind].workinglist));
REQUIRE (!llist_is_empty (&threadpool.pool[thread->kind].list), "thread pool is still empty after insertion");
llist_count (&threadpool.pool[thread->kind].working_list));
REQUIRE (!llist_is_empty (&threadpool.pool[thread->kind].idle_list), "thread pool is still empty after insertion");
LUMIERA_CONDITION_BROADCAST;
}
}

4
src/lib/condition.h
View file

@ -123,7 +123,7 @@
*/
#define LUMIERA_CONDITION_SIGNAL \
do { \
REQUIRE (lumiera_cond_section_.lock, "Condition mutex not locked"); \
REQUIRE (lumiera_lock_section_.lock, "Condition mutex not locked"); \
lumiera_condition_signal (lumiera_lock_section_.lock, \
lumiera_lock_section_.flag); \
} while (0)
@ -136,7 +136,7 @@
*/
#define LUMIERA_CONDITION_BROADCAST \
do { \
REQUIRE (lumiera_cond_section_.lock, "Condition mutex not locked"); \
REQUIRE (lumiera_lock_section_.lock, "Condition mutex not locked"); \
lumiera_condition_broadcast (lumiera_lock_section_.lock, \
lumiera_lock_section_.flag); \
} while (0)

1
src/proc/mobject/placement.hpp
View file

@ -242,6 +242,7 @@ namespace mobject {
/** @todo cleanup uses of ref-to-placement. See Ticket #115 */
typedef Placement<MObject> PlacementMO;
//‘typedef class mobject::Placement<mobject::MObject, mobject::MObject> mobject::PlacementMO’
typedef Placement<MObject> PMO;

3
src/proc/mobject/session/placement-index.cpp
View file

@ -95,7 +95,8 @@ namespace session {
/* some type shorthands */
typedef PlacementIndex::PlacementMO PlacementMO;
//typedef PlacementIndex::PlacementMO PlacementMO;
typedef mobject::PlacementMO PlacementMO;
typedef PlacementIndex::PRef PRef;
typedef PlacementIndex::ID ID;

3
src/proc/mobject/session/placement-index.hpp
View file

@ -160,7 +160,8 @@ namespace session {
public:
typedef Placement<MObject> PlacementMO;
//typedef Placement<MObject> PlacementMO;
// ‘typedef class mobject::Placement<mobject::MObject, mobject::MObject> mobject::session::PlacementIndex::PlacementMO’
typedef PlacementRef<MObject> PRef;
typedef PlacementMO::ID const& ID;