X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fsystem-stats.c;h=2960b87e4c98aa2c5faf90addedeb34ecd980134;hb=ac60863f78e412004c5b69f5a64a49bc6f0bc46d;hp=4dc2723c23521b9a50cba1ba0f3aaf45a9de4c60;hpb=57c8677b511908b3120df3cbf44244423cfefc34;p=sliver-openvswitch.git diff --git a/vswitchd/system-stats.c b/vswitchd/system-stats.c index 4dc2723c2..2960b87e4 100644 --- a/vswitchd/system-stats.c +++ b/vswitchd/system-stats.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010, 2012 Nicira, Inc. +/* Copyright (c) 2010, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ #include "system-stats.h" -#include #include #include #include @@ -35,6 +34,11 @@ #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 "smap.h" #include "timeval.h" @@ -44,13 +48,12 @@ VLOG_DEFINE_THIS_MODULE(system_stats); /* #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)" instead of "#ifdef __linux__" where - * this is possible. */ -#ifdef __linux__ + * of the target, by writing "if (LINUX_DATAPATH)" instead of "#ifdef + * __linux__" where this is possible. */ +#ifdef LINUX_DATAPATH #include -#define LINUX 1 #else -#define LINUX 0 +#define LINUX_DATAPATH 0 #endif static void @@ -93,9 +96,13 @@ get_page_size(void) static void get_memory_stats(struct smap *stats) { - if (!LINUX) { + if (!LINUX_DATAPATH) { 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 @@ -125,7 +132,8 @@ get_memory_stats(struct smap *stats) 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; } @@ -140,7 +148,7 @@ get_memory_stats(struct smap *stats) 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; @@ -166,7 +174,7 @@ get_boot_time(void) static long long int cache_expiration = LLONG_MIN; static long long int boot_time; - assert(LINUX); + ovs_assert(LINUX_DATAPATH); if (time_msec() >= cache_expiration) { static const char stat_file[] = "/proc/stat"; @@ -177,13 +185,14 @@ get_boot_time(void) 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; } @@ -198,7 +207,7 @@ get_boot_time(void) static unsigned long long int ticks_to_ms(unsigned long long int ticks) { - assert(LINUX); + ovs_assert(LINUX_DATAPATH); #ifndef USER_HZ #define USER_HZ 100 @@ -231,12 +240,13 @@ get_raw_process_info(pid_t pid, struct raw_process_info *raw) FILE *stream; int n; - assert(LINUX); + ovs_assert(LINUX_DATAPATH); 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; } @@ -316,25 +326,25 @@ count_crashes(pid_t pid) int crashes = 0; FILE *stream; - assert(LINUX); + ovs_assert(LINUX_DATAPATH); 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; } } @@ -359,7 +369,7 @@ get_process_info(pid_t pid, struct process_info *pinfo) { struct raw_process_info child; - assert(LINUX); + ovs_assert(LINUX_DATAPATH); if (!get_raw_process_info(pid, &child)) { return false; } @@ -392,7 +402,8 @@ get_process_stats(struct smap *stats) 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; } @@ -424,7 +435,7 @@ get_process_stats(struct smap *stats) key = xasprintf("process_%.*s", (int) (extension - de->d_name), de->d_name); if (!smap_get(stats, key)) { - if (LINUX && get_process_info(pid, &pinfo)) { + if (LINUX_DATAPATH && 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); @@ -441,20 +452,22 @@ get_process_stats(struct smap *stats) static void 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; @@ -488,15 +501,123 @@ get_filesys_stats(struct smap *stats OVS_UNUSED) smap_add(stats, "file_systems", ds_cstr(&s)); } ds_destroy(&s); -#endif /* HAVE_SETMNTENT && HAVE_STATVFS */ +#endif /* HAVE_GETMNTENT_R && HAVE_STATVFS */ +} + +#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 +system_stats_enable(bool enable) +{ + if (enabled != enable) { + ovs_mutex_lock(&mutex); + if (enable) { + if (!started) { + xpthread_create(NULL, NULL, 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 -get_system_stats(struct smap *stats) +system_stats_wait(void) +{ + if (enabled) { + latch_wait(&latch); + } +} + +static void +discard_stats(void) OVS_REQUIRES(mutex) { - get_cpu_cores(stats); - get_load_average(stats); - get_memory_stats(stats); - get_process_stats(stats); - get_filesys_stats(stats); + 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); + } }