From ea9a67f259d41952a990fc2b6224a36f87cb579a Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Thu, 10 Sep 2009 11:40:36 -0700 Subject: thread: mbox: fix return value for mbox_fetch() Make mbox_fetch() actually return the time spent waiting. Signed-off-by: H. Peter Anvin --- core/thread/mbox.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/thread/mbox.c b/core/thread/mbox.c index f880b47b..10e46ef7 100644 --- a/core/thread/mbox.c +++ b/core/thread/mbox.c @@ -38,9 +38,12 @@ int mbox_post(struct mailbox *mbox, void *msg, jiffies_t timeout) jiffies_t mbox_fetch(struct mailbox *mbox, void **msg, jiffies_t timeout) { - if (sem_down(&mbox->cons_sem, timeout) == (jiffies_t)-1) + jiffies_t t; + + t = sem_down(&mbox->cons_sem, timeout); + if (t == (jiffies_t)-1) return -1; - sem_down(&mbox->tail_sem, 0); + t += sem_down(&mbox->tail_sem, 0); if (msg) *msg = *mbox->tail; @@ -50,4 +53,5 @@ jiffies_t mbox_fetch(struct mailbox *mbox, void **msg, jiffies_t timeout) sem_up(&mbox->tail_sem); sem_up(&mbox->prod_sem); + return t; } -- cgit v1.2.1