Changeset c2ab3f4 in mainline for kernel/generic/src/sysinfo/stats.c

Timestamp:

2010-04-28T21:12:04Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c050399

Parents:

b8f7ea78 (diff), 55821eea (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge blocking and locking improvements and fixes.

File:

• kernel/generic/src/sysinfo/stats.c (modified) (9 diffs)

kernel/generic/src/sysinfo/stats.c

@@ -38 +38 @@
 #include <sysinfo/stats.h>
 #include <sysinfo/sysinfo.h>
+#include <synch/spinlock.h>
+#include <synch/mutex.h>
 #include <time/clock.h>
 #include <mm/frame.h>
@@ -68 +70 @@
 static load_t avenrdy[LOAD_STEPS] = {0, 0, 0};
 
-/** Load calculation spinlock */
-SPINLOCK_STATIC_INITIALIZE_NAME(load_lock, "load_lock");
+/** Load calculation lock */
+static mutex_t load_lock;
 
 /** Get system uptime
@@ -344 +346 @@
         
         /* Interrupts are already disabled */
-        spinlock_lock(&(thread->lock));
+        spinlock_lock(&thread->lock);
         
         /* Record the statistics and increment the iterator */
@@ -350 +352 @@
         (*iterator)++;
         
-        spinlock_unlock(&(thread->lock));
+        spinlock_unlock(&thread->lock);
         
         return true;
@@ -615 +617 @@
         }
         
-        /* To always get consistent values acquire the spinlock */
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&load_lock);
+        /* To always get consistent values acquire the mutex */
+        mutex_lock(&load_lock);
         
         unsigned int i;
@@ -623 +624 @@
                 stats_load[i] = avenrdy[i] << LOAD_FIXED_SHIFT;
         
-        spinlock_unlock(&load_lock);
-        interrupts_restore(ipl);
+        mutex_unlock(&load_lock);
         
         return ((void *) stats_load);
@@ -655 +655 @@
                 
                 /* Mutually exclude with get_stats_load() */
-                ipl_t ipl = interrupts_disable();
-                spinlock_lock(&load_lock);
+                mutex_lock(&load_lock);
                 
                 unsigned int i;
@@ -662 +661 @@
                         avenrdy[i] = load_calc(avenrdy[i], load_exp[i], ready);
                 
-                spinlock_unlock(&load_lock);
-                interrupts_restore(ipl);
+                mutex_unlock(&load_lock);
                 
                 thread_sleep(LOAD_INTERVAL);
@@ -674 +672 @@
 void stats_init(void)
 {
+        mutex_initialize(&load_lock, MUTEX_PASSIVE);
+
         sysinfo_set_item_fn_val("system.uptime", NULL, get_stats_uptime);
         sysinfo_set_item_fn_data("system.cpus", NULL, get_stats_cpus);