From 9f0fcbd84a6ee3655f55629ed4b01d13647ac0c9 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Thu, 22 Jul 2021 00:57:13 -0700 Subject: Remove extra wrapper for platform clock support. --- src/core/CMakeLists.txt | 2 -- src/core/clock.c | 22 ---------------------- src/core/clock.h | 20 -------------------- src/core/nng_impl.h | 3 +-- src/core/platform.h | 10 +++++----- 5 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 src/core/clock.c delete mode 100644 src/core/clock.h (limited to 'src/core') diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 040df7f4..b55bd70a 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -20,8 +20,6 @@ nng_sources( aio.c aio.h - clock.c - clock.h device.c device.h dialer.c diff --git a/src/core/clock.c b/src/core/clock.c deleted file mode 100644 index 49b972e7..00000000 --- a/src/core/clock.c +++ /dev/null @@ -1,22 +0,0 @@ -// -// Copyright 2017 Garrett D'Amore -// -// This software is supplied under the terms of the MIT License, a -// copy of which should be located in the distribution where this -// file was obtained (LICENSE.txt). A copy of the license may also be -// found online at https://opensource.org/licenses/MIT. -// - -#include "core/nng_impl.h" - -nni_time -nni_clock(void) -{ - return (nni_plat_clock()); -} - -void -nni_msleep(nni_duration msec) -{ - nni_plat_sleep(msec); -} diff --git a/src/core/clock.h b/src/core/clock.h deleted file mode 100644 index b369520b..00000000 --- a/src/core/clock.h +++ /dev/null @@ -1,20 +0,0 @@ -// -// Copyright 2017 Garrett D'Amore -// Copyright 2017 Capitar IT Group BV -// -// This software is supplied under the terms of the MIT License, a -// copy of which should be located in the distribution where this -// file was obtained (LICENSE.txt). A copy of the license may also be -// found online at https://opensource.org/licenses/MIT. -// - -#ifndef CORE_CLOCK_H -#define CORE_CLOCK_H - -#include "core/nng_impl.h" - -extern nni_time nni_clock(void); - -extern void nni_msleep(nni_duration); - -#endif // CORE_CLOCK_H diff --git a/src/core/nng_impl.h b/src/core/nng_impl.h index a9e5560d..15db8d16 100644 --- a/src/core/nng_impl.h +++ b/src/core/nng_impl.h @@ -1,5 +1,5 @@ // -// Copyright 2017 Garrett D'Amore +// Copyright 2021 Garrett D'Amore // Copyright 2017 Capitar IT Group BV // // This software is supplied under the terms of the MIT License, a @@ -27,7 +27,6 @@ #include "core/platform.h" #include "core/aio.h" -#include "core/clock.h" #include "core/device.h" #include "core/file.h" #include "core/idhash.h" diff --git a/src/core/platform.h b/src/core/platform.h index 5739811f..f1127c5b 100644 --- a/src/core/platform.h +++ b/src/core/platform.h @@ -236,16 +236,16 @@ extern bool nni_atomic_cas(nni_atomic_int *, int, int); // Clock Support // -// nn_plat_clock returns a number of milliseconds since some arbitrary time +// nn_clock returns a number of milliseconds since some arbitrary time // in the past. The values returned by nni_clock must use the same base -// as the times used in nni_plat_cond_until. The nni_plat_clock() must +// as the times used in nni_plat_cond_until. The nni_clock() must // return values > 0, and must return values smaller than 2^63. (We could // relax this last constraint, but there is no reason to, and leaves us the // option of using negative values for other purposes in the future.) -extern nni_time nni_plat_clock(void); +extern nni_time nni_clock(void); -// nni_plat_sleep sleeps for the specified number of milliseconds (at least). -extern void nni_plat_sleep(nni_duration); +// nni_msleep sleeps for the specified number of milliseconds (at least). +extern void nni_msleep(nni_duration); // // Entropy Support -- cgit v1.2.3-70-g09d2