Changeset da1bafb in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2010-05-24T18:57:31Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0095368

Parents:

666f492

Message:

major code revision

• replace spinlocks taken with interrupts disabled with irq_spinlocks
• change spacing (not indendation) to be tab-size independent
• use unsigned integer types where appropriate (especially bit flags)
• visual separation
• remove argument names in function prototypes
• string changes
• correct some formating directives
• replace various cryptic single-character variables (t, a, m, c, b, etc.) with proper identifiers (thread, task, timeout, as, itm, itc, etc.)
• unify some assembler constructs
• unused page table levels are now optimized out in compile time
• replace several ints (with boolean semantics) with bools
• use specifically sized types instead of generic types where appropriate (size_t, uint32_t, btree_key_t)
• improve comments
• split asserts with conjuction into multiple independent asserts

File:

• kernel/generic/src/console/cmd.c (modified) (9 diffs)

kernel/generic/src/console/cmd.c

@@ -510 +510 @@
 void cmd_initialize(cmd_info_t *cmd)
 {
-        spinlock_initialize(&cmd->lock, "cmd");
+        spinlock_initialize(&cmd->lock, "cmd.lock");
         link_initialize(&cmd->link);
 }
@@ -681 +681 @@
                         continue;
                 
-                thread_t *t;
-                if ((t = thread_create((void (*)(void *)) cmd_call0, (void *) argv, TASK, THREAD_FLAG_WIRED, "call0", false))) {
-                        spinlock_lock(&t->lock);
-                        t->cpu = &cpus[i];
-                        spinlock_unlock(&t->lock);
-                        printf("cpu%u: ", i);
-                        thread_ready(t);
-                        thread_join(t);
-                        thread_detach(t);
+                thread_t *thread;
+                if ((thread = thread_create((void (*)(void *)) cmd_call0,
+                    (void *) argv, TASK, THREAD_FLAG_WIRED, "call0", false))) {
+                        irq_spinlock_lock(&thread->lock, true);
+                        thread->cpu = &cpus[i];
+                        irq_spinlock_unlock(&thread->lock, true);
+                        
+                        printf("cpu%" PRIs ": ", i);
+                        
+                        thread_ready(thread);
+                        thread_join(thread);
+                        thread_detach(thread);
                 } else
-                        printf("Unable to create thread for cpu%u\n", i);
+                        printf("Unable to create thread for cpu%" PRIs "\n", i);
         }
         
@@ -1049 +1052 @@
         /* Update and read thread accounting
            for benchmarking */
-        ipl_t ipl = interrupts_disable();
-        spinlock_lock(&TASK->lock);
+        irq_spinlock_lock(&TASK->lock, true);
         uint64_t ucycles0, kcycles0;
         task_get_accounting(TASK, &ucycles0, &kcycles0);
-        spinlock_unlock(&TASK->lock);
-        interrupts_restore(ipl);
+        irq_spinlock_unlock(&TASK->lock, true);
         
         /* Execute the test */
@@ -1061 +1062 @@
         
         /* Update and read thread accounting */
-        uint64_t ucycles1, kcycles1; 
-        ipl = interrupts_disable();
-        spinlock_lock(&TASK->lock);
+        uint64_t ucycles1, kcycles1;
+        irq_spinlock_lock(&TASK->lock, true);
         task_get_accounting(TASK, &ucycles1, &kcycles1);
-        spinlock_unlock(&TASK->lock);
-        interrupts_restore(ipl);
+        irq_spinlock_unlock(&TASK->lock, true);
         
         uint64_t ucycles, kcycles;
@@ -1072 +1071 @@
         order_suffix(ucycles1 - ucycles0, &ucycles, &usuffix);
         order_suffix(kcycles1 - kcycles0, &kcycles, &ksuffix);
-                
+        
         printf("Time: %" PRIu64 "%c user cycles, %" PRIu64 "%c kernel cycles\n",
-                        ucycles, usuffix, kcycles, ksuffix);
+            ucycles, usuffix, kcycles, ksuffix);
         
         if (ret == NULL) {
@@ -1080 +1079 @@
                 return true;
         }
-
+        
         printf("%s\n", ret);
         return false;
@@ -1106 +1105 @@
                 /* Update and read thread accounting
                    for benchmarking */
-                ipl_t ipl = interrupts_disable();
-                spinlock_lock(&TASK->lock);
+                irq_spinlock_lock(&TASK->lock, true);
                 uint64_t ucycles0, kcycles0;
                 task_get_accounting(TASK, &ucycles0, &kcycles0);
-                spinlock_unlock(&TASK->lock);
-                interrupts_restore(ipl);
+                irq_spinlock_unlock(&TASK->lock, true);
                 
                 /* Execute the test */
@@ -1118 +1115 @@
                 
                 /* Update and read thread accounting */
-                ipl = interrupts_disable();
-                spinlock_lock(&TASK->lock);
+                irq_spinlock_lock(&TASK->lock, true);
                 uint64_t ucycles1, kcycles1;
                 task_get_accounting(TASK, &ucycles1, &kcycles1);
-                spinlock_unlock(&TASK->lock);
-                interrupts_restore(ipl);
-
+                irq_spinlock_unlock(&TASK->lock, true);
+                
                 if (ret != NULL) {
                         printf("%s\n", ret);
@@ -1135 +1130 @@
                 order_suffix(kcycles1 - kcycles0, &kcycles, &ksuffix);
                 printf("OK (%" PRIu64 "%c user cycles, %" PRIu64 "%c kernel cycles)\n",
-                                ucycles, usuffix, kcycles, ksuffix);
+                    ucycles, usuffix, kcycles, ksuffix);
         }