Changeset 6f4495f5 in mainline for kernel/generic/src/proc/task.c

Timestamp:

2007-01-27T17:32:13Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1ba41c5

Parents:

51baa8a

Message:

Indentaion and formatting changes even Martin will like

File:

• kernel/generic/src/proc/task.c (modified) (13 diffs)

kernel/generic/src/proc/task.c

@@ -66 +66 @@
 /** B+tree of active tasks.
  *
- * The task is guaranteed to exist after it was found in the tasks_btree as long as:
+ * The task is guaranteed to exist after it was found in the tasks_btree as
+ * long as:
  * @li the tasks_lock is held,
- * @li the task's lock is held when task's lock is acquired before releasing tasks_lock or
+ * @li the task's lock is held when task's lock is acquired before releasing
+ *     tasks_lock or
  * @li the task's refcount is greater than 0
  *
@@ -126 +128 @@
         for (i = 0; i < IPC_MAX_PHONES; i++)
                 ipc_phone_init(&ta->phones[i]);
-        if ((ipc_phone_0) && (context_check(ipc_phone_0->task->context, ta->context)))
+        if ((ipc_phone_0) && (context_check(ipc_phone_0->task->context,
+            ta->context)))
                 ipc_phone_connect(&ta->phones[0], ipc_phone_0);
         atomic_set(&ta->active_calls, 0);
@@ -203 +206 @@
         
         kernel_uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t), 0);
-        kernel_uarg->uspace_entry = (void *) ((elf_header_t *) program_addr)->e_entry;
+        kernel_uarg->uspace_entry =
+            (void *) ((elf_header_t *) program_addr)->e_entry;
         kernel_uarg->uspace_stack = (void *) USTACK_ADDRESS;
         kernel_uarg->uspace_thread_function = NULL;
@@ -215 +219 @@
          * Create the data as_area.
          */
-        a = as_area_create(as, AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE, 
-                LOADED_PROG_STACK_PAGES_NO*PAGE_SIZE,
-                USTACK_ADDRESS, AS_AREA_ATTR_NONE, &anon_backend, NULL);
+        a = as_area_create(as, AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE,
+            LOADED_PROG_STACK_PAGES_NO * PAGE_SIZE, USTACK_ADDRESS,
+            AS_AREA_ATTR_NONE, &anon_backend, NULL);
 
         /*
          * Create the main thread.
          */
-        t1 = thread_create(uinit, kernel_uarg, task, THREAD_FLAG_USPACE, "uinit", false);
+        t1 = thread_create(uinit, kernel_uarg, task, THREAD_FLAG_USPACE,
+            "uinit", false);
         ASSERT(t1);
         
@@ -239 +244 @@
 /** Syscall for reading task ID from userspace.
  *
- * @param uspace_task_id Userspace address of 8-byte buffer where to store current task ID.
+ * @param uspace_task_id Userspace address of 8-byte buffer where to store
+ * current task ID.
  *
  * @return 0 on success or an error code from @ref errno.h.
@@ -249 +255 @@
          * remains constant for the lifespan of the task.
          */
-        return (unative_t) copy_to_uspace(uspace_task_id, &TASK->taskid, sizeof(TASK->taskid));
+        return (unative_t) copy_to_uspace(uspace_task_id, &TASK->taskid,
+            sizeof(TASK->taskid));
 }
 
@@ -289 +296 @@
                 /* Process only counted threads */
                 if (!thr->uncounted) {
-                        if (thr == THREAD) /* Update accounting of current thread */
-                                thread_update_accounting(); 
+                        if (thr == THREAD) {
+                                /* Update accounting of current thread */
+                                thread_update_accounting();
+                        } 
                         ret += thr->cycles;
                 }
@@ -377 +386 @@
         spinlock_lock(&tasks_lock);
         
-        printf("taskid name       ctx address    as         cycles     threads calls  callee\n");
-        printf("------ ---------- --- ---------- ---------- ---------- ------- ------ ------>\n");
-
-        for (cur = tasks_btree.leaf_head.next; cur != &tasks_btree.leaf_head; cur = cur->next) {
+        printf("taskid name       ctx address    as         cycles     threads "
+            "calls  callee\n");
+        printf("------ ---------- --- ---------- ---------- ---------- ------- "            "------ ------>\n");
+
+        for (cur = tasks_btree.leaf_head.next; cur != &tasks_btree.leaf_head;
+            cur = cur->next) {
                 btree_node_t *node;
                 int i;
@@ -397 +408 @@
                         order(task_get_accounting(t), &cycles, &suffix);
                         
-                        printf("%-6lld %-10s %-3ld %#10zx %#10zx %9llu%c %7zd %6zd", t->taskid, t->name, t->context, t, t->as, cycles, suffix, t->refcount, atomic_get(&t->active_calls));
+                        printf("%-6lld %-10s %-3ld %#10zx %#10zx %9llu%c %7zd "
+                            "%6zd", t->taskid, t->name, t->context, t, t->as,
+                            cycles, suffix, t->refcount,
+                            atomic_get(&t->active_calls));
                         for (j = 0; j < IPC_MAX_PHONES; j++) {
                                 if (t->phones[j].callee)
-                                        printf(" %zd:%#zx", j, t->phones[j].callee);
+                                        printf(" %zd:%#zx", j,
+                                            t->phones[j].callee);
                         }
                         printf("\n");
@@ -466 +481 @@
         
         if (t != THREAD) {
-                ASSERT(t != main_thread);       /* uninit is joined and detached in ktaskgc */
+                ASSERT(t != main_thread);       /* uninit is joined and detached
+                                                 * in ktaskgc */
                 thread_join(t);
                 thread_detach(t);
-                goto loop;      /* go for another thread */
+                goto loop;                      /* go for another thread */
         }
         
@@ -498 +514 @@
          * therefore the thread pointer is guaranteed to be valid.
          */
-        if (thread_join_timeout(t, 1000000, SYNCH_FLAGS_NONE) == ESYNCH_TIMEOUT) {      /* sleep uninterruptibly here! */
+        if (thread_join_timeout(t, 1000000, SYNCH_FLAGS_NONE) ==
+            ESYNCH_TIMEOUT) {   /* sleep uninterruptibly here! */
                 ipl_t ipl;
                 link_t *cur;
@@ -504 +521 @@
         
                 /*
-                 * The join timed out. Try to do some garbage collection of Undead threads.
+                 * The join timed out. Try to do some garbage collection of
+                 * Undead threads.
                  */
 more_gc:                
@@ -510 +528 @@
                 spinlock_lock(&TASK->lock);
                 
-                for (cur = TASK->th_head.next; cur != &TASK->th_head; cur = cur->next) {
+                for (cur = TASK->th_head.next; cur != &TASK->th_head;
+                    cur = cur->next) {
                         thr = list_get_instance(cur, thread_t, th_link);
                         spinlock_lock(&thr->lock);
-                        if (thr != t && thr->state == Undead && thr->join_type == None) {
+                        if (thr != t && thr->state == Undead &&
+                            thr->join_type == None) {
                                 thr->join_type = TaskGC;
                                 spinlock_unlock(&thr->lock);