summaryrefslogtreecommitdiff
path: root/deps/jemalloc/test/src
diff options
context:
space:
mode:
Diffstat (limited to 'deps/jemalloc/test/src')
-rw-r--r--deps/jemalloc/test/src/sleep.c (renamed from deps/jemalloc/test/src/mq.c)4
-rw-r--r--deps/jemalloc/test/src/test.c4
-rw-r--r--deps/jemalloc/test/src/timer.c3
3 files changed, 5 insertions, 6 deletions
diff --git a/deps/jemalloc/test/src/mq.c b/deps/jemalloc/test/src/sleep.c
index 9b5f672d6..2234b4bcd 100644
--- a/deps/jemalloc/test/src/mq.c
+++ b/deps/jemalloc/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/deps/jemalloc/test/src/test.c b/deps/jemalloc/test/src/test.c
index f97ce4d18..4cd803e5f 100644
--- a/deps/jemalloc/test/src/test.c
+++ b/deps/jemalloc/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/deps/jemalloc/test/src/timer.c b/deps/jemalloc/test/src/timer.c
index c451c6391..6e8b8edbc 100644
--- a/deps/jemalloc/test/src/timer.c
+++ b/deps/jemalloc/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