Changes in kernel/generic/src/console/cmd.c [c992538a:4ce914d4] in mainline

File:

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

kernel/generic/src/console/cmd.c

@@ -510 +510 @@
 void cmd_initialize(cmd_info_t *cmd)
 {
-        spinlock_initialize(&cmd->lock, "cmd.lock");
+        spinlock_initialize(&cmd->lock, "cmd");
         link_initialize(&cmd->link);
 }
@@ -658 +658 @@
                 printf("Duplicate symbol, be more specific.\n");
         } else if (rc == EOK) {
-                ipl_t ipl;
-
-                ipl = interrupts_disable();
                 fnc = (unative_t (*)(void)) arch_construct_function(&fptr,
                     (void *) symaddr, (void *) cmd_call0);
                 printf("Calling %s() (%p)\n", symbol, symaddr);
                 printf("Result: %#" PRIxn "\n", fnc());
-                interrupts_restore(ipl);
         } else {
                 printf("No symbol information available.\n");
@@ -685 +681 @@
                         continue;
                 
-                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);
+                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);
                 } else
-                        printf("Unable to create thread for cpu%" PRIs "\n", i);
+                        printf("Unable to create thread for cpu%u\n", i);
         }
         
@@ -723 +716 @@
                 printf("Duplicate symbol, be more specific.\n");
         } else if (rc == EOK) {
-                ipl_t ipl;
-
-                ipl = interrupts_disable();
                 fnc = (unative_t (*)(unative_t, ...)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call1);
                 printf("Calling f(%#" PRIxn "): %p: %s\n", arg1, symaddr, symbol);
                 printf("Result: %#" PRIxn "\n", fnc(arg1));
-                interrupts_restore(ipl);
         } else {
                 printf("No symbol information available.\n");
@@ -757 +746 @@
                 printf("Duplicate symbol, be more specific.\n");
         } else if (rc == EOK) {
-                ipl_t ipl;
-
-                ipl = interrupts_disable();
                 fnc = (unative_t (*)(unative_t, unative_t, ...)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call2);
                 printf("Calling f(%#" PRIxn ", %#" PRIxn "): %p: %s\n", 
                        arg1, arg2, symaddr, symbol);
                 printf("Result: %#" PRIxn "\n", fnc(arg1, arg2));
-                interrupts_restore(ipl);
         } else {
                 printf("No symbol information available.\n");
@@ -792 +777 @@
                 printf("Duplicate symbol, be more specific.\n");
         } else if (rc == EOK) {
-                ipl_t ipl;
-
-                ipl = interrupts_disable();
                 fnc = (unative_t (*)(unative_t, unative_t, unative_t, ...)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call3);
                 printf("Calling f(%#" PRIxn ",%#" PRIxn ", %#" PRIxn "): %p: %s\n", 
                        arg1, arg2, arg3, symaddr, symbol);
                 printf("Result: %#" PRIxn "\n", fnc(arg1, arg2, arg3));
-                interrupts_restore(ipl);
         } else {
                 printf("No symbol information available.\n");
@@ -1068 +1049 @@
         /* Update and read thread accounting
            for benchmarking */
-        irq_spinlock_lock(&TASK->lock, true);
+        ipl_t ipl = interrupts_disable();
+        spinlock_lock(&TASK->lock);
         uint64_t ucycles0, kcycles0;
         task_get_accounting(TASK, &ucycles0, &kcycles0);
-        irq_spinlock_unlock(&TASK->lock, true);
+        spinlock_unlock(&TASK->lock);
+        interrupts_restore(ipl);
         
         /* Execute the test */
@@ -1078 +1061 @@
         
         /* Update and read thread accounting */
-        uint64_t ucycles1, kcycles1;
-        irq_spinlock_lock(&TASK->lock, true);
+        uint64_t ucycles1, kcycles1; 
+        ipl = interrupts_disable();
+        spinlock_lock(&TASK->lock);
         task_get_accounting(TASK, &ucycles1, &kcycles1);
-        irq_spinlock_unlock(&TASK->lock, true);
+        spinlock_unlock(&TASK->lock);
+        interrupts_restore(ipl);
         
         uint64_t ucycles, kcycles;
@@ -1087 +1072 @@
         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) {
@@ -1095 +1080 @@
                 return true;
         }
-        
+
         printf("%s\n", ret);
         return false;
@@ -1121 +1106 @@
                 /* Update and read thread accounting
                    for benchmarking */
-                irq_spinlock_lock(&TASK->lock, true);
+                ipl_t ipl = interrupts_disable();
+                spinlock_lock(&TASK->lock);
                 uint64_t ucycles0, kcycles0;
                 task_get_accounting(TASK, &ucycles0, &kcycles0);
-                irq_spinlock_unlock(&TASK->lock, true);
+                spinlock_unlock(&TASK->lock);
+                interrupts_restore(ipl);
                 
                 /* Execute the test */
@@ -1131 +1118 @@
                 
                 /* Update and read thread accounting */
-                irq_spinlock_lock(&TASK->lock, true);
+                ipl = interrupts_disable();
+                spinlock_lock(&TASK->lock);
                 uint64_t ucycles1, kcycles1;
                 task_get_accounting(TASK, &ucycles1, &kcycles1);
-                irq_spinlock_unlock(&TASK->lock, true);
-                
+                spinlock_unlock(&TASK->lock);
+                interrupts_restore(ipl);
+
                 if (ret != NULL) {
                         printf("%s\n", ret);
@@ -1146 +1135 @@
                 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);
         }