Changeset fa21ac9

Timestamp:

Jun 5, 2017, 11:42:05 AM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

b3c36f4

Parents:

2f9a722

Message:

Added alarm list to the system processor in the kernel

Location:

src/libcfa/concurrency

Files:

• kernel (modified) (1 diff)
• kernel.c (modified) (16 diffs)
• kernel_private.h (modified) (3 diffs)

src/libcfa/concurrency/kernel

@@ -94 +94 @@
 
 // Local Variables: //
-// mode: c //
-// tab-width: 4 //
+// mode: CFA //
+// tab-width: 6 //
 // End: //

src/libcfa/concurrency/kernel.c

@@ -47 +47 @@
 KERNEL_STORAGE(processorCtx_t, systemProcessorCtx);
 KERNEL_STORAGE(cluster, systemCluster);
-KERNEL_STORAGE(processor, systemProcessor);
+KERNEL_STORAGE(system_proc_t, systemProcessor);
 KERNEL_STORAGE(thread_desc, mainThread);
 KERNEL_STORAGE(machine_context_t, mainThread_context);
 
 cluster * systemCluster;
-processor * systemProcessor;
+system_proc_t * systemProcessor;
 thread_desc * mainThread;
 
@@ -81 +81 @@
 
 void ?{}( current_stack_info_t * this ) {
+        LIB_DEBUG_PRINT_SAFE("Kernel : Ctor 1\n");
         CtxGet( &this->ctx );
         this->base = this->ctx.FP;
@@ -95 +96 @@
 
 void ?{}( coStack_t * this, current_stack_info_t * info) {
+        LIB_DEBUG_PRINT_SAFE("Kernel : Ctor 2\n");
         this->size = info->size;
         this->storage = info->storage;
@@ -105 +107 @@
 
 void ?{}( coroutine_desc * this, current_stack_info_t * info) {
+        LIB_DEBUG_PRINT_SAFE("Kernel : Ctor 3\n");
         (&this->stack){ info }; 
         this->name = "Main Thread";
@@ -112 +115 @@
 
 void ?{}( thread_desc * this, current_stack_info_t * info) {
+        LIB_DEBUG_PRINT_SAFE("Kernel : Ctor 4\n");
         (&this->cor){ info };
 }
@@ -118 +122 @@
 // Processor coroutine
 void ?{}(processorCtx_t * this, processor * proc) {
-        (&this->__cor){};
+        LIB_DEBUG_PRINT_SAFE("Kernel : Ctor 5\n");
+        (&this->__cor){ "Processor" };
         this->proc = proc;
         proc->runner = this;
@@ -124 +129 @@
 
 void ?{}(processorCtx_t * this, processor * proc, current_stack_info_t * info) {
+        LIB_DEBUG_PRINT_SAFE("Kernel : Ctor 6\n");
         (&this->__cor){ info };
         this->proc = proc;
@@ -130 +136 @@
 
 void ?{}(processor * this) {
+        LIB_DEBUG_PRINT_SAFE("Kernel : Ctor 7\n");
         this{ systemCluster };
 }
 
 void ?{}(processor * this, cluster * cltr) {
+        LIB_DEBUG_PRINT_SAFE("Kernel : Ctor 8\n");
         this->cltr = cltr;
         this->current_coroutine = NULL;
@@ -153 +161 @@
         LIB_DEBUG_PRINT_SAFE("Kernel : constructing processor context %p\n", runner);
         runner{ this };
+}
+
+void ?{}(system_proc_t * this, cluster * cltr, processorCtx_t * runner) {
+        LIB_DEBUG_PRINT_SAFE("Kernel : Ctor 9\n");
+        (&this->alarms){};
+        (&this->alarm_lock){};
+
+        (&this->proc){ cltr, runner };
 }
 
@@ -316 +332 @@
         assertf( thrd->next == NULL, "Expected null got %p", thrd->next );
         
-        lock( &systemProcessor->cltr->lock );
-        append( &systemProcessor->cltr->ready_queue, thrd );
-        unlock( &systemProcessor->cltr->lock );
+        lock( &systemProcessor->proc.cltr->lock );
+        append( &systemProcessor->proc.cltr->ready_queue, thrd );
+        unlock( &systemProcessor->proc.cltr->lock );
 }
 
@@ -367 +383 @@
 }
 
+//=============================================================================================
+// Kernel Preemption logic
+//=============================================================================================
+
+#define __CFA_DEFAULT_PREEMPTION__ 10
+
+unsigned int default_preemption() {
+        return __CFA_DEFAULT_PREEMPTION__;
+}
+
+void kernel_start_preemption() {
+
+}
+
+//=============================================================================================
+// Kernel Setup logic
+//=============================================================================================
 //-----------------------------------------------------------------------------
 // Kernel boot procedures
@@ -379 +412 @@
         mainThread{ &info };
 
+        LIB_DEBUG_PRINT_SAFE("Kernel : Main thread ready\n");
+
+        // Enable preemption
+        kernel_start_preemption();
+
         // Initialize the system cluster
         systemCluster = (cluster *)&systemCluster_storage;
         systemCluster{};
 
+        LIB_DEBUG_PRINT_SAFE("Kernel : System cluster ready\n");
+
         // Initialize the system processor and the system processor ctx
         // (the coroutine that contains the processing control flow)
-        systemProcessor = (processor *)&systemProcessor_storage;
+        systemProcessor = (system_proc_t *)&systemProcessor_storage;
         systemProcessor{ systemCluster, (processorCtx_t *)&systemProcessorCtx_storage };
 
         // Add the main thread to the ready queue 
-        // once resume is called on systemProcessor->ctx the mainThread needs to be scheduled like any normal thread
+        // once resume is called on systemProcessor->runner the mainThread needs to be scheduled like any normal thread
         ScheduleThread(mainThread);
 
         //initialize the global state variables
-        this_processor = systemProcessor;
+        this_processor = &systemProcessor->proc;
         this_processor->current_thread = mainThread;
         this_processor->current_coroutine = &mainThread->cor;
@@ -400 +440 @@
         // context. Hence, the main thread does not begin through CtxInvokeThread, like all other threads. The trick here is that
         // mainThread is on the ready queue when this call is made. 
-        resume(systemProcessor->runner);
+        resume( systemProcessor->proc.runner );
 
 
@@ -414 +454 @@
         // When its coroutine terminates, it return control to the mainThread
         // which is currently here
-        systemProcessor->is_terminated = true;
+        systemProcessor->proc.is_terminated = true;
         suspend();
 
@@ -421 +461 @@
         // Destroy the system processor and its context in reverse order of construction
         // These were manually constructed so we need manually destroy them
-        ^(systemProcessor->runner){};
+        ^(systemProcessor->proc.runner){};
         ^(systemProcessor){};
 
@@ -484 +524 @@
 }
 
+//=============================================================================================
+// Kernel Utilities
+//=============================================================================================
 //-----------------------------------------------------------------------------
 // Locks

src/libcfa/concurrency/kernel_private.h

@@ -21 +21 @@
 #include "thread"
 
+#include "alarm.h"
+
 //-----------------------------------------------------------------------------
 // Scheduler
@@ -35 +37 @@
 //-----------------------------------------------------------------------------
 // Processor
-struct processorCtx_t {
+coroutine processorCtx_t {
         processor * proc;
-        coroutine_desc __cor;
 };
-
-DECL_COROUTINE(processorCtx_t);
 
 void main(processorCtx_t *);
@@ -47 +46 @@
 void finishRunning(processor * this);
 void spin(processor * this, unsigned int * spin_count);
+
+struct system_proc_t {
+        processor proc;
+
+        alarm_list_t alarms;
+        spinlock alarm_lock;
+};
+
+extern cluster * systemCluster;
+extern system_proc_t * systemProcessor;
 
 //-----------------------------------------------------------------------------