-/* Copyright (c) 2010, 2012, 2013 Nicira, Inc.
+/* 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 "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 "smap.h"
/* #ifdefs make it a pain to maintain code: you have to try to build both ways.
* Thus, this file tries to compile as much of the code as possible regardless
- * of the target, by writing "if (LINUX_DATAPATH)" instead of "#ifdef
- * __linux__" where this is possible. */
-#ifdef LINUX_DATAPATH
+ * of the target, by writing "if (LINUX)" instead of "#ifdef __linux__" where
+ * this is possible. */
+#ifdef __linux__
+#define LINUX 1
#include <asm/param.h>
#else
-#define LINUX_DATAPATH 0
+#define LINUX 0
#endif
static void
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) {
smap_add_format(stats, "cpu", "%ld", n_cores);
}
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 smap *stats)
{
- if (!LINUX_DATAPATH) {
+ if (!LINUX) {
unsigned int pagesize = get_page_size();
#ifdef _SC_PHYS_PAGES
long int phys_pages = sysconf(_SC_PHYS_PAGES);
#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);
+#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";
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;
static long long int cache_expiration = LLONG_MIN;
static long long int boot_time;
- ovs_assert(LINUX_DATAPATH);
+ ovs_assert(LINUX);
if (time_msec() >= cache_expiration) {
static const char stat_file[] = "/proc/stat";
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)
{
- ovs_assert(LINUX_DATAPATH);
+ ovs_assert(LINUX);
#ifndef USER_HZ
#define USER_HZ 100
FILE *stream;
int n;
- ovs_assert(LINUX_DATAPATH);
+ ovs_assert(LINUX);
sprintf(file_name, "/proc/%lu/stat", (unsigned long int) pid);
stream = fopen(file_name, "r");
int crashes = 0;
FILE *stream;
- ovs_assert(LINUX_DATAPATH);
+ ovs_assert(LINUX);
sprintf(file_name, "/proc/%lu/cmdline", (unsigned long int) pid);
stream = fopen(file_name, "r");
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;
- ovs_assert(LINUX_DATAPATH);
+ ovs_assert(LINUX);
if (!get_raw_process_info(pid, &child)) {
return false;
}
static void
get_process_stats(struct smap *stats)
{
+#ifndef _WIN32
struct dirent *de;
DIR *dir;
key = xasprintf("process_%.*s",
(int) (extension - de->d_name), de->d_name);
if (!smap_get(stats, key)) {
- if (LINUX_DATAPATH && get_process_info(pid, &pinfo)) {
+ 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);
}
closedir(dir);
+#endif /* _WIN32 */
}
static void
\f
#define SYSTEM_STATS_INTERVAL (5 * 1000) /* In milliseconds. */
-/* The next time to wake up, or LLONG_MAX if stats are disabled. */
-static long long int next_refresh = LLONG_MAX;
+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
system_stats_enable(bool enable)
{
- if (!enable) {
- next_refresh = LLONG_MAX;
- } else if (next_refresh == LLONG_MAX) {
- next_refresh = time_msec();
+ 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);
}
}
struct smap *
system_stats_run(void)
{
- if (time_msec() >= next_refresh) {
- struct smap *stats;
-
- 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);
+ struct smap *stats = NULL;
- next_refresh = time_msec() + SYSTEM_STATS_INTERVAL;
+ ovs_mutex_lock(&mutex);
+ if (system_stats) {
+ latch_poll(&latch);
- return stats;
+ if (enabled) {
+ stats = system_stats;
+ system_stats = NULL;
+ } else {
+ discard_stats();
+ }
}
+ ovs_mutex_unlock(&mutex);
- return NULL;
+ return stats;
}
/* Causes poll_block() to wake up when system_stats_run() needs to be
void
system_stats_wait(void)
{
- if (next_refresh != LLONG_MAX) {
- poll_timer_wait_until(next_refresh);
+ 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