ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lib/timeutils: remove get_boot_time from libcommon 

clock_gettime() needs -lrt, so let's keep this stuff
outside libcommon.la

Reported-by: Ruediger Meier <sweet_f_a@gmx.de>
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2014-05-06 13:16:05 +02:00
parent f55b4b4512
commit 08ca3e26a8
7 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/Makemodule.am
View File

@ -4,6 +4,7 @@ dist_noinst_HEADERS += \
include/at.h \
include/bitops.h \
include/blkdev.h \
include/boottime.h \
include/c.h \
include/canonicalize.h \
include/carefulputc.h \

1
include/timeutils.h
View File

@ -51,6 +51,5 @@ typedef uint64_t nsec_t;
#define FORMAT_TIMESPAN_MAX 64
int parse_timestamp(const char *t, usec_t *usec);
int get_boot_time(struct timeval *boot_time);
#endif /* UTIL_LINUX_TIME_UTIL_H */

26
lib/timeutils.c
View File

@ -340,29 +340,3 @@ int parse_timestamp(const char *t, usec_t *usec)
return 0;
}
int get_boot_time(struct timeval *boot_time)
{
struct timespec hires_uptime;
struct timeval lores_uptime, now;
struct sysinfo info;
if (gettimeofday(&now, NULL) != 0) {
warn(_("gettimeofday failed"));
return -errno;
}
#ifdef CLOCK_BOOTTIME
if (clock_gettime(CLOCK_BOOTTIME, &hires_uptime) == 0) {
TIMESPEC_TO_TIMEVAL(&lores_uptime, &hires_uptime);
timersub(&now, &lores_uptime, boot_time);
return 0;
}
#endif
/* fallback */
if (sysinfo(&info) != 0)
warn(_("sysinfo failed"));
boot_time->tv_sec = now.tv_sec - info.uptime;
boot_time->tv_usec = 0;
return 0;
}

4
login-utils/Makemodule.am
View File

@ -4,8 +4,8 @@ usrbin_exec_PROGRAMS += last
dist_man_MANS += \
login-utils/last.1 \
login-utils/lastb.1
last_SOURCES = login-utils/last.c lib/strutils.c
last_LDADD = $(LDADD) libcommon.la
last_SOURCES = login-utils/last.c lib/boottime.c
last_LDADD = $(LDADD) libcommon.la -lrt
install-exec-hook-last:
cd $(DESTDIR)$(usrbin_execdir) && ln -sf last lastb

1
login-utils/last.c
View File

@ -50,6 +50,7 @@
#include "carefulputc.h"
#include "strutils.h"
#include "timeutils.h"
#include "boottime.h"
#if defined(_HAVE_UT_TV)
# define UL_UT_TIME ut_tv.tv_sec

2
sys-utils/Makemodule.am
View File

@ -70,7 +70,7 @@ if LINUX
#
bin_PROGRAMS += dmesg
dist_man_MANS += sys-utils/dmesg.1
dmesg_SOURCES = sys-utils/dmesg.c
dmesg_SOURCES = sys-utils/dmesg.c lib/boottime.c
dmesg_LDADD = $(LDADD) libcommon.la -lrt
sbin_PROGRAMS += ctrlaltdel

1
sys-utils/dmesg.c
View File

@ -33,6 +33,7 @@
#include "closestream.h"
#include "optutils.h"
#include "timeutils.h"
#include "boottime.h"
#include "mangle.h"
#include "pager.h"