Changeset 99

Timestamp:

03/23/08 16:08:32 (10 months ago)

Author:

mwhitworth

Message:

Add sockets to task structure.

Location:

Whitix/trunk/kernel

Files:

• load.c (modified) (3 diffs)
• main.c (modified) (2 diffs)
• sched.c (modified) (6 diffs)

Whitix/trunk/kernel/load.c

@@ -19 +19 @@
 #include <fs/vfs.h>
 #include <i386/i386.h>
+#include <net/socket.h>
 #include <string.h>
 #include <vmm.h>
@@ -262 +263 @@
  ***********************************************************************/
 
+/* TODO: Move to generic load file. */
+
 static int ExecSetupFs(struct Process* process,char* pathName,int* fds)
 {
@@ -270 +273 @@
 
         process->files=(struct File*)malloc(sizeof(struct File)*MAX_FILES);
+        process->sockets=(struct Socket**)malloc(sizeof(struct Socket*)*MAX_FILES);
         process->root=current->root;
         current->root->refs++;

Whitix/trunk/kernel/main.c

@@ -28 +28 @@
 #include <typedefs.h>
 #include <fs/vfs.h>
+#include <net/network.h>
 #include <fs/devfs.h>
 #include <init.h>
@@ -167 +168 @@
         VfsInit();
         TimeInit();
+        NetworkInit();
 
         start=ThrCreateProcess("KernelLoading");

Whitix/trunk/kernel/sched.c

@@ -29 +29 @@
 #include <vmm.h>
 #include <user_acc.h>
+#include <net/socket.h>
 
 /* List heads */
@@ -253 +254 @@
         ret->refs=1;
         ret->priority=PRIORITY_DEFAULT;
+        ret->state=THR_PAUSED;
         ThrArchCreateThread(ret,entry,user,stackP);
 
@@ -454 +456 @@
                         DoCloseFile(&current->files[i]);
 
+        if (current->sockets)
+                for (i=0; i<MAX_FILES; i++)
+                        SocketClose(current->sockets[i]);
+
         /* Does not apply to the KernelLoading process */
         if (current->exec)
@@ -462 +468 @@
 
         free(current->files);
+        free(current->sockets);
         free(current->sCwd);
 }
@@ -480 +487 @@
 {
         struct Thread* curr,*curr2;
-        
-//      printf("ThrProcessExit(%#X,%d)\n",current,returnCode);
 
         SpinLockIrq(&procListLock);
@@ -690 +695 @@
 {
         struct Thread* thread=ThrCreateThread(current,address,true,stackP);
+
         if (!thread)
                 return -ENOMEM;