External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

virhostuptime: Add linux stub for musl

Browse Source 
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=1760885

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Michal Privoznik 2019-10-14 16:37:03 +02:00
parent 18eeb75daf
commit 070d6969fe
2 changed files with 60 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
po/POTFILES.in
View File

@ -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

62
src/util/virhostuptime.c
View File

@ -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: