diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2013-06-19 15:13:14 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2013-06-19 15:13:14 +0900 |
| commit | 21d60dbec0c25bbac948779f3be9d5dc5708389f (patch) | |
| tree | 8f2cb9d72f98ab2f5a2b38b92fb3c6f3ac457912 | |
| parent | 5148e521e4997a1d1a443011e75e793cc44b7f2e (diff) | |
fix eventflag
| -rw-r--r-- | eventflag.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/eventflag.c b/eventflag.c index c363d58..27714a1 100644 --- a/eventflag.c +++ b/eventflag.c @@ -38,7 +38,7 @@ enum { void -eventflag_init (struct event_flag *ev, chopstx_t sleeper) +eventflag_init (struct eventflag *ev, chopstx_t sleeper) { ev->sleeper = sleeper; @@ -53,7 +53,7 @@ eventflag_init (struct event_flag *ev, chopstx_t sleeper) eventmask_t -eventflag_wait (struct event_flag *ev) +eventflag_wait (struct eventflag *ev) { int n; @@ -62,9 +62,9 @@ eventflag_wait (struct event_flag *ev) chopstx_mutex_lock (&ev->mutex); if (!ev->flag) - chopstx_cond_wait (&ev->cond, &ev->mutex); + chopstx_cond_wait (&ev->u.cond, &ev->mutex); - n = __builtin_ffs ((ev->flag & m)); + n = __builtin_ffs (ev->flag); ev->flag &= ~(1 << (n - 1)); chopstx_mutex_unlock (&ev->mutex); @@ -72,7 +72,7 @@ eventflag_wait (struct event_flag *ev) } eventmask_t -eventflag_wait_timeout (struct event_flag *ev, uint32_t usec) +eventflag_wait_timeout (struct eventflag *ev, uint32_t usec) { eventmask_t em = 0; int n; @@ -104,7 +104,7 @@ eventflag_wait_timeout (struct event_flag *ev, uint32_t usec) void -eventflag_signal (struct event_flag *ev, eventmask_t m) +eventflag_signal (struct eventflag *ev, eventmask_t m) { chopstx_mutex_lock (&ev->mutex); ev->flag |= m; @@ -117,6 +117,6 @@ eventflag_signal (struct event_flag *ev, eventmask_t m) } } else - chopstx_cond_signal (&ev->cond); + chopstx_cond_signal (&ev->u.cond); chopstx_mutex_unlock (&ev->mutex); } |