Changeset a35b458 in mainline for kernel/generic/src/main

Timestamp:

2018-03-02T20:10:49Z (7 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.

Location:

kernel/generic/src/main

Files:

• kinit.c (modified) (14 diffs)
• main.c (modified) (15 diffs)
• shutdown.c (modified) (1 diff)
• uinit.c (modified) (2 diffs)

kernel/generic/src/main/kinit.c

@@ -102 +102 @@
 {
         thread_t *thread;
-        
+
         /*
          * Detach kinit as nobody will call thread_join_timeout() on it.
@@ -109 +109 @@
 
         interrupts_disable();
-        
+
         /* Start processing RCU callbacks. RCU is fully functional afterwards. */
         rcu_kinit_init();
-        
+
         /*
          * Start processing work queue items. Some may have been queued during boot.
          */
         workq_global_worker_init();
-        
+
 #ifdef CONFIG_SMP
         if (config.cpu_count > 1) {
                 waitq_initialize(&ap_completion_wq);
-                
+
                 /*
                  * Create the kmp thread and wait for its completion.
@@ -135 +135 @@
                 } else
                         panic("Unable to create kmp thread.");
-                
+
                 thread_join(thread);
                 thread_detach(thread);
-                
+
                 /*
                  * For each CPU, create its load balancing thread.
                  */
                 unsigned int i;
-                
+
                 for (i = 0; i < config.cpu_count; i++) {
                         thread = thread_create(kcpulb, NULL, TASK,
@@ -156 +156 @@
         }
 #endif /* CONFIG_SMP */
-        
+
         /*
          * At this point SMP, if present, is configured.
          */
         ARCH_OP(post_smp_init);
-        
+
         /* Start thread computing system load */
         thread = thread_create(kload, NULL, TASK, THREAD_FLAG_NONE,
@@ -169 +169 @@
         else
                 log(LF_OTHER, LVL_ERROR, "Unable to create kload thread");
-        
+
 #ifdef CONFIG_KCONSOLE
         if (stdin) {
@@ -184 +184 @@
         }
 #endif /* CONFIG_KCONSOLE */
-        
+
         /*
          * Store the default stack size in sysinfo so that uspace can create
@@ -190 +190 @@
          */
         sysinfo_set_item_val("default.stack_size", NULL, STACK_SIZE_USER);
-        
+
         interrupts_enable();
-        
+
         /*
          * Create user tasks, load RAM disk images.
@@ -198 +198 @@
         size_t i;
         program_t programs[CONFIG_INIT_TASKS];
-        
+
         // FIXME: do not propagate arguments through sysinfo
         // but pass them directly to the tasks
@@ -228 +228 @@
                         continue;
                 }
-                
+
                 /*
                  * Construct task name from the 'init:' prefix and the
                  * name stored in the init structure (if any).
                  */
-                
+
                 char namebuf[TASK_NAME_BUFLEN];
-                
+
                 const char *name = init.tasks[i].name;
                 if (name[0] == 0)
                         name = "<unknown>";
-                
+
                 static_assert(TASK_NAME_BUFLEN >= INIT_PREFIX_LEN, "");
                 str_cpy(namebuf, TASK_NAME_BUFLEN, INIT_PREFIX);
                 str_cpy(namebuf + INIT_PREFIX_LEN,
                     TASK_NAME_BUFLEN - INIT_PREFIX_LEN, name);
-                
+
                 /*
                  * Create virtual memory mappings for init task images.
@@ -252 +252 @@
                     PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE);
                 assert(page);
-                
+
                 errno_t rc = program_create_from_image((void *) page, namebuf,
                     &programs[i]);
-                
+
                 if (rc == 0) {
                         if (programs[i].task != NULL) {
@@ -264 +264 @@
                                     PERM_PERM | PERM_MEM_MANAGER |
                                     PERM_IO_MANAGER | PERM_IRQ_REG);
-                                
+
                                 if (!ipc_phone_0) {
                                         ipc_phone_0 = &programs[i].task->answerbox;
@@ -276 +276 @@
                                 }
                         }
-                        
+
                         /*
                          * If programs[i].task == NULL then it is
@@ -293 +293 @@
                             str_error_name(rc), programs[i].loader_status);
         }
-        
+
         /*
          * Run user tasks.
@@ -301 +301 @@
                         program_ready(&programs[i]);
         }
-        
+
 #ifdef CONFIG_KCONSOLE
         if (!stdin) {
                 thread_sleep(10);
                 printf("kinit: No stdin\nKernel alive: .");
-                
+
                 unsigned int i = 0;
                 while (true) {

kernel/generic/src/main/main.c

@@ -166 +166 @@
         config.cpu_count = 1;
         config.cpu_active = 1;
-        
+
         config.base = hardcoded_load_address;
         config.kernel_size = ALIGN_UP(hardcoded_ktext_size +
             hardcoded_kdata_size, PAGE_SIZE);
         config.stack_size = STACK_SIZE;
-        
+
         /* Initialy the stack is placed just after the kernel */
         config.stack_base = config.base + config.kernel_size;
-        
+
         /* Avoid placing stack on top of init */
         size_t i;
@@ -190 +190 @@
                 }
         }
-        
+
         /* Avoid placing stack on top of boot allocations. */
         if (ballocs.size) {
@@ -198 +198 @@
                             ballocs.size, PAGE_SIZE);
         }
-        
+
         if (config.stack_base < stack_safe)
                 config.stack_base = ALIGN_UP(stack_safe, PAGE_SIZE);
-        
+
         context_save(&ctx);
         context_set(&ctx, FADDR(main_bsp_separated_stack),
@@ -218 +218 @@
         /* Keep this the first thing. */
         the_initialize(THE);
-        
+
         version_print();
-        
+
         LOG("\nconfig.base=%p config.kernel_size=%zu"
             "\nconfig.stack_base=%p config.stack_size=%zu",
             (void *) config.base, config.kernel_size,
             (void *) config.stack_base, config.stack_size);
-        
+
 #ifdef CONFIG_KCONSOLE
         /*
@@ -234 +234 @@
         kconsole_init();
 #endif
-        
+
         /*
          * Exception handler initialization, before architecture
@@ -240 +240 @@
          */
         exc_init();
-        
+
         /*
          * Memory management subsystems initialization.
@@ -260 +260 @@
         ARCH_OP(pre_smp_init);
         smp_init();
-        
+
         /* Slab must be initialized after we know the number of processors. */
         slab_enable_cpucache();
-        
+
         uint64_t size;
         const char *size_suffix;
@@ -269 +269 @@
         printf("Detected %u CPU(s), %" PRIu64 " %s free memory\n",
             config.cpu_count, size, size_suffix);
-        
+
         cpu_init();
         calibrate_delay_loop();
@@ -293 +293 @@
         } else
                 printf("No init binaries found.\n");
-        
+
         ipc_init();
         event_init();
@@ -299 +299 @@
         log_init();
         stats_init();
-        
+
         /*
          * Create kernel task.
@@ -306 +306 @@
         if (!kernel)
                 panic("Cannot create kernel task.");
-        
+
         /*
          * Create the first thread.
@@ -315 +315 @@
                 panic("Cannot create kinit thread.");
         thread_ready(kinit_thread);
-        
+
         /*
          * This call to scheduler() will return to kinit,
@@ -344 +344 @@
          */
         config.cpu_active++;
-        
+
         /*
          * The THE structure is well defined because ctx.sp is used as stack.
          */
         the_initialize(THE);
-        
+
         ARCH_OP(pre_mm_init);
         frame_init();
@@ -355 +355 @@
         tlb_init();
         ARCH_OP(post_mm_init);
-        
+
         cpu_init();
         calibrate_delay_loop();
         ARCH_OP(post_cpu_init);
-        
+
         the_copy(THE, (the_t *) CPU->stack);
-        
+
         /*
          * If we woke kmp up before we left the kernel stack, we could
@@ -382 +382 @@
 {
         smp_call_init();
-        
+
         /*
          * Configure timeouts for this cpu.
          */
         timeout_init();
-        
+
         waitq_wakeup(&ap_completion_wq, WAKEUP_FIRST);
         scheduler();

kernel/generic/src/main/shutdown.c

@@ -45 +45 @@
 {
         task_done();
-        
+
 #ifdef CONFIG_DEBUG
         log(LF_OTHER, LVL_DEBUG, "Rebooting the system");
 #endif
-        
+
         arch_reboot();
         halt();

kernel/generic/src/main/uinit.c

@@ -65 +65 @@
          */
         thread_detach(THREAD);
-        
+
 #ifdef CONFIG_UDEBUG
         udebug_stoppable_end();
 #endif
-        
+
         uspace_arg_t *uarg = (uspace_arg_t *) arg;
         uspace_arg_t local_uarg;
-        
+
         local_uarg.uspace_entry = uarg->uspace_entry;
         local_uarg.uspace_stack = uarg->uspace_stack;
@@ -79 +79 @@
         local_uarg.uspace_thread_function = NULL;
         local_uarg.uspace_thread_arg = NULL;
-        
+
         free(uarg);
-        
+
         userspace(&local_uarg);
 }