Changeset 06e1e95 in mainline for kernel/generic/src/synch

Timestamp:

2006-09-14T17:09:21Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f1d1f5d3

Parents:

e5ecc02

Message:

C99 compliant header guards (hopefully) everywhere in the kernel.
Formatting and indentation changes.
Small improvements in sparc64.

File:

• kernel/generic/src/synch/rwlock.c (modified) (1 diff)

kernel/generic/src/synch/rwlock.c

@@ -207 +207 @@
                 rc = _mutex_lock_timeout(&rwl->exclusive, usec, flags);
                 switch (rc) {
-                        case ESYNCH_WOULD_BLOCK:
-                                /*
-                                 * release_spinlock() wasn't called
-                                 */
-                                thread_register_call_me(NULL, NULL);
-                                spinlock_unlock(&rwl->lock);
-                        case ESYNCH_TIMEOUT:
-                        case ESYNCH_INTERRUPTED:
-                                /*
-                                 * The sleep timed out.
-                                 * We just restore interrupt priority level.
-                                 */
-                        case ESYNCH_OK_BLOCKED:         
-                                /*
-                                 * We were woken with rwl->readers_in already incremented.
-                                 * Note that this arrangement avoids race condition between
-                                 * two concurrent readers. (Race is avoided if 'exclusive' is
-                                 * locked at the same time as 'readers_in' is incremented.
-                                 * Same time means both events happen atomically when
-                                 * rwl->lock is held.)
-                                 */
-                                interrupts_restore(ipl);
-                                break;
-                        case ESYNCH_OK_ATOMIC:
-                                panic("_mutex_lock_timeout()==ESYNCH_OK_ATOMIC\n");
-                                break;
-                        default:
-                                panic("invalid ESYNCH\n");
-                                break;
+                case ESYNCH_WOULD_BLOCK:
+                        /*
+                         * release_spinlock() wasn't called
+                         */
+                        thread_register_call_me(NULL, NULL);
+                        spinlock_unlock(&rwl->lock);
+                case ESYNCH_TIMEOUT:
+                case ESYNCH_INTERRUPTED:
+                        /*
+                         * The sleep timed out.
+                         * We just restore interrupt priority level.
+                         */
+                case ESYNCH_OK_BLOCKED:         
+                        /*
+                         * We were woken with rwl->readers_in already incremented.
+                         * Note that this arrangement avoids race condition between
+                         * two concurrent readers. (Race is avoided if 'exclusive' is
+                         * locked at the same time as 'readers_in' is incremented.
+                         * Same time means both events happen atomically when
+                         * rwl->lock is held.)
+                         */
+                        interrupts_restore(ipl);
+                        break;
+                case ESYNCH_OK_ATOMIC:
+                        panic("_mutex_lock_timeout()==ESYNCH_OK_ATOMIC\n");
+                        break;
+                default:
+                        panic("invalid ESYNCH\n");
+                        break;
                 }
                 return rc;