Changeset 764c302 in mainline for kernel/generic/src

Timestamp:

2006-07-28T23:25:10Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c049309

Parents:

42d3be3

Message:

initial security context support

Location:

kernel/generic/src/proc

Files:

• task.c (modified) (2 diffs)
• the.c (modified) (1 diff)
• thread.c (modified) (5 diffs)

kernel/generic/src/proc/task.c

@@ -116 +116 @@
         ta->main_thread = NULL;
         ta->refcount = 0;
+        ta->context = THE->context;
 
         ta->capabilities = 0;
@@ -356 +357 @@
                 
                         spinlock_lock(&t->lock);
-                        printf("%s(%lld): address=%#zx, as=%#zx, ActiveCalls: %zd",
-                                t->name, t->taskid, t, t->as, atomic_get(&t->active_calls));
+                        printf("%s(%lld): context=%ld, address=%#zx, as=%#zx, ActiveCalls: %zd",
+                                t->name, t->taskid, t->context, t, t->as, atomic_get(&t->active_calls));
                         for (j=0; j < IPC_MAX_PHONES; j++) {
                                 if (t->phones[j].callee)

kernel/generic/src/proc/the.c

@@ -59 +59 @@
         the->task = NULL;
         the->as = NULL;
+        the->context = 0;
 }
 

kernel/generic/src/proc/thread.c

@@ -124 +124 @@
 static int thr_constructor(void *obj, int kmflags)
 {
-        thread_t *t = (thread_t *)obj;
+        thread_t *t = (thread_t *) obj;
 
         spinlock_initialize(&t->lock, "thread_t_lock");
@@ -156 +156 @@
 static int thr_destructor(void *obj)
 {
-        thread_t *t = (thread_t *)obj;
+        thread_t *t = (thread_t *) obj;
 
         frame_free(KA2PA(t->kstack));
@@ -300 +300 @@
         
         /* Not needed, but good for debugging */
-        memsetb((uintptr_t)t->kstack, THREAD_STACK_SIZE * 1<<STACK_FRAMES, 0);
+        memsetb((uintptr_t) t->kstack, THREAD_STACK_SIZE * 1 << STACK_FRAMES, 0);
         
         ipl = interrupts_disable();
@@ -319 +319 @@
         memcpy(t->name, name, THREAD_NAME_BUFLEN);
         
+        t->context = THE->context;
         t->thread_code = func;
         t->thread_arg = arg;
@@ -534 +535 @@
                 
                         t = (thread_t *) node->value[i];
-                        printf("%s: address=%#zx, tid=%zd, state=%s, task=%#zx, code=%#zx, stack=%#zx, cpu=",
-                                t->name, t, t->tid, thread_states[t->state], t->task, t->thread_code, t->kstack);
+                        printf("%s: address=%#zx, tid=%zd, context=%ld, state=%s, task=%#zx, code=%#zx, stack=%#zx, cpu=",
+                                t->name, t, t->tid, t->context, thread_states[t->state], t->task, t->thread_code, t->kstack);
                         if (t->cpu)
                                 printf("cpu%zd", t->cpu->id);