Changeset 3d5701e for libcfa/src/concurrency/alarm.cfa

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• libcfa/src/concurrency/alarm.cfa (modified) (5 diffs)

libcfa/src/concurrency/alarm.cfa

@@ -10 +10 @@
 // Created On       : Fri Jun 2 11:31:25 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri May 25 06:25:47 2018
-// Update Count     : 67
+// Last Modified On : Sun Jan  5 08:41:36 2020
+// Update Count     : 69
 //
 
@@ -39 +39 @@
 
 void __kernel_set_timer( Duration alarm ) {
-        verifyf(alarm >= 1`us || alarm == 0, "Setting timer to < 1us (%jins)", alarm.tv);
-        setitimer( ITIMER_REAL, &(itimerval){ alarm }, NULL );
+        verifyf(alarm >= 1`us || alarm == 0, "Setting timer to < 1us (%jins)", alarm`ns);
+        setitimer( ITIMER_REAL, &(itimerval){ alarm }, 0p );
 }
 
@@ -47 +47 @@
 //=============================================================================================
 
-void ?{}( alarm_node_t & this, thread_desc * thrd, Time alarm, Duration period ) with( this ) {
+void ?{}( alarm_node_t & this, $thread * thrd, Time alarm, Duration period ) with( this ) {
         this.thrd = thrd;
         this.alarm = alarm;
@@ -113 +113 @@
                         this->tail = &this->head;
                 }
-                head->next = NULL;
+                head->next = 0p;
         }
         verify( validate( this ) );
@@ -127 +127 @@
                 this->tail = it;
         }
-        n->next = NULL;
+        n->next = 0p;
 
         verify( validate( this ) );