Changes in kernel/generic/src/synch/spinlock.c [90c8b8d:98000fb] in mainline

File:

• kernel/generic/src/synch/spinlock.c (modified) (5 diffs)

kernel/generic/src/synch/spinlock.c

@@ -45 +45 @@
 #include <symtab.h>
 
+#ifdef CONFIG_FB
+#include <genarch/fb/fb.h>
+#endif
+
 #ifdef CONFIG_SMP
 
 /** Initialize spinlock
  *
+ * Initialize spinlock.
+ *
  * @param sl Pointer to spinlock_t structure.
- *
  */
-void spinlock_initialize(spinlock_t *lock, char *name)
+void spinlock_initialize(spinlock_t *sl, char *name)
 {
-        atomic_set(&lock->val, 0);
+        atomic_set(&sl->val, 0);
 #ifdef CONFIG_DEBUG_SPINLOCK
-        lock->name = name;
-#endif
+        sl->name = name;
+#endif  
 }
-
-#ifdef CONFIG_DEBUG_SPINLOCK
 
 /** Lock spinlock
@@ -68 +71 @@
  * possible occurence of deadlock.
  *
- * @param lock Pointer to spinlock_t structure.
- *
+ * @param sl Pointer to spinlock_t structure.
  */
-void spinlock_lock_debug(spinlock_t *lock)
+#ifdef CONFIG_DEBUG_SPINLOCK
+void spinlock_lock_debug(spinlock_t *sl)
 {
         size_t i = 0;
         bool deadlock_reported = false;
-        
+
         preemption_disable();
-        while (test_and_set(&lock->val)) {
+        while (test_and_set(&sl->val)) {
+
                 /*
-                 * We need to be careful about particular locks
-                 * which are directly used to report deadlocks
-                 * via printf() (and recursively other functions).
-                 * This conserns especially printf_lock and the
-                 * framebuffer lock.
+                 * We need to be careful about printf_lock and fb_lock.
+                 * Both of them are used to report deadlocks via
+                 * printf() and fb_putchar().
                  *
-                 * Any lock whose name is prefixed by "*" will be
-                 * ignored by this deadlock detection routine
-                 * as this might cause an infinite recursion.
                  * We trust our code that there is no possible deadlock
-                 * caused by these locks (except when an exception
-                 * is triggered for instance by printf()).
+                 * caused by these two locks (except when an exception
+                 * is triggered for instance by printf() or fb_putchar()).
+                 * However, we encountered false positives caused by very
+                 * slow VESA framebuffer interaction (especially when
+                 * run in a simulator) that caused problems with both
+                 * printf_lock and fb_lock.
                  *
-                 * We encountered false positives caused by very
-                 * slow framebuffer interaction (especially when
-                 * run in a simulator) that caused problems with both
-                 * printf_lock and the framebuffer lock.
-                 *
+                 * Possible deadlocks on both printf_lock and fb_lock
+                 * are therefore not reported as they would cause an
+                 * infinite recursion.
                  */
-                if (lock->name[0] == '*')
+                if (sl == &printf_lock)
                         continue;
-                
+#ifdef CONFIG_FB
+                if (sl == &fb_lock)
+                        continue;
+#endif
                 if (i++ > DEADLOCK_THRESHOLD) {
                         printf("cpu%u: looping on spinlock %" PRIp ":%s, "
-                            "caller=%" PRIp "(%s)\n", CPU->id, lock, lock->name,
+                            "caller=%" PRIp "(%s)\n", CPU->id, sl, sl->name,
                             CALLER, symtab_fmt_name_lookup(CALLER));
                         
@@ -110 +114 @@
                 }
         }
-        
+
         if (deadlock_reported)
                 printf("cpu%u: not deadlocked\n", CPU->id);
-        
+
         /*
          * Prevent critical section code from bleeding out this way up.
@@ -119 +123 @@
         CS_ENTER_BARRIER();
 }
-
 #endif
 
@@ -128 +131 @@
  * signal failure.
  *
- * @param lock Pointer to spinlock_t structure.
+ * @param sl Pointer to spinlock_t structure.
  *
  * @return Zero on failure, non-zero otherwise.
- *
  */
-int spinlock_trylock(spinlock_t *lock)
+int spinlock_trylock(spinlock_t *sl)
 {
+        int rc;
+        
         preemption_disable();
-        int rc = !test_and_set(&lock->val);
-        
+        rc = !test_and_set(&sl->val);
+
         /*
          * Prevent critical section code from bleeding out this way up.
          */
         CS_ENTER_BARRIER();
-        
+
         if (!rc)
                 preemption_enable();