Changeset 2a84d06d for src/libcfa/concurrency/preemption.c

Timestamp:

Mar 27, 2018, 5:22:58 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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, with_gc

Children:

43725bd

Parents:

af1ed1ad

Message:

second draft of time package and incorporation into runtime kernel

File:

• src/libcfa/concurrency/preemption.c (modified) (8 diffs)

src/libcfa/concurrency/preemption.c

@@ -10 +10 @@
 // Created On       : Mon Jun 5 14:20:42 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Feb  9 16:38:13 2018
-// Update Count     : 14
+// Last Modified On : Tue Mar 27 11:28:51 2018
+// Update Count     : 24
 //
 
@@ -27 +27 @@
 
 #if !defined(__CFA_DEFAULT_PREEMPTION__)
-#define __CFA_DEFAULT_PREEMPTION__ 10`cfa_ms
+#define __CFA_DEFAULT_PREEMPTION__ 10`ms
 #endif
 
-__cfa_time_t default_preemption() __attribute__((weak)) {
+Duration default_preemption() __attribute__((weak)) {
         return __CFA_DEFAULT_PREEMPTION__;
 }
@@ -78 +78 @@
 
 // Get next expired node
-static inline alarm_node_t * get_expired( alarm_list_t * alarms, __cfa_time_t currtime ) {
+static inline alarm_node_t * get_expired( alarm_list_t * alarms, Time currtime ) {
         if( !alarms->head ) return NULL;                          // If no alarms return null
         if( alarms->head->alarm >= currtime ) return NULL;        // If alarms head not expired return null
@@ -88 +88 @@
         alarm_node_t * node = NULL;                     // Used in the while loop but cannot be declared in the while condition
         alarm_list_t * alarms = &event_kernel->alarms;  // Local copy for ease of reading
-        __cfa_time_t currtime = __kernel_get_time();    // Check current time once so we everything "happens at once"
+        Time currtime = __kernel_get_time();                    // Check current time once so we everything "happens at once"
 
         //Loop throught every thing expired
@@ -102 +102 @@
 
                 // Check if this is a periodic alarm
-                __cfa_time_t period = node->period;
+                Duration period = node->period;
                 if( period > 0 ) {
                         node->alarm = currtime + period;    // Alarm is periodic, add currtime to it (used cached current time)
@@ -117 +117 @@
 
 // Update the preemption of a processor and notify interested parties
-void update_preemption( processor * this, __cfa_time_t duration ) {
+void update_preemption( processor * this, Duration duration ) {
         alarm_node_t * alarm = this->preemption_alarm;
 
         // Alarms need to be enabled
-        if ( duration > 0 && !alarm->set ) {
+        if ( duration > 0 && ! alarm->set ) {
                 alarm->alarm = __kernel_get_time() + duration;
                 alarm->period = duration;
@@ -291 +291 @@
 // Used by thread to control when they want to receive preemption signals
 void ?{}( preemption_scope & this, processor * proc ) {
-        (this.alarm){ proc, 0`cfa_s, 0`cfa_s };
+        (this.alarm){ proc, (Time){ 0 }, 0`s };
         this.proc = proc;
         this.proc->preemption_alarm = &this.alarm;
@@ -301 +301 @@
         disable_interrupts();
 
-        update_preemption( this.proc, 0`cfa_s );
+        update_preemption( this.proc, 0`s );
 }