Changeset 1564c4b in mainline for kernel/generic/src/proc/task.c

Timestamp:

2011-06-08T19:39:52Z (14 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:

2af29ed

Parents:

e686889c (diff), 0eff68e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

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

kernel/generic/src/proc/task.c

@@ -190 +190 @@
         str_cpy(task->name, TASK_NAME_BUFLEN, name);
         
-        task->context = CONTEXT;
+        task->container = CONTAINER;
         task->capabilities = 0;
         task->ucycles = 0;
@@ -211 +211 @@
         
         if ((ipc_phone_0) &&
-            (context_check(ipc_phone_0->task->context, task->context)))
+            (container_check(ipc_phone_0->task->container, task->container)))
                 ipc_phone_connect(&task->phones[0], ipc_phone_0);
         
@@ -534 +534 @@
         */
         if (notify) {
-                if (event_is_subscribed(EVENT_FAULT)) {
-                        /* Notify the subscriber that a fault occurred. */
-                        event_notify_3(EVENT_FAULT, LOWER32(TASK->taskid),
-                            UPPER32(TASK->taskid), (sysarg_t) THREAD);
-                
+                /* Notify the subscriber that a fault occurred. */
+                if (event_notify_3(EVENT_FAULT, false, LOWER32(TASK->taskid),
+                    UPPER32(TASK->taskid), (sysarg_t) THREAD) == EOK) {
 #ifdef CONFIG_UDEBUG
                         /* Wait for a debugging session. */
@@ -586 +584 @@
                 printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %10p %10p"
                     " %9" PRIu64 "%c %9" PRIu64 "%c\n", task->taskid,
-                    task->name, task->context, task, task->as,
+                    task->name, task->container, task, task->as,
                     ucycles, usuffix, kcycles, ksuffix);
 #endif
@@ -597 +595 @@
         else
                 printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %18p %18p\n",
-                    task->taskid, task->name, task->context, task, task->as);
+                    task->taskid, task->name, task->container, task, task->as);
 #endif
         
@@ -627 +625 @@
                 printf("[id    ] [threads] [calls] [callee\n");
         else
-                printf("[id    ] [name        ] [ctx] [address ] [as      ]"
+                printf("[id    ] [name        ] [ctn] [address ] [as      ]"
                     " [ucycles ] [kcycles ]\n");
 #endif
@@ -636 +634 @@
                     " [callee\n");
         else
-                printf("[id    ] [name        ] [ctx] [address         ]"
+                printf("[id    ] [name        ] [ctn] [address         ]"
                     " [as              ]\n");
 #endif