summaryrefslogtreecommitdiff
path: root/test/src
diff options
context:
space:
mode:
authorWarner Losh <imp@FreeBSD.org>2025-02-05 16:20:13 -0700
committerWarner Losh <imp@FreeBSD.org>2025-02-05 16:20:13 -0700
commit48ec896efb0b78141df004eaa21288b84590c9da (patch)
tree33799792fd95c266d472ab1ae51d50ab4f942eb3 /test/src
parentd28d7fbede216494aa3942af042cc084fcd6098a (diff)
jemalloc: Import 5.3.0 54eaed1d8b56b1aa528be3bdd1877e59c56fa90cvendor/jemalloc/5.3.0vendor/jemalloc
Import jemalloc 5.3.0. This import changes how manage the jemalloc vendor branch (which was just started anyway). Starting with 5.3.0, we import a clean tree from the upstream github, removing all the old files that are no longer upstream, or that we've kept around for some reason. We do this because we merge from this raw version of jemalloc into the FreeBSD contrib/jemalloc, then we run autogen stuff, generate all the generated .h files with gmake, then finally remove much of the generated files in contrib/jemalloc using an update script. Sponsored by: Netflix
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.c4
-rw-r--r--test/src/timer.c3
3 files changed, 5 insertions, 6 deletions
diff --git a/test/src/mq.c b/test/src/sleep.c
index 9b5f672d679d..2234b4bcdda9 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 f97ce4d18db8..4cd803e5f892 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 c451c639151a..6e8b8edbc821 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