Changeset 409 for trunk/kernel/libk/spinlock.c

Timestamp:

Dec 20, 2017, 4:51:09 PM (6 years ago)

Author:

alain

Message:

Fix bugs in exec

File:

• trunk/kernel/libk/spinlock.c (modified) (6 diffs)

trunk/kernel/libk/spinlock.c

@@ -37 +37 @@
 {
     lock->taken = 0;
+
+#if CONFIG_LOCKS_DEBUG
     lock->owner = NULL;
     list_entry_init( &lock->list );
+#endif
+
 }
 
@@ -66 +70 @@
 
     this->local_locks++;
+
+#if CONFIG_LOCKS_DEBUG
     lock->owner = this;
     list_add_first( &this->locks_root , &lock->list );
+#endif
 
     // irq_state must be restored when lock is released
@@ -79 +86 @@
     thread_t * this = CURRENT_THREAD;;
 
+#if CONFIG_LOCKS_DEBUG
     lock->owner = NULL;
+    list_unlink( &lock->list );
+#endif
+
     lock->taken = 0;
     this->local_locks--;
-    list_unlink( &lock->list );
 
     // deschedule if pending request
@@ -121 +131 @@
 
     this->local_locks++;
+
+#if CONFIG_LOCKS_DEBUG
     lock->owner = this;
     list_add_first( &this->locks_root , &lock->list );
+#endif
 
     // restore IRQs
@@ -148 +161 @@
     {
         this->local_locks++;
+
+#if CONFIG_LOCKS_DEBUG
         lock->owner = this;
         list_add_first( &this->locks_root , &lock->list );
+#endif
+
         hal_restore_irq(mode);
         return 0;
@@ -160 +177 @@
     thread_t * this = CURRENT_THREAD;
 
+#if CONFIG_LOCKS_DEBUG
     lock->owner = NULL;
+    list_unlink( &lock->list );
+#endif
+
     lock->taken = 0;
     this->local_locks--;
-    list_unlink( &lock->list );
 
     // deschedule if pending request