Changeset 538 for Whitix/branches/hybrid/kernel/sched.c

Timestamp:

05/24/08 09:54:46 (6 months ago)

Author:

mwhitworth

Message:

Create startup module.

Files:

• Whitix/branches/hybrid/kernel/sched.c (modified) (25 diffs)

Whitix/branches/hybrid/kernel/sched.c

@@ -17 +17 @@
  */
 
+/* TODO: Clean up these includes. */
 #include <sched.h>
 #include <error.h>
@@ -25 +26 @@
 #include <malloc.h>
 #include <fs/vfs.h>
+#include <init.h>
 #include <task.h>
 #include <panic.h>
@@ -31 +33 @@
 #include <net/socket.h>
 #include <module.h>
+#include <imports.h>
+#include <sys.h>
 
 /* List heads */
@@ -55 +59 @@
 
 /* Used when a thread is exiting */
-DWORD exitStack[PAGE_SIZE];
+BYTE exitStack[PAGE_SIZE/4];
 
 /***********************************************************************
@@ -141 +145 @@
         SpinLockIrq(&procListLock);
 
-        process=(struct Process*)MemCacheAlloc(processCache);
+        process=(struct Process*)memCacheAlloc(processCache);
         if (!process)
                 return NULL;
@@ -147 +151 @@
         if (VirtMemManagerSetup(process))
         {
-                MemCacheFree(processCache,process);
+                memCacheFree(processCache,process);
                 SpinUnlockIrq(&procListLock);
                 return NULL;
@@ -153 +157 @@
 
         /* Allocate the process's name - used when listing processes or when faulting. */
-        process->name=(char*)malloc(strlen(name)+1);
-        strcpy(process->name,name);
+        process->name=(char*)MemAlloc(strlen(name)+1);
+        strcpy(process->name, name);
         
         /* Add to parent's children list */
@@ -168 +172 @@
         process->state=THR_RUNNING;
 
-        process->files=NULL;
+        process->files=NULL; /* FIXME */
 
         ListAddTail(&process->next,&processList);
@@ -176 +180 @@
         return process;
 }
+
+SYMBOL_EXPORT(ThrCreateProcess);
 
 /***********************************************************************
@@ -200 +206 @@
         ListRemove(&process->next);
         
-        free(process->name);
-        MemCacheFree(processCache,process);
+        MemFree(process->name);
+        memCacheFree(processCache,process);
 
         IrqRestoreFlags(flags);
 }
+
+SYMBOL_EXPORT(ThrFreeProcess);
 
 /***********************************************************************
@@ -251 +259 @@
         SpinLockIrq(&thrListLock);
 
-        ret=(struct Thread*)MemCacheAlloc(threadCache);
+        ret=(struct Thread*)memCacheAlloc(threadCache);
         if (!ret)
                 return NULL;
@@ -272 +280 @@
 }
 
+SYMBOL_EXPORT(ThrCreateThread);
+
 /***********************************************************************
  *
@@ -295 +305 @@
 }
 
+SYMBOL_EXPORT(ThrSetPriority);
+
 /***********************************************************************
  *
@@ -310 +322 @@
 void _ThrFreeThread(struct Thread* thread)
 {
-        free((void*)thread->currStack);
+        MemFree((void*)thread->currStack);
         currThread=NULL;
-        MemCacheFree(threadCache, thread);
+        memCacheFree(threadCache, thread);
         ThrSchedule();
 }
@@ -350 +362 @@
 
         if (thread == currThread)
-                ArchSwitchStackCall(exitStack+PAGE_SIZE,_ThrFreeThread,thread);
+                ArchSwitchStackCall(exitStack+PAGE_SIZE/4,_ThrFreeThread,thread);
         else{
-                free((void*)(thread->currStack));
-                MemCacheFree(threadCache,thread);
+                MemFree((void*)(thread->currStack));
+                memCacheFree(threadCache,thread);
         }
         
@@ -401 +413 @@
         }
 }
+
+SYMBOL_EXPORT(ThrStartThread);
 
 /***********************************************************************
@@ -467 +481 @@
  ***********************************************************************/
 
+/* TODO: Move to filesystem code. */
+
 static void ThrReleaseFsContext()
 {
@@ -473 +489 @@
         /* Now release the filesystem context */
 
-        if (current->files)
+//      if (current->files)
                 /* Close all files associated with the process */
-                for (i=0; i<current->numFds; i++)
-                        DoCloseFile(&current->files[i]);
+//              for (i=0; i<current->numFds; i++)
+//                      DoCloseFile(&current->files[i]);
 
         /* Does not apply to the KernelLoading process */
-        if (current->exec)
-                VNodeRelease(current->exec);
-
-        VNodeRelease(current->cwd);
-        VNodeRelease(current->root);
-
-        free(current->files);
-        free(current->sCwd);
+//      if (current->exec)
+//              VNodeRelease(current->exec);
+
+//      VNodeRelease(current->cwd);
+//      VNodeRelease(current->root);
+
+//      free(current->files);
+//      free(current->sCwd);
 }
 
@@ -511 +527 @@
 
         /* Release all vmm areas */
-        MmapProcessRemove(current);
+//      MmapProcessRemove(current);
         ThrReleaseFsContext();
 
@@ -548 +564 @@
 }
 
+SYMBOL_EXPORT(ThrProcessExit);
+
 /***********************************************************************
  *
@@ -599 +617 @@
         }
 }
+
+SYMBOL_EXPORT(ThrResumeThread);
 
 /***********************************************************************
@@ -751 +771 @@
 int SysExitThread(int threadId)
 {
-//      printf("SysExitThread(%d)\n", threadId);
         if (threadId == -1) /* Exit current thread. */
                 ThrDoExitThread();
@@ -803 +822 @@
         waitEntry.thread=currThread;
         
-        if (finishStatus)
-                if (VirtCheckArea(finishStatus,sizeof(int),VER_WRITE))
-                        return -EFAULT;
+//      if (finishStatus)
+//              if (VirtCheckArea(finishStatus,sizeof(int),VER_WRITE))
+//                      return -EFAULT;
 
         if (pid >= 0)
@@ -903 +922 @@
  ***********************************************************************/
 
-int ThrInit()
+int ThrEarlyInit()
 {
         ThrArchInit(); /* Set up arch-specific data structures for multitasking here */
-
-        /* Allocate the general scheduling caches */
-        processCache=MemCacheCreate("Process Cache", sizeof(struct Process), ThrProcessConstructor, NULL, 0);
-        threadCache=MemCacheCreate("Thread Cache", sizeof(struct Thread), NULL, NULL, 0);
 
         currThread=idleTask;
@@ -919 +934 @@
         return 0;
 }
+
+#define SYS_SCHED_BASE          34
+
+struct SysCall schedSysCallTable[]=
+{
+        { SysCreateThread,                      12 },
+        { SysGetCurrentThreadId,        0  },
+        { SysGetCurrentProcessId,       0  },
+        { SysExitThread,                        4  },
+        { SysExit,                                      4  },
+        { SysWaitForProcessFinish,      8  },
+        { SysYield,                                     0  },
+        { 0,                                            0  },
+};
+
+int ThrInit()
+{
+        /* Allocate the general scheduling caches */
+        processCache=memCacheCreate("Process Cache", sizeof(struct Process), ThrProcessConstructor, NULL, 0);
+        threadCache=memCacheCreate("Thread Cache", sizeof(struct Thread), NULL, NULL, 0);
+
+        /* Register the threading system calls. */
+        SysRegisterRange(SYS_SCHED_BASE, schedSysCallTable);
+
+        return 0;
+}
+
+CoreInit(ThrInit);