Changeset c2ab3f4 in mainline for kernel/generic/src/sysinfo/sysinfo.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/sysinfo.c (modified) (20 diffs)

kernel/generic/src/sysinfo/sysinfo.c

@@ -37 +37 @@
 #include <print.h>
 #include <syscall/copy.h>
-#include <synch/spinlock.h>
+#include <synch/mutex.h>
 #include <arch/asm.h>
 #include <errno.h>
@@ -52 +52 @@
 static slab_cache_t *sysinfo_item_slab;
 
-/** Sysinfo spinlock */
-SPINLOCK_STATIC_INITIALIZE_NAME(sysinfo_lock, "sysinfo_lock");
+/** Sysinfo lock */
+static mutex_t sysinfo_lock;
 
 /** Sysinfo item constructor
@@ -98 +98 @@
             sizeof(sysinfo_item_t), 0, sysinfo_item_constructor,
             sysinfo_item_destructor, SLAB_CACHE_MAGDEFERRED);
+
+        mutex_initialize(&sysinfo_lock, MUTEX_ACTIVE);
 }
 
 /** Recursively find an item in sysinfo tree
  *
- * Should be called with interrupts disabled
- * and sysinfo_lock held.
+ * Should be called with sysinfo_lock held.
  *
  * @param name    Current sysinfo path suffix.
@@ -168 +169 @@
 /** Recursively create items in sysinfo tree
  *
- * Should be called with interrupts disabled
- * and sysinfo_lock held.
+ * Should be called with sysinfo_lock held.
  *
  * @param name     Current sysinfo path suffix.
@@ -299 +299 @@
 {
         /* Protect sysinfo tree consistency */
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&sysinfo_lock);
+        mutex_lock(&sysinfo_lock);
         
         if (root == NULL)
@@ -311 +310 @@
         }
         
-        spinlock_unlock(&sysinfo_lock);
-        interrupts_restore(ipl);
+        mutex_unlock(&sysinfo_lock);
 }
 
@@ -332 +330 @@
 {
         /* Protect sysinfo tree consistency */
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&sysinfo_lock);
+        mutex_lock(&sysinfo_lock);
         
         if (root == NULL)
@@ -345 +342 @@
         }
         
-        spinlock_unlock(&sysinfo_lock);
-        interrupts_restore(ipl);
+        mutex_unlock(&sysinfo_lock);
 }
 
@@ -361 +357 @@
 {
         /* Protect sysinfo tree consistency */
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&sysinfo_lock);
+        mutex_lock(&sysinfo_lock);
         
         if (root == NULL)
@@ -373 +368 @@
         }
         
-        spinlock_unlock(&sysinfo_lock);
-        interrupts_restore(ipl);
+        mutex_unlock(&sysinfo_lock);
 }
 
@@ -394 +388 @@
 {
         /* Protect sysinfo tree consistency */
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&sysinfo_lock);
+        mutex_lock(&sysinfo_lock);
         
         if (root == NULL)
@@ -406 +399 @@
         }
         
-        spinlock_unlock(&sysinfo_lock);
-        interrupts_restore(ipl);
+        mutex_unlock(&sysinfo_lock);
 }
 
@@ -420 +412 @@
 {
         /* Protect sysinfo tree consistency */
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&sysinfo_lock);
+        mutex_lock(&sysinfo_lock);
         
         if (root == NULL)
@@ -430 +421 @@
                 item->val_type = SYSINFO_VAL_UNDEFINED;
         
-        spinlock_unlock(&sysinfo_lock);
-        interrupts_restore(ipl);
+        mutex_unlock(&sysinfo_lock);
 }
 
@@ -446 +436 @@
 {
         /* Protect sysinfo tree consistency */
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&sysinfo_lock);
+        mutex_lock(&sysinfo_lock);
         
         if (root == NULL)
@@ -461 +450 @@
         }
         
-        spinlock_unlock(&sysinfo_lock);
-        interrupts_restore(ipl);
+        mutex_unlock(&sysinfo_lock);
 }
 
@@ -479 +467 @@
 /** Dump the structure of sysinfo tree
  *
- * Should be called with interrupts disabled
- * and sysinfo_lock held. Because this routine
- * might take a reasonable long time to proceed,
- * having the spinlock held is not optimal, but
- * there is no better simple solution.
+ * Should be called with sysinfo_lock held.
  *
  * @param root  Root item of the current (sub)tree.
@@ -559 +543 @@
         /* Avoid other functions to mess with sysinfo
            while we are dumping it */
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&sysinfo_lock);
+        mutex_lock(&sysinfo_lock);
         
         if (root == NULL)
@@ -567 +550 @@
                 sysinfo_dump_internal(root, 0);
         
-        spinlock_unlock(&sysinfo_lock);
-        interrupts_restore(ipl);
+        mutex_unlock(&sysinfo_lock);
 }
 
 /** Return sysinfo item value determined by name
  *
- * Should be called with interrupts disabled
- * and sysinfo_lock held.
+ * Should be called with sysinfo_lock held.
  *
  * @param name    Sysinfo path.
@@ -659 +640 @@
                  * are reading it.
                  */
-                ipl_t ipl = interrupts_disable();
-                spinlock_lock(&sysinfo_lock);
+                mutex_lock(&sysinfo_lock);
                 ret = sysinfo_get_item(path, NULL, dry_run);
-                spinlock_unlock(&sysinfo_lock);
-                interrupts_restore(ipl);
+                mutex_unlock(&sysinfo_lock);
         }
         free(path);