Changeset b1a4300 for src

Timestamp:

May 17, 2018, 3:25:12 PM (6 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, with_gc

Children:

a83ffa4

Parents:

e9a7e90b

Message:

Added assert for set_timer for duration < 1us && != 0.
Preemption now always calls timer with at least 50us durations.
Fixed verifies in nodebug.

Location:

src/libcfa

Files:

• concurrency/alarm.c (modified) (3 diffs)
• concurrency/preemption.c (modified) (5 diffs)
• time (modified) (3 diffs)

src/libcfa/concurrency/alarm.c

@@ -37 +37 @@
 
 void __kernel_set_timer( Duration alarm ) {
+        verifyf(alarm >= 1`us || alarm == 0, "Setting timer to < 1us (%luns)", alarm.tv);
         setitimer( ITIMER_REAL, &(itimerval){ alarm }, NULL );
 }
@@ -68 +69 @@
 }
 
-__cfaabi_dbg_debug_do( bool validate( alarm_list_t * this ) {
+#if !defined(NDEBUG) && (defined(__CFA_DEBUG__) || defined(__CFA_VERIFY__))
+bool validate( alarm_list_t * this ) {
         alarm_node_t ** it = &this->head;
         while( (*it) ) {
@@ -75 +77 @@
 
         return it == this->tail;
-})
+}
+#endif
 
 static inline void insert_at( alarm_list_t * this, alarm_node_t * n, __alarm_it_t p ) {

src/libcfa/concurrency/preemption.c

@@ -91 +91 @@
         //Loop throught every thing expired
         while( node = get_expired( alarms, currtime ) ) {
+                // __cfaabi_dbg_print_buffer_decl( " KERNEL: preemption tick.\n" );
 
                 // Check if this is a kernel
@@ -103 +104 @@
                 Duration period = node->period;
                 if( period > 0 ) {
+                        // __cfaabi_dbg_print_buffer_local( " KERNEL: alarm period is %lu.\n", period.tv );
                         node->alarm = currtime + period;    // Alarm is periodic, add currtime to it (used cached current time)
                         insert( alarms, node );             // Reinsert the node for the next time it triggers
@@ -112 +114 @@
 
         // If there are still alarms pending, reset the timer
-        if( alarms->head ) { __kernel_set_timer( alarms->head->alarm - currtime ); }
+        if( alarms->head ) {
+                __cfaabi_dbg_print_buffer_decl( " KERNEL: @%lu(%lu) resetting alarm to %lu.\n", currtime.tv, __kernel_get_time().tv, (alarms->head->alarm - currtime).tv);
+                Duration delta = alarms->head->alarm - currtime;
+                Duration caped = max(delta, 50`us);
+                // itimerval tim  = { caped };
+                // __cfaabi_dbg_print_buffer_local( "    Values are %lu, %lu, %lu %lu.\n", delta.tv, caped.tv, tim.it_value.tv_sec, tim.it_value.tv_usec);
+
+                __kernel_set_timer( caped );
+        }
 }
 
@@ -335 +345 @@
         if( !preemption_ready() ) { return; }
 
-        __cfaabi_dbg_print_buffer_decl( " KERNEL: preempting core %p (%p).\n", kernelTLS.this_processor, kernelTLS.this_thread );
+        __cfaabi_dbg_print_buffer_decl( " KERNEL: preempting core %p (%p @ %p).\n", kernelTLS.this_processor, kernelTLS.this_thread, (void *)(cxt->uc_mcontext.CFA_REG_IP) );
 
         // Sync flag : prevent recursive calls to the signal handler
@@ -377 +387 @@
                                 case EAGAIN :
                                 case EINTR :
+                                        {__cfaabi_dbg_print_buffer_decl( " KERNEL: Spurious wakeup %d.\n", err );}
                                         continue;
                         case EINVAL :

src/libcfa/time

@@ -1 @@
-// 
+//
 // Cforall Version 1.0.0 Copyright (C) 2018 University of Waterloo
 //
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// time -- 
-// 
+//
+// time --
+//
 // Author           : Peter A. Buhr
 // Created On       : Wed Mar 14 23:18:57 2018
@@ -12 +12 @@
 // Last Modified On : Sat Apr 14 17:48:23 2018
 // Update Count     : 636
-// 
+//
 
 #pragma once
@@ -91 +91 @@
 static inline int64_t ?`w( Duration dur ) { return dur.tv / (7LL * 24LL * 60LL * 60LL * TIMEGRAN); }
 
+static inline Duration max( Duration lhs, Duration rhs ) { return  (lhs.tv < rhs.tv) ? rhs : lhs;}
+static inline Duration min( Duration lhs, Duration rhs ) { return !(rhs.tv < lhs.tv) ? lhs : rhs;}
+
 
 //######################### C timeval #########################