Changeset c81ebf9 for src/libcfa/concurrency/alarm.c

Timestamp:

Jun 6, 2017, 11:45:13 AM (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:

c5ac6d5

Parents:

7b13aeb

Message:

More work done on preemption in cforall, next step disabling interrupts at the correct places

File:

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

src/libcfa/concurrency/alarm.c

@@ -15 +15 @@
 //
 
+extern "C" {
+#include <time.h>
+#include <sys/time.h>
+}
+
 #include "alarm.h"
 #include "kernel_private.h"
+#include "preemption.h"
 
-static void register_self( alarm_node_t * this ) {
-        lock( &systemProcessor->alarm_lock );
-        insert( &systemProcessor->alarms, this );
-        unlock( &systemProcessor->alarm_lock );
+//=============================================================================================
+// Clock logic
+//=============================================================================================
+
+__cfa_time_t __kernel_get_time() {
+        timespec curr;
+        clock_gettime( CLOCK_REALTIME, &curr );
+        return ((__cfa_time_t)curr.tv_sec * TIMEGRAN) + curr.tv_nsec;
 }
 
-void ?{}( alarm_node_t * this, thread_desc * thrd, cfa_time_t alarm, cfa_time_t period = 0 ) {
+void __kernel_set_timer( __cfa_time_t alarm ) {
+        itimerval val;
+        val.it_value.tv_sec = alarm / TIMEGRAN;                 // seconds
+        val.it_value.tv_usec = (alarm % TIMEGRAN) / ( TIMEGRAN / 1_000_000L ); // microseconds
+        val.it_interval.tv_sec = 0;
+        val.it_interval.tv_usec = 0;
+        setitimer( ITIMER_REAL, &val, NULL );
+}
+
+//=============================================================================================
+// Alarm logic
+//=============================================================================================
+
+void ?{}( alarm_node_t * this, thread_desc * thrd, __cfa_time_t alarm = 0, __cfa_time_t period = 0 ) {
         this->thrd = thrd;
         this->alarm = alarm;
         this->period = period;
         this->next = 0;
-
-        register_self( this );
+        this->set = false;
+        this->kernel_alarm = false;
 }
 
-void ?{}( alarm_node_t * this, processor   * proc, cfa_time_t alarm, cfa_time_t period = 0 ) {
+void ?{}( alarm_node_t * this, processor   * proc, __cfa_time_t alarm = 0, __cfa_time_t period = 0 ) {
         this->proc = proc;
         this->alarm = alarm;
         this->period = period;
         this->next = 0;
+        this->set = false;
+        this->kernel_alarm = true;
+}
 
-        register_self( this );
+void ^?{}( alarm_node_t * this ) {
+        if( this->set ) {
+                unregister_self( this );
+        }
 }
 
@@ -62 +91 @@
 }
 
-void pop( alarm_list_t * this ) {
+alarm_node_t * pop( alarm_list_t * this ) {
         alarm_node_t * head = this->head;
         if( head ) {
@@ -73 +102 @@
         return head;
 }
+
+static inline void remove_at( alarm_list_t * this, alarm_node_t * n, __alarm_it_t it ) {
+        assert( it );
+        assert( (*it)->next == n );
+
+        (*it)->next = n->next;
+        if( !n-> next ) {
+                this->tail = it;
+        }
+        n->next = NULL;
+}
+
+static inline void remove( alarm_list_t * this, alarm_node_t * n ) {
+        alarm_node_t ** it = &this->head;
+        while( (*it) && (*it)->next != n ) {
+                it = &(*it)->next;
+        }
+
+        if( *it ) { remove_at( this, n, it ); }
+}
+
+void register_self( alarm_node_t * this ) {
+        disable_interrupts();
+        assert( !systemProcessor->pending_alarm );
+        lock( &systemProcessor->alarm_lock );
+        {
+                insert( &systemProcessor->alarms, this );
+                if( systemProcessor->pending_alarm ) {
+                        tick_preemption();
+                }
+        }
+        unlock( &systemProcessor->alarm_lock );
+        this->set = true;
+        enable_interrupts();
+}
+
+void unregister_self( alarm_node_t * this ) {
+        disable_interrupts();
+        lock( &systemProcessor->alarm_lock );
+        remove( &systemProcessor->alarms, this );
+        unlock( &systemProcessor->alarm_lock );
+        disable_interrupts();
+        this->set = false;
+}