Changeset 02a43ff for libcfa/src/concurrency

Timestamp:

May 17, 2021, 9:29:43 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

c2794b2

Parents:

6312b1c (diff), 1eb222ff (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

libcfa/src/concurrency

Files:

• alarm.cfa (modified) (3 diffs)
• locks.cfa (modified) (3 diffs)

libcfa/src/concurrency/alarm.cfa

@@ -55 +55 @@
         this.period  = period;
         this.thrd = thrd;
+        this.timeval = __kernel_get_time() + alarm;
         set = false;
         type = User;
@@ -63 +64 @@
         this.period  = period;
         this.proc = proc;
+        this.timeval = __kernel_get_time() + alarm;
         set = false;
         type = Kernel;
 }
 void ?{}( alarm_node_t & this, Alarm_Callback callback, Duration alarm, Duration period ) with( this ) {
+        this.callback = callback;
         this.initial = alarm;
         this.period  = period;
-        this.callback = callback;
+        this.timeval = __kernel_get_time() + alarm;
         set = false;
         type = Callback;
@@ -110 +113 @@
         lock( event_kernel->lock __cfaabi_dbg_ctx2 );
         {
-                Time curr = __kernel_get_time();
-                this->timeval = curr + this->initial;
-
                 /* paranoid */ verify( validate( alarms ) );
 
+                Time curr = __kernel_get_time();
                 __cfadbg_print_safe( preemption, " KERNEL: alarm inserting %p (%lu -> %lu).\n", this, curr.tn, this->timeval.tn );
                 insert( &alarms, this );
-                __kernel_set_timer( this->initial );
+                __kernel_set_timer( this->timeval - curr);
                 this->set = true;
         }

libcfa/src/concurrency/locks.cfa

@@ -188 +188 @@
                 alarm_node_t alarm_node;
                 condition_variable(L) * cond;
-                info_thread(L) * i;
+                info_thread(L) * info_thd;
         };
 
@@ -194 +194 @@
                 this.alarm_node{ callback, alarm, period };
                 this.cond = c;
-                this.i = i;
+                this.info_thd = i;
         }
 
@@ -206 +206 @@
                 //      may still be called after a thread has been removed from the queue but
                 //      before the alarm is unregistered
-                if ( listed(i) ) {      // is thread on queue
-                        i->signalled = false;
+                if ( listed(info_thd) ) {       // is thread on queue
+                        info_thd->signalled = false;
                         // remove this thread O(1)
-                        remove( cond->blocked_threads, *i );
+                        remove( cond->blocked_threads, *info_thd );
                         cond->count--;
-                        if( i->lock ) {
+                        if( info_thd->lock ) {
                                 // call lock's on_notify if a lock was passed
-                                on_notify(*i->lock, i->t);
+                                on_notify(*info_thd->lock, info_thd->t);
                         } else {
                                 // otherwise wake thread
-                                unpark( i->t );
+                                unpark( info_thd->t );
                         }
                 }