Changeset f2b12406

Timestamp:

Jul 12, 2017, 10:14:11 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:

f73f5f4

Parents:

0322865c

Message:

Preemption is now stable enough to push, some clean-up needed

Location:

src/libcfa/concurrency

Files:

• invoke.c (modified) (1 diff)
• kernel.c (modified) (7 diffs)
• kernel_private.h (modified) (1 diff)
• monitor.c (modified) (1 diff)
• preemption.c (modified) (2 diffs)

src/libcfa/concurrency/invoke.c

@@ -80 +80 @@
       // 2 - Leave its monitor
       // 3 - Disable the interupts
-      // The order of these 3 operations is very important
+      // 4 - Final suspend
+      // The order of these 4 operations is very important
+      //Final suspend, should never return
       __leave_thread_monitor( thrd );
-
-      //Final suspend, should never return
-      __suspend_internal();
       abortf("Resumed dead thread");
 }

src/libcfa/concurrency/kernel.c

@@ -42 +42 @@
 //-----------------------------------------------------------------------------
 // Kernel storage
-#define KERNEL_STORAGE(T,X) static char X##_storage[sizeof(T)]
+#define KERNEL_STORAGE(T,X) static char X##Storage[sizeof(T)]
 
 KERNEL_STORAGE(processorCtx_t, systemProcessorCtx);
@@ -48 +48 @@
 KERNEL_STORAGE(system_proc_t, systemProcessor);
 KERNEL_STORAGE(thread_desc, mainThread);
-KERNEL_STORAGE(machine_context_t, mainThread_context);
+KERNEL_STORAGE(machine_context_t, mainThreadCtx);
 
 cluster * systemCluster;
@@ -84 +84 @@
 
         this->limit = (void *)(((intptr_t)this->base) - this->size);
-        this->context = &mainThread_context_storage;
+        this->context = &mainThreadCtxStorage;
         this->top = this->base;
 }
@@ -432 +432 @@
 }
 
+void LeaveThread(spinlock * lock, thread_desc * thrd) {
+        verify( disable_preempt_count > 0 );
+        this_processor->finish.action_code = thrd ? Release_Schedule : Release;
+        this_processor->finish.lock = lock;
+        this_processor->finish.thrd = thrd;
+
+        suspend();
+}
+
 //=============================================================================================
 // Kernel Setup logic
@@ -443 +452 @@
         // SKULLDUGGERY: the mainThread steals the process main thread
         // which will then be scheduled by the systemProcessor normally
-        mainThread = (thread_desc *)&mainThread_storage;
+        mainThread = (thread_desc *)&mainThreadStorage;
         current_stack_info_t info;
         mainThread{ &info };
@@ -450 +459 @@
 
         // Initialize the system cluster
-        systemCluster = (cluster *)&systemCluster_storage;
+        systemCluster = (cluster *)&systemClusterStorage;
         systemCluster{};
 
@@ -457 +466 @@
         // Initialize the system processor and the system processor ctx
         // (the coroutine that contains the processing control flow)
-        systemProcessor = (system_proc_t *)&systemProcessor_storage;
-        systemProcessor{ systemCluster, (processorCtx_t *)&systemProcessorCtx_storage };
+        systemProcessor = (system_proc_t *)&systemProcessorStorage;
+        systemProcessor{ systemCluster, (processorCtx_t *)&systemProcessorCtxStorage };
 
         // Add the main thread to the ready queue

src/libcfa/concurrency/kernel_private.h

@@ -51 +51 @@
 void BlockInternal(spinlock ** locks, unsigned short count);
 void BlockInternal(spinlock ** locks, unsigned short count, thread_desc ** thrds, unsigned short thrd_count);
+void LeaveThread(spinlock * lock, thread_desc * thrd);
 
 //-----------------------------------------------------------------------------

src/libcfa/concurrency/monitor.c

@@ -124 +124 @@
                 thread_desc * new_owner = next_thread( this );
 
-                //We can now let other threads in safely
-                unlock( &this->lock );
-
-                //We need to wake-up the thread
-                if( new_owner) ScheduleThread( new_owner );
+                LeaveThread( &this->lock, new_owner );
         }
 }

src/libcfa/concurrency/preemption.c

@@ -209 +209 @@
         LIB_DEBUG_PRINT_SAFE("Kernel : Starting preemption\n");
         __kernel_sigaction( SIGUSR1, sigHandler_ctxSwitch, SA_SIGINFO );
-        __kernel_sigaction( SIGSEGV, sigHandler_segv     , SA_SIGINFO );
-        __kernel_sigaction( SIGBUS , sigHandler_segv     , SA_SIGINFO );
+        // __kernel_sigaction( SIGSEGV, sigHandler_segv     , SA_SIGINFO );
+        // __kernel_sigaction( SIGBUS , sigHandler_segv     , SA_SIGINFO );
 
         signal_block( SIGALRM );
@@ -417 +417 @@
 )
 
-void sigHandler_segv( __CFA_SIGPARMS__ ) {
-        LIB_DEBUG_DO(
-                #ifdef __USE_STREAM__
-                serr    | "*CFA runtime error* program cfa-cpp terminated with"
-                        | (sig == SIGSEGV ? "segment fault." : "bus error.")
-                        | endl;
-                #else
-                fprintf( stderr, "*CFA runtime error* program cfa-cpp terminated with %s\n", sig == SIGSEGV ? "segment fault." : "bus error." );
-                #endif
-
-                // skip first 2 stack frames
-                __kernel_backtrace( 1 );
-        )
-        exit( EXIT_FAILURE );
-}
+// void sigHandler_segv( __CFA_SIGPARMS__ ) {
+//      LIB_DEBUG_DO(
+//              #ifdef __USE_STREAM__
+//              serr    | "*CFA runtime error* program cfa-cpp terminated with"
+//                      | (sig == SIGSEGV ? "segment fault." : "bus error.")
+//                      | endl;
+//              #else
+//              fprintf( stderr, "*CFA runtime error* program cfa-cpp terminated with %s\n", sig == SIGSEGV ? "segment fault." : "bus error." );
+//              #endif
+
+//              // skip first 2 stack frames
+//              __kernel_backtrace( 1 );
+//      )
+//      exit( EXIT_FAILURE );
+// }
 
 // void sigHandler_abort( __CFA_SIGPARMS__ ) {