-/* 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.
#include "system-stats.h"
-#include <assert.h>
#include <ctype.h>
#include <dirent.h>
#include <errno.h>
#include "daemon.h"
#include "dirs.h"
#include "dynamic-string.h"
+#include "json.h"
+#include "ofpbuf.h"
+#include "poll-loop.h"
#include "shash.h"
#include "smap.h"
#include "timeval.h"
#include "vlog.h"
+#include "worker.h"
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 <asm/param.h>
-#define LINUX 1
#else
-#define LINUX 0
+#define LINUX_DATAPATH 0
#endif
static 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
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;
}
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";
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;
}
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
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;
}
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;
}
{
struct raw_process_info child;
- assert(LINUX);
+ ovs_assert(LINUX_DATAPATH);
if (!get_raw_process_info(pid, &child)) {
return false;
}
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;
}
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);
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;
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. */
+
+/* Whether the client wants us to report system stats. */
+static bool enabled;
+
+static enum {
+ S_DISABLED, /* Not enabled, nothing going on. */
+ S_WAITING, /* Sleeping for SYSTEM_STATS_INTERVAL ms. */
+ S_REQUEST_SENT, /* Sent a request to worker. */
+ S_REPLY_RECEIVED /* Received a reply from worker. */
+} state;
+
+/* In S_WAITING state: the next time to wake up.
+ * In other states: not meaningful. */
+static long long int next_refresh;
+/* In S_REPLY_RECEIVED: the stats that have just been received.
+ * In other states: not meaningful. */
+static struct smap *received_stats;
+
+static worker_request_func system_stats_request_cb;
+static worker_reply_func system_stats_reply_cb;
+
+/* Enables or disables system stats collection, according to 'new_enable'.
+ *
+ * Even if system stats are disabled, the caller should still periodically call
+ * system_stats_run(). */
void
-get_system_stats(struct smap *stats)
+system_stats_enable(bool new_enable)
{
- get_cpu_cores(stats);
- get_load_average(stats);
- get_memory_stats(stats);
- get_process_stats(stats);
- get_filesys_stats(stats);
+ if (new_enable != enabled) {
+ if (new_enable) {
+ if (state == S_DISABLED) {
+ state = S_WAITING;
+ next_refresh = time_msec();
+ }
+ } else {
+ if (state == S_WAITING) {
+ state = S_DISABLED;
+ }
+ }
+ enabled = new_enable;
+ }
+}
+
+/* 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 complete free the returned data.
+ *
+ * When no new snapshot is available, returns NULL. */
+struct smap *
+system_stats_run(void)
+{
+ switch (state) {
+ case S_DISABLED:
+ break;
+
+ case S_WAITING:
+ if (time_msec() >= next_refresh) {
+ worker_request(NULL, 0, NULL, 0, system_stats_request_cb,
+ system_stats_reply_cb, NULL);
+ state = S_REQUEST_SENT;
+ }
+ break;
+
+ case S_REQUEST_SENT:
+ break;
+
+ case S_REPLY_RECEIVED:
+ if (enabled) {
+ state = S_WAITING;
+ next_refresh = time_msec() + SYSTEM_STATS_INTERVAL;
+ return received_stats;
+ } else {
+ smap_destroy(received_stats);
+ free(received_stats);
+ state = S_DISABLED;
+ }
+ break;
+ }
+
+ return NULL;
+}
+
+/* Causes poll_block() to wake up when system_stats_run() needs to be
+ * called. */
+void
+system_stats_wait(void)
+{
+ switch (state) {
+ case S_DISABLED:
+ break;
+
+ case S_WAITING:
+ poll_timer_wait_until(next_refresh);
+ break;
+
+ case S_REQUEST_SENT:
+ /* Someone else should be calling worker_wait() to wake up when the
+ * reply arrives, otherwise there's a bug. */
+ break;
+
+ case S_REPLY_RECEIVED:
+ poll_immediate_wake();
+ break;
+ }
+}
+
+static void
+system_stats_request_cb(struct ofpbuf *request OVS_UNUSED,
+ const int fds[] OVS_UNUSED, size_t n_fds OVS_UNUSED)
+{
+ struct smap stats;
+ struct json *json;
+ char *s;
+
+ smap_init(&stats);
+ get_cpu_cores(&stats);
+ get_load_average(&stats);
+ get_memory_stats(&stats);
+ get_process_stats(&stats);
+ get_filesys_stats(&stats);
+
+ json = smap_to_json(&stats);
+ s = json_to_string(json, 0);
+ worker_reply(s, strlen(s) + 1, NULL, 0);
+
+ free(s);
+ json_destroy(json);
+ smap_destroy(&stats);
+}
+
+static void
+system_stats_reply_cb(struct ofpbuf *reply,
+ const int fds[] OVS_UNUSED, size_t n_fds OVS_UNUSED,
+ void *aux OVS_UNUSED)
+{
+ struct json *json = json_from_string(reply->data);
+
+ received_stats = xmalloc(sizeof *received_stats);
+ smap_init(received_stats);
+ smap_from_json(received_stats, json);
+
+ ovs_assert(state == S_REQUEST_SENT);
+ state = S_REPLY_RECEIVED;
+
+ json_destroy(json);
}
git://git.onelab.eu / sliver-openvswitch.git / blobdiff