X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=vswitchd%2Fsystem-stats.c;h=ca98b03e5a3da5a7d6b6f6ac64df5bcab0acc74e;hb=2f51a7ebdaeb1067e3eef873c62f6c22989c9aad;hp=1d9cb78edff40d8b2c0affdbe1f4e9c538f3ba7f;hpb=96d878178dc42839415b210c5631dc54d8eaed79;p=sliver-openvswitch.git

diff --git a/vswitchd/system-stats.c b/vswitchd/system-stats.c
index 1d9cb78ed..ca98b03e5 100644
--- a/vswitchd/system-stats.c
+++ b/vswitchd/system-stats.c
@@ -1,4 +1,4 @@
-/* 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.
@@ -48,12 +48,13 @@ 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_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
@@ -96,7 +97,7 @@ get_page_size(void)
 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);
@@ -174,7 +175,7 @@ get_boot_time(void)
     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";
@@ -207,7 +208,7 @@ get_boot_time(void)
 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
@@ -240,7 +241,7 @@ get_raw_process_info(pid_t pid, struct raw_process_info *raw)
     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");
@@ -326,7 +327,7 @@ count_crashes(pid_t pid)
     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");
@@ -369,7 +370,7 @@ get_process_info(pid_t pid, struct process_info *pinfo)
 {
     struct raw_process_info child;
 
-    ovs_assert(LINUX_DATAPATH);
+    ovs_assert(LINUX);
     if (!get_raw_process_info(pid, &child)) {
         return false;
     }
@@ -435,7 +436,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_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);