Module Name: src
Committed By: ozaki-r
Date: Thu Dec 28 04:36:15 UTC 2017
Modified Files:
src/tests/rump/kernspace: workqueue.c
Log Message:
Tweak use of cv_timedwait
- Handle its return value
- Specify more appropriate time-out periods (2 ticks is too short)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/rump/kernspace/workqueue.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/rump/kernspace/workqueue.c
diff -u src/tests/rump/kernspace/workqueue.c:1.1 src/tests/rump/kernspace/workqueue.c:1.2
--- src/tests/rump/kernspace/workqueue.c:1.1 Fri Sep 29 12:42:36 2017
+++ src/tests/rump/kernspace/workqueue.c Thu Dec 28 04:36:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: workqueue.c,v 1.1 2017/09/29 12:42:36 maya Exp $ */
+/* $NetBSD: workqueue.c,v 1.2 2017/12/28 04:36:15 ozaki-r Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: workqueue.c,v 1.1 2017/09/29 12:42:36 maya Exp $");
+__RCSID("$NetBSD: workqueue.c,v 1.2 2017/12/28 04:36:15 ozaki-r Exp $");
#endif /* !lint */
#include <sys/param.h>
@@ -83,9 +83,12 @@ rumptest_workqueue1()
#define ITERATIONS 12435
for (size_t i = 0; i < ITERATIONS; ++i) {
+ int e;
workqueue_enqueue(sc->wq, &sc->wk, NULL);
mutex_enter(&sc->mtx);
- cv_timedwait(&sc->cv, &sc->mtx, 2);
+ e = cv_timedwait(&sc->cv, &sc->mtx, hz * 2);
+ if (e != 0)
+ panic("cv_timedwait timed out (i=%lu)", i);
mutex_exit(&sc->mtx);
}
