Changes in src/libcfa/concurrency/kernel.c [0c78741:5ea06d6]

File:

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

src/libcfa/concurrency/kernel.c

@@ -235 +235 @@
                 ScheduleThread( this->finish.thrd );
         }
-        else if( this->finish.action_code == Release_Multi ) {
-                for(int i = 0; i < this->finish.lock_count; i++) {
-                        unlock( this->finish.locks[i] );
-                }
-        }
-        else if( this->finish.action_code == Release_Multi_Schedule ) {
-                for(int i = 0; i < this->finish.lock_count; i++) {
-                        unlock( this->finish.locks[i] );
-                }
-                for(int i = 0; i < this->finish.thrd_count; i++) {
-                        ScheduleThread( this->finish.thrds[i] );
-                }
-        }
         else {
                 assert(this->finish.action_code == No_Action);
@@ -348 +335 @@
         this_processor->finish.lock = lock;
         this_processor->finish.thrd = thrd;
-        suspend();
-}
-
-void ScheduleInternal(spinlock ** locks, unsigned short count) {
-        this_processor->finish.action_code = Release_Multi;
-        this_processor->finish.locks = locks;
-        this_processor->finish.lock_count = count;
-        suspend();
-}
-
-void ScheduleInternal(spinlock ** locks, unsigned short lock_count, thread_desc ** thrds, unsigned short thrd_count) {
-        this_processor->finish.action_code = Release_Multi_Schedule;
-        this_processor->finish.locks = locks;
-        this_processor->finish.lock_count = lock_count;
-        this_processor->finish.thrds = thrds;
-        this_processor->finish.thrd_count = thrd_count;
         suspend();
 }
@@ -558 +529 @@
 }
 
-void ?{}( __condition_stack_t * this ) {
+void ?{}( __thread_stack_t * this ) {
         this->top = NULL;
 }
 
-void push( __condition_stack_t * this, __condition_criterion_t * t ) {
-        assert( !t->next );
+void push( __thread_stack_t * this, thread_desc * t ) {
+        assert(t->next != NULL);
         t->next = this->top;
         this->top = t;
 }
 
-__condition_criterion_t * pop( __condition_stack_t * this ) {
-        __condition_criterion_t * top = this->top;
+thread_desc * pop( __thread_stack_t * this ) {
+        thread_desc * top = this->top;
         if( top ) {
                 this->top = top->next;