diff options
| author | Qi Wang <interwq@gwu.edu> | 2022-05-06 18:28:25 (GMT) |
|---|---|---|
| committer | Qi Wang <interwq@gwu.edu> | 2022-05-06 18:28:25 (GMT) |
| commit | 54eaed1d8b56b1aa528be3bdd1877e59c56fa90c (patch) | |
| tree | e79620e0c00b1f8b6b698fbe74df6bae7d812ae2 /test/src | |
| parent | ea6b3e973b477b8061e0076bb257dbd7f3faa756 (diff) | |
| parent | 304c919829f9f340669b61fa64867cfe5dba8021 (diff) | |
| download | jemalloc-5.3.0.zip jemalloc-5.3.0.tar.gz jemalloc-5.3.0.tar.bz2 | |
Merge branch 'dev'5.3.0
Diffstat (limited to 'test/src')
| -rw-r--r-- | test/src/sleep.c (renamed from test/src/mq.c) | 4 | ||||
| -rw-r--r-- | test/src/test.c | 4 | ||||
| -rw-r--r-- | test/src/timer.c | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/test/src/mq.c b/test/src/sleep.c index 9b5f672..2234b4b 100644 --- a/test/src/mq.c +++ b/test/src/sleep.c @@ -5,11 +5,11 @@ * time is guaranteed. */ void -mq_nanosleep(unsigned ns) { +sleep_ns(unsigned ns) { assert(ns <= 1000*1000*1000); #ifdef _WIN32 - Sleep(ns / 1000); + Sleep(ns / 1000 / 1000); #else { struct timespec timeout; diff --git a/test/src/test.c b/test/src/test.c index f97ce4d..4cd803e 100644 --- a/test/src/test.c +++ b/test/src/test.c @@ -87,8 +87,8 @@ test_fail(const char *format, ...) { } static const char * -test_status_string(test_status_t test_status) { - switch (test_status) { +test_status_string(test_status_t current_status) { + switch (current_status) { case test_status_pass: return "pass"; case test_status_skip: return "skip"; case test_status_fail: return "fail"; diff --git a/test/src/timer.c b/test/src/timer.c index c451c63..6e8b8ed 100644 --- a/test/src/timer.c +++ b/test/src/timer.c @@ -2,8 +2,7 @@ void timer_start(timedelta_t *timer) { - nstime_init(&timer->t0, 0); - nstime_update(&timer->t0); + nstime_init_update(&timer->t0); } void |