emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove syscall wrappers around clock_gettime, closes 12091

Browse Source 
12091 "Direct use of __NR_clock_gettime is not time64-safe".

function                                             old     new   delta
runsv_main                                          1698    1712     +14
startservice                                         378     383      +5
get_mono                                              31      25      -6
date_main                                            932     926      -6
gettimeofday_ns                                       17       -     -17
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29)            Total: -10 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2019-10-24 16:26:55 +02:00
parent 7427406580
commit be5a505d77
4 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.flags
View File

@ -129,10 +129,12 @@ endif
# fall back to using a temp file: # fall back to using a temp file:
CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c) CRYPT_AVAILABLE := $(shell echo 'int main(void){return 0;}' >crypttest.c; $(CC) $(CFLAGS) -lcrypt -o /dev/null crypttest.c >/dev/null 2>&1 && echo "y"; rm crypttest.c)
ifeq ($(CRYPT_AVAILABLE),y) ifeq ($(CRYPT_AVAILABLE),y)
LDLIBS += m crypt LDLIBS += m rt crypt
else else
LDLIBS += m LDLIBS += m rt
endif endif
# libm may be needed for dc, awk, ntpd
# librt may be needed for clock_gettime()
# libpam may use libpthread, libdl and/or libaudit. # libpam may use libpthread, libdl and/or libaudit.
# On some platforms that requires an explicit -lpthread, -ldl, -laudit. # On some platforms that requires an explicit -lpthread, -ldl, -laudit.

16
coreutils/date.c
View File

@ -33,10 +33,9 @@
//config: Enable option (-I) to output an ISO-8601 compliant //config: Enable option (-I) to output an ISO-8601 compliant
//config: date/time string. //config: date/time string.
//config: //config:
//config:# defaults to "no": stat's nanosecond field is a bit non-portable
//config:config FEATURE_DATE_NANO //config:config FEATURE_DATE_NANO
//config: bool "Support %[num]N nanosecond format specifier" //config: bool "Support %[num]N nanosecond format specifier"
//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) //config: default n # stat's nanosecond field is a bit non-portable
//config: depends on DATE //config: depends on DATE
//config: select PLATFORM_LINUX //config: select PLATFORM_LINUX
//config: help //config: help
@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, char **argv)
*/ */
#endif #endif
} else { } else {
#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) #if ENABLE_FEATURE_DATE_NANO
/* libc has incredibly messy way of doing this, clock_gettime(CLOCK_REALTIME, &ts);
* typically requiring -lrt. We just skip all this mess */
syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts);
#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64
/* Let's only support the 64 suffix syscalls for 64-bit time_t.
* This simplifies the code for us as we don't need to convert
* between 64-bit and 32-bit. We also don't have a way to
* report overflow errors here.
*/
syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts);
#else #else
time(&ts.tv_sec); time(&ts.tv_sec);
#endif #endif

11
libbb/time.c
View File

@ -253,18 +253,9 @@ char* FAST_FUNC strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp)
#define CLOCK_MONOTONIC 1 #define CLOCK_MONOTONIC 1
#endif #endif
/* libc has incredibly messy way of doing this,
* typically requiring -lrt. We just skip all this mess */
static void get_mono(struct timespec *ts) static void get_mono(struct timespec *ts)
{ {
#if defined(__NR_clock_gettime) if (clock_gettime(CLOCK_MONOTONIC, ts))
if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts))
#elif __TIMESIZE == 64
if (syscall(__NR_clock_gettime64, CLOCK_MONOTONIC, ts))
#else
# error "We currently don't support architectures without " \
"the __NR_clock_gettime syscall and 32-bit time_t"
#endif
bb_simple_error_msg_and_die("clock_gettime(MONOTONIC) failed"); bb_simple_error_msg_and_die("clock_gettime(MONOTONIC) failed");
} }
unsigned long long FAST_FUNC monotonic_ns(void) unsigned long long FAST_FUNC monotonic_ns(void)

11
runit/runsv.c
View File

@ -51,18 +51,9 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#if ENABLE_MONOTONIC_SYSCALL #if ENABLE_MONOTONIC_SYSCALL
#include <sys/syscall.h> #include <sys/syscall.h>
/* libc has incredibly messy way of doing this,
* typically requiring -lrt. We just skip all this mess */
static void gettimeofday_ns(struct timespec *ts) static void gettimeofday_ns(struct timespec *ts)
{ {
#if defined(__NR_clock_gettime) clock_gettime(CLOCK_REALTIME, ts);
syscall(__NR_clock_gettime, CLOCK_REALTIME, ts);
#elif __TIMESIZE == 64
syscall(__NR_clock_gettime64, CLOCK_REALTIME, ts);
#else
# error "We currently don't support architectures without " \
"the __NR_clock_gettime syscall and 32-bit time_t"
#endif
} }
#else #else
static void gettimeofday_ns(struct timespec *ts) static void gettimeofday_ns(struct timespec *ts)