Changeset 348006f for src/libcfa/concurrency/kernel.c

Timestamp:

Mar 15, 2017, 4:20:26 PM (7 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:

29f44a74

Parents:

84c52a8

Message:

Renamed thread to thread_desc

File:

• src/libcfa/concurrency/kernel.c (modified) (13 diffs)

src/libcfa/concurrency/kernel.c

@@ -43 +43 @@
 KERNEL_STORAGE(cluster, systemCluster);
 KERNEL_STORAGE(processor, systemProcessor);
-KERNEL_STORAGE(thread, mainThread);
+KERNEL_STORAGE(thread_desc, mainThread);
 KERNEL_STORAGE(machine_context_t, mainThread_context);
 
 cluster * systemCluster;
 processor * systemProcessor;
-thread * mainThread;
+thread_desc * mainThread;
 
 //-----------------------------------------------------------------------------
@@ -59 +59 @@
 }
 
-thread * this_thread(void) {
+thread_desc * this_thread(void) {
         return this_processor->current_thread;
 }
@@ -106 +106 @@
 }
 
-void ?{}( thread * this, current_stack_info_t * info) {
+void ?{}( thread_desc * this, current_stack_info_t * info) {
         (&this->c){ info };
 }
@@ -175 +175 @@
         LIB_DEBUG_PRINTF("Kernel : core %p starting\n", this);
 
-        thread * readyThread = NULL;
+        thread_desc * readyThread = NULL;
         for( unsigned int spin_count = 0; ! this->is_terminated; spin_count++ ) 
         {
@@ -202 +202 @@
 // runThread runs a thread by context switching 
 // from the processor coroutine to the target thread 
-void runThread(processor * this, thread * dst) {
+void runThread(processor * this, thread_desc * dst) {
         coroutine_desc * proc_cor = get_coroutine(this->runner);
         coroutine_desc * thrd_cor = get_coroutine(dst);
@@ -293 +293 @@
 //-----------------------------------------------------------------------------
 // Scheduler routines
-void ScheduleThread( thread * thrd ) {
+void ScheduleThread( thread_desc * thrd ) {
         assertf( thrd->next == NULL, "Expected null got %p", thrd->next );
         
@@ -301 +301 @@
 }
 
-thread * nextThread(cluster * this) {
+thread_desc * nextThread(cluster * this) {
         lock( &this->lock );
-        thread * head = pop_head( &this->ready_queue );
+        thread_desc * head = pop_head( &this->ready_queue );
         unlock( &this->lock );
         return head;
@@ -318 +318 @@
 }
 
-void ScheduleInternal( thread * thrd ) {
+void ScheduleInternal( thread_desc * thrd ) {
         this_processor->finish.action_code = Schedule;
         this_processor->finish.thrd = thrd;
@@ -324 +324 @@
 }
 
-void ScheduleInternal( spinlock * lock, thread * thrd ) {
+void ScheduleInternal( spinlock * lock, thread_desc * thrd ) {
         this_processor->finish.action_code = Release_Schedule;
         this_processor->finish.lock = lock;
@@ -339 +339 @@
         // SKULLDUGGERY: the mainThread steals the process main thread 
         // which will then be scheduled by the systemProcessor normally
-        mainThread = (thread *)&mainThread_storage;
+        mainThread = (thread_desc *)&mainThread_storage;
         current_stack_info_t info;
         mainThread{ &info };
@@ -436 +436 @@
                 this->condition = true;
 
-                thread * it;
+                thread_desc * it;
                 while( it = pop_head( &this->blocked) ) {
                         ScheduleThread( it );
@@ -451 +451 @@
 }
 
-void append( simple_thread_list * this, thread * t ) {
+void append( simple_thread_list * this, thread_desc * t ) {
         assert(this->tail != NULL);
         *this->tail = t;
@@ -457 +457 @@
 }
 
-thread * pop_head( simple_thread_list * this ) {
-        thread * head = this->head;
+thread_desc * pop_head( simple_thread_list * this ) {
+        thread_desc * head = this->head;
         if( head ) {
                 this->head = head->next;