提交 070d6969 编写于 作者: M Michal Privoznik

virhostuptime: Add linux stub for musl

When we want to know the boot timestamp of the host, we can call
virHostGetBootTime(). Under the hood, it uses getutxid() which is
defined by POSIX and properly check for in configure. However,
musl took a path where it declares the function but instead of
providing any useful implementation it returns NULL meaning "no
record found". If that's the case, use our second best option -
/proc/uptime and a bit of maths.

https://bugzilla.redhat.com/show_bug.cgi?id=1760885Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
Reviewed-by: NCole Robinson <crobinso@redhat.com>
上级 18eeb75d
......@@ -250,6 +250,7 @@
@SRCDIR@/src/util/virhostcpu.c
@SRCDIR@/src/util/virhostdev.c
@SRCDIR@/src/util/virhostmem.c
@SRCDIR@/src/util/virhostuptime.c
@SRCDIR@/src/util/viridentity.c
@SRCDIR@/src/util/virinitctl.c
@SRCDIR@/src/util/viriptables.c
......
......@@ -25,16 +25,68 @@
#endif
#include "virhostuptime.h"
#include "viralloc.h"
#include "virfile.h"
#include "virlog.h"
#include "virstring.h"
#include "virtime.h"
#include "virthread.h"
#define VIR_FROM_THIS VIR_FROM_NONE
VIR_LOG_INIT("util.virhostuptime");
static unsigned long long bootTime;
static int bootTimeErrno;
static virOnceControl virHostGetBootTimeOnce = VIR_ONCE_CONTROL_INITIALIZER;
#ifdef HAVE_GETUTXID
#if defined(__linux__)
# define UPTIME_FILE "/proc/uptime"
static int
virHostGetBootTimeProcfs(unsigned long long *btime)
{
unsigned long long now;
double up;
g_autofree char *buf = NULL;
char *tmp;
if (virTimeMillisNow(&now) < 0)
return -errno;
/* 1KiB limit is more than enough. */
if (virFileReadAll(UPTIME_FILE, 1024, &buf) < 0)
return -errno;
/* buf contains two doubles now:
* $uptime $idle_time
* We're interested only in the first one */
if (!(tmp = strchr(buf, ' '))) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("uptime file has unexpected format '%s'"),
buf);
return -EINVAL;
}
*tmp = '\0';
if (virStrToDouble(buf, NULL, &up) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR,
_("Unable to parse uptime value '%s'"),
buf);
return -EINVAL;
}
*btime = now / 1000 - up + 0.5;
return 0;
}
#endif /* defined(__linux__) */
#if defined(HAVE_GETUTXID) || defined(__linux__)
static void
virHostGetBootTimeOnceInit(void)
{
# ifdef HAVE_GETUTXID
struct utmpx id = {.ut_type = BOOT_TIME};
struct utmpx *res = NULL;
......@@ -45,16 +97,20 @@ virHostGetBootTimeOnceInit(void)
}
endutxent();
# endif /* HAVE_GETUTXID */
if (bootTimeErrno != 0 || bootTime == 0)
bootTimeErrno = -virHostGetBootTimeProcfs(&bootTime);
}
#else /* !HAVE_GETUTXID */
#else /* !defined(HAVE_GETUTXID) && !defined(__linux__) */
static void
virHostGetBootTimeOnceInit(void)
{
bootTimeErrno = ENOSYS;
}
#endif /* HAVE_GETUTXID */
#endif /* !defined(HAVE_GETUTXID) && !defined(__linux__) */
/**
* virHostGetBootTime:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册