Changeset 1085

Timestamp:

10/04/08 23:57:06 (3 months ago)

Author:

mwhitworth

Message:

Add process set, add entry for each process (plus a temporary name file).

Files:

• Whitix/branches/keobject/kernel/process.c (modified) (11 diffs)

Whitix/branches/keobject/kernel/process.c

@@ -6 +6 @@
 #include <i386/process.h>
 #include <malloc.h>
+#include <keobject.h>
 
 LIST_HEAD(processList);
@@ -12 +13 @@
 struct Cache* processCache;
 int pid=0;
+
+KE_OBJECT_TYPE(processType, NULL, NULL);
+struct KeSet processSet;
 
 /***********************************************************************
@@ -89 +93 @@
         process->cId=1; /* Used to give IDs to threads. */
 
-        if (current)
-                process->refs++; /* For WaitForProcessFinish */
-
         process->state=THR_RUNNING;
 
@@ -101 +102 @@
         if (current)
                 ListAdd(&process->sibling, &current->children);
+
+        /* Create the process kernel object, and add it to /Processes.
+         * KeObjectInit is called in the slab constructor. */
+        int err = KeObjectAttach(&process->object, "%d", process->pid);
+
+        struct KeFsEntry* dir = process->object.dir;
+        
+        IcFsAddStrEntry(dir, "name", process->name);
 
         ListAddTail(&process->next,&processList);
@@ -207 +216 @@
                 if (!process)
                         return -ENOENT;
+                        
+                ThrGetProcess(process); /* For WaitForProcessFinish */
         }else{
                 /* Waiting for any of it's children, but what if it has none? */
@@ -250 +261 @@
                 *finishStatus=(process->exitCode << 8);
 
-        if (process)
-                ThrReleaseProcess(process);
+        ThrPutProcess(process);
 
         return retVal;
@@ -279 +289 @@
         ZeroMemory(process,sizeof(struct Process));
 
-        process->refs=1;
         INIT_WAITQUEUE_HEAD(&process->waitQueue);
         INIT_LIST_HEAD(&process->areaList);
         INIT_LIST_HEAD(&process->children);
+        KeObjectInit(&process->object, &processSet);
 }
 
@@ -303 +313 @@
 
         /* Go through all the children and abandon them. */
-        ListForEachEntry(currProc,&current->children,sibling)
+        ListForEachEntry(currProc, &current->children, sibling)
         {
-                ThrReleaseProcess(currProc);
+                ThrPutProcess(currProc);
                 currProc->parent=NULL;
         }
@@ -338 +348 @@
 
         /* Release all vmm areas */
-//      MMapProcessRemove(current);
-
-//      if (VfsFreeFsContext)
-//              VfsFreeFsContext();
+        MmapProcessRemove(current);
+        LoadReleaseFsContext();
 
         /* Now get rid of the memory manager - leaving kernel memory pages intact */
@@ -368 +376 @@
         }
 
-        ThrReleaseProcess(current);
+        ThrPutProcess(current);
         current=NULL; /* Will reschedule as soon as possible - so no big deal,
                                         waiters will have a reference to the process in question anyway. */
@@ -414 +422 @@
         SysRegisterRange(SYS_PROCESS_BASE, procSysCallTable);
 
+        /* Create the process set. Exposing the process via the filesystem allows
+         * us to do debugging in quite a nice way. */
+        KeSetCreate(&processSet, NULL, &processType, "Processes");
+
         return 0;
 }