Merged to master at 39ea85f58719..e0c8e8586446 (from, to] You can see the entire diff with 'git diff' or at https://github.com/brho/akaros/compare/39ea85f58719...e0c8e8586446
On 2016-08-11 at 14:36 Barret Rhoden <[email protected]> wrote: > set_awaiter_abs() takes TSC ticks, not microseconds. > > Signed-off-by: Barret Rhoden <[email protected]> > --- > user/pthread/semaphore.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/user/pthread/semaphore.c b/user/pthread/semaphore.c > index 1436bbec5c13..083e01a1c2c8 100644 > --- a/user/pthread/semaphore.c > +++ b/user/pthread/semaphore.c > @@ -83,7 +83,7 @@ static void __sem_timedblock(struct uthread > *uthread, void *arg) struct sem_queue_element *e = (struct > sem_queue_element *)arg; e->awaiter.data = e; > init_awaiter(&e->awaiter, __sem_timeout); > - set_awaiter_abs(&e->awaiter, e->us_timeout); > + set_awaiter_abs_unix(&e->awaiter, e->us_timeout); > set_alarm(&e->awaiter); > __sem_block(uthread, e); > } -- You received this message because you are subscribed to the Google Groups "Akaros" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. For more options, visit https://groups.google.com/d/optout.
