-/* Copyright (c) 2010 Nicira Networks
+/* Copyright (c) 2010, 2012, 2013, 2014 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <config.h>
-#include <assert.h>
+#include "system-stats.h"
+
#include <ctype.h>
#include <dirent.h>
#include <errno.h>
#if HAVE_MNTENT_H
#include <mntent.h>
#endif
-#include <signal.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include "daemon.h"
#include "dirs.h"
#include "dynamic-string.h"
+#include "json.h"
+#include "latch.h"
+#include "ofpbuf.h"
+#include "ovs-thread.h"
+#include "poll-loop.h"
#include "shash.h"
-#include "system-stats.h"
+#include "smap.h"
#include "timeval.h"
#include "vlog.h"
* of the target, by writing "if (LINUX)" instead of "#ifdef __linux__" where
* this is possible. */
#ifdef __linux__
-#include <asm/param.h>
#define LINUX 1
+#include <asm/param.h>
#else
#define LINUX 0
#endif
static void
-get_cpu_cores(struct shash *stats)
+get_cpu_cores(struct smap *stats)
{
- long int n_cores = sysconf(_SC_NPROCESSORS_ONLN);
+ long int n_cores = count_cpu_cores();
if (n_cores > 0) {
- shash_add(stats, "cpu", xasprintf("%ld", n_cores));
+ smap_add_format(stats, "cpu", "%ld", n_cores);
}
}
static void
-get_load_average(struct shash *stats OVS_UNUSED)
+get_load_average(struct smap *stats OVS_UNUSED)
{
#if HAVE_GETLOADAVG
double loadavg[3];
if (getloadavg(loadavg, 3) == 3) {
- shash_add(stats, "load_average",
- xasprintf("%.2f,%.2f,%.2f",
- loadavg[0], loadavg[1], loadavg[2]));
+ smap_add_format(stats, "load_average", "%.2f,%.2f,%.2f",
+ loadavg[0], loadavg[1], loadavg[2]);
}
#endif
}
static unsigned int cached;
if (!cached) {
+#ifndef _WIN32
long int value = sysconf(_SC_PAGESIZE);
+#else
+ long int value;
+ SYSTEM_INFO sysinfo;
+ GetSystemInfo(&sysinfo);
+ value = sysinfo.dwPageSize;
+#endif
if (value >= 0) {
cached = value;
}
}
static void
-get_memory_stats(struct shash *stats)
+get_memory_stats(struct smap *stats)
{
if (!LINUX) {
unsigned int pagesize = get_page_size();
+#ifdef _SC_PHYS_PAGES
long int phys_pages = sysconf(_SC_PHYS_PAGES);
+#else
+ long int phys_pages = 0;
+#endif
+#ifdef _SC_AVPHYS_PAGES
long int avphys_pages = sysconf(_SC_AVPHYS_PAGES);
+#else
+ long int avphys_pages = 0;
+#endif
int mem_total, mem_used;
+#ifndef _WIN32
if (pagesize <= 0 || phys_pages <= 0 || avphys_pages <= 0) {
return;
}
mem_total = phys_pages * (pagesize / 1024);
mem_used = (phys_pages - avphys_pages) * (pagesize / 1024);
- shash_add(stats, "memory", xasprintf("%d,%d", mem_total, mem_used));
+#else
+ MEMORYSTATUS memory_status;
+ GlobalMemoryStatus(&memory_status);
+
+ mem_total = memory_status.dwTotalPhys;
+ mem_used = memory_status.dwTotalPhys - memory_status.dwAvailPhys;
+#endif
+ smap_add_format(stats, "memory", "%d,%d", mem_total, mem_used);
} else {
static const char file_name[] = "/proc/meminfo";
int mem_used, mem_cache, swap_used;
stream = fopen(file_name, "r");
if (!stream) {
- VLOG_WARN_ONCE("%s: open failed (%s)", file_name, strerror(errno));
+ VLOG_WARN_ONCE("%s: open failed (%s)",
+ file_name, ovs_strerror(errno));
return;
}
char key[16];
int value;
- if (sscanf(line, "%15[^:]: %u", key, &value) == 2) {
+ if (ovs_scan(line, "%15[^:]: %u", key, &value)) {
int *valuep = shash_find_data(&dict, key);
if (valuep) {
*valuep = value;
mem_used = mem_total - mem_free;
mem_cache = buffers + cached;
swap_used = swap_total - swap_free;
- shash_add(stats, "memory",
- xasprintf("%d,%d,%d,%d,%d", mem_total, mem_used, mem_cache,
- swap_total, swap_used));
+ smap_add_format(stats, "memory", "%d,%d,%d,%d,%d",
+ mem_total, mem_used, mem_cache, swap_total, swap_used);
}
}
static long long int cache_expiration = LLONG_MIN;
static long long int boot_time;
- assert(LINUX);
+ ovs_assert(LINUX);
if (time_msec() >= cache_expiration) {
static const char stat_file[] = "/proc/stat";
stream = fopen(stat_file, "r");
if (!stream) {
- VLOG_ERR_ONCE("%s: open failed (%s)", stat_file, strerror(errno));
+ VLOG_ERR_ONCE("%s: open failed (%s)",
+ stat_file, ovs_strerror(errno));
return boot_time;
}
while (fgets(line, sizeof line, stream)) {
long long int btime;
- if (sscanf(line, "btime %lld", &btime) == 1) {
+ if (ovs_scan(line, "btime %lld", &btime)) {
boot_time = btime * 1000;
goto done;
}
static unsigned long long int
ticks_to_ms(unsigned long long int ticks)
{
- assert(LINUX);
+ ovs_assert(LINUX);
#ifndef USER_HZ
#define USER_HZ 100
FILE *stream;
int n;
- assert(LINUX);
+ ovs_assert(LINUX);
sprintf(file_name, "/proc/%lu/stat", (unsigned long int) pid);
stream = fopen(file_name, "r");
if (!stream) {
- VLOG_ERR_ONCE("%s: open failed (%s)", file_name, strerror(errno));
+ VLOG_ERR_ONCE("%s: open failed (%s)",
+ file_name, ovs_strerror(errno));
return false;
}
int crashes = 0;
FILE *stream;
- assert(LINUX);
+ ovs_assert(LINUX);
sprintf(file_name, "/proc/%lu/cmdline", (unsigned long int) pid);
stream = fopen(file_name, "r");
if (!stream) {
- VLOG_WARN_ONCE("%s: open failed (%s)", file_name, strerror(errno));
+ VLOG_WARN_ONCE("%s: open failed (%s)", file_name, ovs_strerror(errno));
goto exit;
}
if (!fgets(line, sizeof line, stream)) {
VLOG_WARN_ONCE("%s: read failed (%s)", file_name,
- feof(stream) ? "end of file" : strerror(errno));
+ feof(stream) ? "end of file" : ovs_strerror(errno));
goto exit_close;
}
paren = strchr(line, '(');
if (paren) {
int x;
- if (sscanf(paren + 1, "%d", &x) == 1) {
+ if (ovs_scan(paren + 1, "%d", &x)) {
crashes = x;
}
}
{
struct raw_process_info child;
- assert(LINUX);
+ ovs_assert(LINUX);
if (!get_raw_process_info(pid, &child)) {
return false;
}
}
static void
-get_process_stats(struct shash *stats)
+get_process_stats(struct smap *stats)
{
+#ifndef _WIN32
struct dirent *de;
DIR *dir;
- dir = opendir(ovs_rundir);
+ dir = opendir(ovs_rundir());
if (!dir) {
- VLOG_ERR_ONCE("%s: open failed (%s)", ovs_rundir, strerror(errno));
+ VLOG_ERR_ONCE("%s: open failed (%s)",
+ ovs_rundir(), ovs_strerror(errno));
return;
}
while ((de = readdir(dir)) != NULL) {
struct process_info pinfo;
- char *key, *value;
char *file_name;
char *extension;
+ char *key;
pid_t pid;
#ifdef _DIRENT_HAVE_D_TYPE
continue;
}
- file_name = xasprintf("%s/%s", ovs_rundir, de->d_name);
+ file_name = xasprintf("%s/%s", ovs_rundir(), de->d_name);
pid = read_pidfile(file_name);
free(file_name);
- if (pid < 0 || kill(pid, 0)) {
+ if (pid < 0) {
continue;
}
key = xasprintf("process_%.*s",
(int) (extension - de->d_name), de->d_name);
- if (shash_find(stats, key)) {
- free(key);
- continue;
- }
-
- if (LINUX && get_process_info(pid, &pinfo)) {
- value = xasprintf("%lu,%lu,%lld,%d,%lld,%lld",
- pinfo.vsz, pinfo.rss, pinfo.cputime,
- pinfo.crashes, pinfo.booted, pinfo.uptime);
- } else {
- value = xstrdup("");
+ if (!smap_get(stats, key)) {
+ if (LINUX && get_process_info(pid, &pinfo)) {
+ smap_add_format(stats, key, "%lu,%lu,%lld,%d,%lld,%lld",
+ pinfo.vsz, pinfo.rss, pinfo.cputime,
+ pinfo.crashes, pinfo.booted, pinfo.uptime);
+ } else {
+ smap_add(stats, key, "");
+ }
}
-
- shash_add_nocopy(stats, key, value);
+ free(key);
}
closedir(dir);
+#endif /* _WIN32 */
}
static void
-get_filesys_stats(struct shash *stats OVS_UNUSED)
+get_filesys_stats(struct smap *stats OVS_UNUSED)
{
-#if HAVE_SETMNTENT && HAVE_STATVFS
+#if HAVE_GETMNTENT_R && HAVE_STATVFS
static const char file_name[] = "/etc/mtab";
+ struct mntent mntent;
struct mntent *me;
+ char buf[4096];
FILE *stream;
struct ds s;
stream = setmntent(file_name, "r");
if (!stream) {
- VLOG_ERR_ONCE("%s: open failed (%s)", file_name, strerror(errno));
+ VLOG_ERR_ONCE("%s: open failed (%s)", file_name, ovs_strerror(errno));
return;
}
ds_init(&s);
- while ((me = getmntent(stream)) != NULL) {
+ while ((me = getmntent_r(stream, &mntent, buf, sizeof buf)) != NULL) {
unsigned long long int total, free;
struct statvfs vfs;
char *p;
endmntent(stream);
if (s.length) {
- shash_add(stats, "file_systems", ds_steal_cstr(&s));
+ smap_add(stats, "file_systems", ds_cstr(&s));
}
ds_destroy(&s);
-#endif /* HAVE_SETMNTENT && HAVE_STATVFS */
+#endif /* HAVE_GETMNTENT_R && HAVE_STATVFS */
}
+\f
+#define SYSTEM_STATS_INTERVAL (5 * 1000) /* In milliseconds. */
+
+static struct ovs_mutex mutex = OVS_MUTEX_INITIALIZER;
+static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+static struct latch latch OVS_GUARDED_BY(mutex);
+static bool enabled;
+static bool started OVS_GUARDED_BY(mutex);
+static struct smap *system_stats OVS_GUARDED_BY(mutex);
+static void *system_stats_thread_func(void *);
+static void discard_stats(void);
+
+/* Enables or disables system stats collection, according to 'enable'. */
void
-get_system_stats(struct shash *stats)
+system_stats_enable(bool enable)
{
- get_cpu_cores(stats);
- get_load_average(stats);
- get_memory_stats(stats);
- get_process_stats(stats);
- get_filesys_stats(stats);
+ if (enabled != enable) {
+ ovs_mutex_lock(&mutex);
+ if (enable) {
+ if (!started) {
+ ovs_thread_create("system_stats",
+ system_stats_thread_func, NULL);
+ latch_init(&latch);
+ started = true;
+ }
+ discard_stats();
+ xpthread_cond_signal(&cond);
+ }
+ enabled = enable;
+ ovs_mutex_unlock(&mutex);
+ }
+}
+
+/* Tries to obtain a new snapshot of system stats every SYSTEM_STATS_INTERVAL
+ * milliseconds.
+ *
+ * When a new snapshot is available (which only occurs if system stats are
+ * enabled), returns it as an smap owned by the caller. The caller must use
+ * both smap_destroy() and free() to completely free the returned data.
+ *
+ * When no new snapshot is available, returns NULL. */
+struct smap *
+system_stats_run(void)
+{
+ struct smap *stats = NULL;
+
+ ovs_mutex_lock(&mutex);
+ if (system_stats) {
+ latch_poll(&latch);
+
+ if (enabled) {
+ stats = system_stats;
+ system_stats = NULL;
+ } else {
+ discard_stats();
+ }
+ }
+ ovs_mutex_unlock(&mutex);
+
+ return stats;
+}
+
+/* Causes poll_block() to wake up when system_stats_run() needs to be
+ * called. */
+void
+system_stats_wait(void)
+{
+ if (enabled) {
+ latch_wait(&latch);
+ }
+}
+
+static void
+discard_stats(void) OVS_REQUIRES(mutex)
+{
+ if (system_stats) {
+ smap_destroy(system_stats);
+ free(system_stats);
+ system_stats = NULL;
+ }
+}
+
+static void * NO_RETURN
+system_stats_thread_func(void *arg OVS_UNUSED)
+{
+ pthread_detach(pthread_self());
+
+ for (;;) {
+ long long int next_refresh;
+ struct smap *stats;
+
+ ovs_mutex_lock(&mutex);
+ while (!enabled) {
+ ovs_mutex_cond_wait(&cond, &mutex);
+ }
+ ovs_mutex_unlock(&mutex);
+
+ stats = xmalloc(sizeof *stats);
+ smap_init(stats);
+ get_cpu_cores(stats);
+ get_load_average(stats);
+ get_memory_stats(stats);
+ get_process_stats(stats);
+ get_filesys_stats(stats);
+
+ ovs_mutex_lock(&mutex);
+ discard_stats();
+ system_stats = stats;
+ latch_set(&latch);
+ ovs_mutex_unlock(&mutex);
+
+ next_refresh = time_msec() + SYSTEM_STATS_INTERVAL;
+ do {
+ poll_timer_wait_until(next_refresh);
+ poll_block();
+ } while (time_msec() < next_refresh);
+ }
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff