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

Merge branch 'minor-fixes' into second-tp-attempt

Browse source
This commit is contained in:
Michael Ploujnikov 2010-01-07 07:18:59 -05:00
commit d78a826d39
3 changed files with 25 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lib/reccondition.h
View file

@ -65,13 +65,13 @@
#define LUMIERA_RECCONDITION_SECTION_CHAIN(nobugflag, cnd) \ #define LUMIERA_RECCONDITION_SECTION_CHAIN(nobugflag, cnd) \
for (lumiera_sectionlock *lumiera_lock_section_old_ = &lumiera_lock_section_, \ for (lumiera_sectionlock *lumiera_reccond_section_old_ = &lumiera_reccond_section_, \
NOBUG_CLEANUP(lumiera_sectionlock_ensureunlocked) lumiera_reccond_section_ = { \ NOBUG_CLEANUP(lumiera_sectionlock_ensureunlocked) lumiera_reccond_section_ = { \
(void*)1, lumiera_reccondition_unlock_cb NOBUG_ALPHA_COMMA_NULL NOBUG_ALPHA_COMMA_NULL}; \ (void*)1, lumiera_reccondition_unlock_cb NOBUG_ALPHA_COMMA_NULL NOBUG_ALPHA_COMMA_NULL}; \
lumiera_reccond_section_.lock;) \ lumiera_reccond_section_.lock;) \
for ( \ for ( \
({ \ ({ \
REQUIRE (lumiera_lock_section_old_->lock, "section prematurely unlocked"); \ REQUIRE (lumiera_reccond_section_old_->lock, "section prematurely unlocked"); \
lumiera_reccond_section_.lock = (cnd); \ lumiera_reccond_section_.lock = (cnd); \
NOBUG_IF_ALPHA(lumiera_reccond_section_.flag = &NOBUG_FLAG(nobugflag);) \ NOBUG_IF_ALPHA(lumiera_reccond_section_.flag = &NOBUG_FLAG(nobugflag);) \
RESOURCE_WAIT (nobugflag, (cnd)->rh, "acquire reccondmutex", lumiera_reccond_section_.rh) \ RESOURCE_WAIT (nobugflag, (cnd)->rh, "acquire reccondmutex", lumiera_reccond_section_.rh) \
@ -79,7 +79,7 @@
if (pthread_mutex_lock (&(cnd)->reccndmutex)) \ if (pthread_mutex_lock (&(cnd)->reccndmutex)) \
LUMIERA_DIE (LOCK_ACQUIRE); \ LUMIERA_DIE (LOCK_ACQUIRE); \
RESOURCE_STATE (nobugflag, NOBUG_RESOURCE_RECURSIVE, lumiera_reccond_section_.rh); \ RESOURCE_STATE (nobugflag, NOBUG_RESOURCE_RECURSIVE, lumiera_reccond_section_.rh); \
LUMIERA_SECTION_UNLOCK_(lumiera_lock_section_old_); \ LUMIERA_SECTION_UNLOCK_(lumiera_reccond_section_old_); \
} \ } \
}); \ }); \
lumiera_reccond_section_.lock; \ lumiera_reccond_section_.lock; \

4
tests/15locking.tests
View file

@ -86,3 +86,7 @@ PLANNED "reccondition broadcasting" <<END
END END
TEST "chained reccondition section" chainedrecconditionsection <<END
out: outer reccondition locked section
out: inner reccondition locked section
END

18
tests/library/test-locking.c
View file

@ -318,5 +318,23 @@ TEST ("recconditionforgotunlock")
lumiera_reccondition_destroy (&reccond, &NOBUG_FLAG(NOBUG_ON)); lumiera_reccondition_destroy (&reccond, &NOBUG_FLAG(NOBUG_ON));
} }
TEST ("chainedrecconditionsection")
{
lumiera_reccondition outer, inner;
lumiera_reccondition_init (&outer, "outer_recconditionsection", &NOBUG_FLAG(NOBUG_ON));
lumiera_reccondition_init (&inner, "inner_recconditionsection", &NOBUG_FLAG(NOBUG_ON));
LUMIERA_RECCONDITION_SECTION (NOBUG_ON, &outer)
{
printf ("outer reccondition locked section\n");
LUMIERA_RECCONDITION_SECTION_CHAIN (NOBUG_ON, &inner)
{
printf ("inner reccondition locked section\n");
}
}
lumiera_reccondition_destroy (&outer, &NOBUG_FLAG(NOBUG_ON));
lumiera_reccondition_destroy (&inner, &NOBUG_FLAG(NOBUG_ON));
}
TESTS_END TESTS_END