Changeset a35b458 in mainline for kernel/generic/src/synch/spinlock.c

Timestamp:

2018-03-02T20:10:49Z (6 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

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

Children:

f1380b7

Parents:

3061bc1

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-02-28 17:38:31)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:10:49)

Message:

style: Remove trailing whitespace on _all_ lines, including empty ones, for particular file types.

Command used: tools/srepl '\s\+$' '' -- *.c *.h *.py *.sh *.s *.S *.ag

Currently, whitespace on empty lines is very inconsistent.
There are two basic choices: Either remove the whitespace, or keep empty lines
indented to the level of surrounding code. The former is AFAICT more common,
and also much easier to do automatically.

Alternatively, we could write script for automatic indentation, and use that
instead. However, if such a script exists, it's possible to use the indented
style locally, by having the editor apply relevant conversions on load/save,
without affecting remote repository. IMO, it makes more sense to adopt
the simpler rule.

File:

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

kernel/generic/src/synch/spinlock.c

@@ -77 +77 @@
         size_t i = 0;
         bool deadlock_reported = false;
-        
+
         preemption_disable();
         while (test_and_set(&lock->val)) {
@@ -101 +101 @@
                 if (lock->name[0] == '*')
                         continue;
-                
+
                 if (i++ > DEADLOCK_THRESHOLD) {
                         printf("cpu%u: looping on spinlock %p:%s, "
@@ -107 +107 @@
                             (void *) CALLER, symtab_fmt_name_lookup(CALLER));
                         stack_trace();
-                        
+
                         i = 0;
                         deadlock_reported = true;
                 }
         }
-        
+
         if (deadlock_reported)
                 printf("cpu%u: not deadlocked\n", CPU->id);
-        
+
         /*
          * Prevent critical section code from bleeding out this way up.
@@ -131 +131 @@
 {
         ASSERT_SPINLOCK(spinlock_locked(lock), lock);
-        
+
         /*
          * Prevent critical section code from bleeding out this way down.
          */
         CS_LEAVE_BARRIER();
-        
+
         atomic_set(&lock->val, 0);
         preemption_enable();
@@ -157 +157 @@
         preemption_disable();
         bool ret = !test_and_set(&lock->val);
-        
+
         /*
          * Prevent critical section code from bleeding out this way up.
          */
         CS_ENTER_BARRIER();
-        
+
         if (!ret)
                 preemption_enable();
-        
+
         return ret;
 }
@@ -208 +208 @@
                 ipl_t ipl = interrupts_disable();
                 spinlock_lock(&(lock->lock));
-                
+
                 lock->guard = true;
                 lock->ipl = ipl;
         } else {
                 ASSERT_IRQ_SPINLOCK(interrupts_disabled(), lock);
-                
+
                 spinlock_lock(&(lock->lock));
                 ASSERT_IRQ_SPINLOCK(!lock->guard, lock);
@@ -231 +231 @@
 {
         ASSERT_IRQ_SPINLOCK(interrupts_disabled(), lock);
-        
+
         if (irq_res) {
                 ASSERT_IRQ_SPINLOCK(lock->guard, lock);
-                
+
                 lock->guard = false;
                 ipl_t ipl = lock->ipl;
-                
+
                 spinlock_unlock(&(lock->lock));
                 interrupts_restore(ipl);
@@ -261 +261 @@
         ASSERT_IRQ_SPINLOCK(interrupts_disabled(), lock);
         bool ret = spinlock_trylock(&(lock->lock));
-        
+
         ASSERT_IRQ_SPINLOCK((!ret) || (!lock->guard), lock);
         return ret;
@@ -280 +280 @@
 {
         ASSERT_IRQ_SPINLOCK(interrupts_disabled(), unlock);
-        
+
         /* Pass guard from unlock to lock */
         bool guard = unlock->guard;
         ipl_t ipl = unlock->ipl;
         unlock->guard = false;
-        
+
         spinlock_unlock(&(unlock->lock));
         spinlock_lock(&(lock->lock));
-        
+
         ASSERT_IRQ_SPINLOCK(!lock->guard, lock);
-        
+
         if (guard) {
                 lock->guard = true;
@@ -311 +311 @@
 {
         ASSERT_IRQ_SPINLOCK(interrupts_disabled(), unlock);
-        
+
         spinlock_lock(&(lock->lock));
         ASSERT_IRQ_SPINLOCK(!lock->guard, lock);
-        
+
         /* Pass guard from unlock to lock */
         if (unlock->guard) {
@@ -321 +321 @@
                 unlock->guard = false;
         }
-        
+
         spinlock_unlock(&(unlock->lock));
 }