trying to port statvfs call to BSD

[oweals/gnunet.git] / src / util / os_load.c

diff --git a/src/util/os_load.c b/src/util/os_load.c
index e2ec8349c3aec70a1914f8161715ec85141a7afd..e54147ff4ed2c5045898a2cffc91dea7dcaec855 100644 (file)
--- a/src/util/os_load.c
+++ b/src/util/os_load.c
@@ -58,7 +58,16 @@ static processor_cpu_load_info_t prev_cpu_load;
 #define DEBUG_STATUSCALLS GNUNET_NO
 
 #ifdef LINUX
+/**
+ * File descriptor for reading /proc/stat (or NULL)
+ */
 static FILE *proc_stat;
+
+/**
+ * Is this the first time we're trying to open /proc/stat?  If
+ * not, we don't try again if we failed...
+ */
+static int first_time;
 #endif
 
 /**
@@ -112,6 +121,7 @@ initMachCpuStats ()
 }
 #endif
 
+
 /**
  * Update the currentCPU and currentIO load values.
  *
@@ -127,6 +137,13 @@ updateUsage ()
   /* under linux, first try %idle/usage using /proc/stat;
      if that does not work, disable /proc/stat for the future
      by closing the file and use the next-best method. */
+  if (0 == first_time)
+    {
+      first_time = 1;
+      proc_stat = fopen ("/proc/stat", "r");
+      if (NULL == proc_stat)
+       GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "fopen", "/proc/stat");
+    }
   if (proc_stat != NULL)
     {
       static unsigned long long last_cpu_results[5] = { 0, 0, 0, 0, 0 };
@@ -139,9 +156,10 @@ updateUsage ()
       unsigned long long usage_time = 0, total_time = 1;
 
       /* Get the first line with the data */
+      memset (line, 0, sizeof (line));
       rewind (proc_stat);
       fflush (proc_stat);
-      if (NULL == fgets (line, 256, proc_stat))
+      if (NULL == fgets (line, sizeof (line), proc_stat))
         {
           GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR |
                                     GNUNET_ERROR_TYPE_BULK,
@@ -586,6 +604,8 @@ GNUNET_OS_load_cpu_get (const struct GNUNET_CONFIGURATION_Handle *cfg)
       GNUNET_CONFIGURATION_get_value_number (cfg, "LOAD", "MAXCPULOAD",
                                              &maxCPULoad))
     return GNUNET_SYSERR;
+  if (maxCPULoad == 0)
+    return 100;
   return (100 * ret) / maxCPULoad;
 }
 
@@ -609,6 +629,8 @@ GNUNET_OS_load_disk_get (const struct GNUNET_CONFIGURATION_Handle *cfg)
       GNUNET_CONFIGURATION_get_value_number (cfg, "LOAD", "MAXIOLOAD",
                                              &maxIOLoad))
     return GNUNET_SYSERR;
+  if (maxIOLoad == 0)
+    return 100;
   return (100 * ret) / maxIOLoad;
 }
 
@@ -620,15 +642,24 @@ GNUNET_OS_load_disk_get (const struct GNUNET_CONFIGURATION_Handle *cfg)
 void __attribute__ ((constructor)) GNUNET_cpustats_ltdl_init ()
 {
 #ifdef LINUX
-  proc_stat = fopen ("/proc/stat", "r");
-  if (NULL == proc_stat)
-    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "fopen", "/proc/stat");
+  updateUsage ();               /* initialize */
+  /* Most GNUnet processes don't really need this, so close the FD, but allow 
+     re-opening it (unless we failed) */
+  if (proc_stat != NULL)
+    {
+      GNUNET_break (0 == fclose (proc_stat));
+      proc_stat = NULL;
+      first_time = 0;
+    }
 #elif defined(DARWIN)
   initMachCpuStats ();
+  updateUsage ();               /* initialize */
 #elif MINGW
   InitWinEnv (NULL);
-#endif
   updateUsage ();               /* initialize */
+#else
+  updateUsage ();               /* initialize */
+#endif
 }
 
 /**