asserts

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

diff --git a/src/util/os_load.c b/src/util/os_load.c
index d1115e33f97c12d737a36c7ceedca29f307b7911..e2ec8349c3aec70a1914f8161715ec85141a7afd 100644 (file)
--- a/src/util/os_load.c
+++ b/src/util/os_load.c
@@ -19,7 +19,7 @@
 */
 
 /**
- * @file util/os_load_cpu.c
+ * @file util/os_load.c
  * @brief calls to determine current CPU load
  * @author Tzvetan Horozov
  * @author Christian Grothoff
@@ -49,7 +49,7 @@
 #endif
 #endif
 
-#ifdef OSX
+#ifdef DARWIN
 #include <mach/mach.h>
 
 static processor_cpu_load_info_t prev_cpu_load;
@@ -76,7 +76,7 @@ static int currentIOLoad;
 
 static double agedIOLoad = -1;
 
-#ifdef OSX
+#ifdef DARWIN
 static int
 initMachCpuStats ()
 {
@@ -196,7 +196,7 @@ updateUsage ()
     }
 #endif
 
-#ifdef OSX
+#ifdef DARWIN
   {
     unsigned int cpu_count;
     processor_cpu_load_info_t cpu_load;
@@ -284,7 +284,7 @@ updateUsage ()
         vm_deallocate (mach_task_self (),
                        (vm_address_t) cpu_load,
                        (vm_size_t) (cpu_msg_count * sizeof (*cpu_load)));
-        currentIOLoad = -1;     /* FIXME-OSX! */
+        currentIOLoad = -1;     /* There's no IO load meter on darwin */
         return GNUNET_OK;
       }
     else
@@ -517,7 +517,7 @@ updateUsage ()
  * that lock has already been obtained.
  */
 static void
-updateAgedLoad (struct GNUNET_CONFIGURATION_Handle *cfg)
+updateAgedLoad (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   static struct GNUNET_TIME_Absolute lastCall;
 
@@ -573,7 +573,7 @@ updateAgedLoad (struct GNUNET_CONFIGURATION_Handle *cfg)
  *        (100 is equivalent to full load)
  */
 int
-GNUNET_OS_load_cpu_get (struct GNUNET_CONFIGURATION_Handle *cfg)
+GNUNET_OS_load_cpu_get (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   unsigned long long maxCPULoad;
   int ret;
@@ -596,7 +596,7 @@ GNUNET_OS_load_cpu_get (struct GNUNET_CONFIGURATION_Handle *cfg)
  *        (100 is equivalent to full load)
  */
 int
-GNUNET_OS_load_disk_get (struct GNUNET_CONFIGURATION_Handle *cfg)
+GNUNET_OS_load_disk_get (const struct GNUNET_CONFIGURATION_Handle *cfg)
 {
   unsigned long long maxIOLoad;
   int ret;
@@ -623,7 +623,7 @@ void __attribute__ ((constructor)) GNUNET_cpustats_ltdl_init ()
   proc_stat = fopen ("/proc/stat", "r");
   if (NULL == proc_stat)
     GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "fopen", "/proc/stat");
-#elif OSX
+#elif defined(DARWIN)
   initMachCpuStats ();
 #elif MINGW
   InitWinEnv (NULL);
@@ -642,7 +642,7 @@ void __attribute__ ((destructor)) GNUNET_cpustats_ltdl_fini ()
       fclose (proc_stat);
       proc_stat = NULL;
     }
-#elif OSX
+#elif defined(DARWIN)
   GNUNET_free_non_null (prev_cpu_load);
 #elif MINGW
   ShutdownWinEnv ();
@@ -650,4 +650,4 @@ void __attribute__ ((destructor)) GNUNET_cpustats_ltdl_fini ()
 }
 
 
-/* end of os_load_cpu.c */
+/* end of os_load.c */