Changes in / [24fc196:4b234f0]

Files:

• configure (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/benchmark/create_pthrd.c (modified) (1 diff)
• src/libcfa/concurrency/alarm.c (modified) (1 diff)
• src/libcfa/concurrency/alarm.h (modified) (1 diff)
• src/libcfa/concurrency/preemption.c (modified) (4 diffs)
• src/tests/preempt_longrun/Makefile.am (modified) (1 diff)
• src/tests/preempt_longrun/Makefile.in (modified) (3 diffs)
• src/tests/sched-int-barge.c (modified) (2 diffs)

configure

@@ -3471 +3471 @@
         case $host_cpu in
                 i386)
-                        CFLAGS+="-m32"
-                        CXXFLAGS+="-m32"
-                        CFAFLAGS+="-m32"
-                        LDFLAGS+="-m32"
+                        CFLAGS+=" -m32 "
+                        CXXFLAGS+=" -m32 "
+                        CFAFLAGS+=" -m32 "
+                        LDFLAGS+=" -m32 "
                         ;;
                 i686)
-                        CFLAGS+="-m32"
-                        CXXFLAGS+="-m32"
-                        CFAFLAGS+="-m32"
-                        LDFLAGS+="-m32"
+                        CFLAGS+=" -m32 "
+                  CXXFLAGS+=" -m32 "
+                  CFAFLAGS+=" -m32 "
+                  LDFLAGS+=" -m32 "
                         ;;
                 x86_64)
-                        CFLAGS+="-m64"
-                        CXXFLAGS+="-m64"
-                        CFAFLAGS+="-m64"
-                        LDFLAGS+="-m64"
+                        CFLAGS+=" -m64 "
+                        CXXFLAGS+=" -m64 "
+                        CFAFLAGS+=" -m64 "
+                        LDFLAGS+=" -m64 "
                         ;;
         esac

configure.ac

@@ -167 +167 @@
 AC_SUBST([MACHINE_TYPE],[$host_cpu])
 
-if ! test "$host_cpu" = "$build_cpu"; then 
+if ! test "$host_cpu" = "$build_cpu"; then
         case $host_cpu in
                 i386)
-                        CFLAGS+="-m32"
-                        CXXFLAGS+="-m32"
-                        CFAFLAGS+="-m32"
-                        LDFLAGS+="-m32"
+                        CFLAGS+=" -m32 "
+                        CXXFLAGS+=" -m32 "
+                        CFAFLAGS+=" -m32 "
+                        LDFLAGS+=" -m32 "
                         ;;
                 i686)
-                        CFLAGS+="-m32"
-                        CXXFLAGS+="-m32"
-                        CFAFLAGS+="-m32"
-                        LDFLAGS+="-m32"
+                        CFLAGS+=" -m32 "
+                  CXXFLAGS+=" -m32 "
+                  CFAFLAGS+=" -m32 "
+                  LDFLAGS+=" -m32 "
                         ;;
                 x86_64)
-                        CFLAGS+="-m64"
-                        CXXFLAGS+="-m64"
-                        CFAFLAGS+="-m64"
-                        LDFLAGS+="-m64"
+                        CFLAGS+=" -m64 "
+                        CXXFLAGS+=" -m64 "
+                        CFAFLAGS+=" -m64 "
+                        LDFLAGS+=" -m64 "
                         ;;
         esac

src/benchmark/create_pthrd.c

@@ -14 +14 @@
                 n = atoi(argv[1]);
         }
-        printf("%lu\n", n);
+        printf("create %lu pthreads ... ", n);
 
         for (size_t i = 0; i < n; i++) {
                 pthread_t thread;
                 if (pthread_create(&thread, NULL, foo, NULL) < 0) {
+                        perror( "failure" );
                         return 1;
                 }
 
                 if (pthread_join( thread, NULL) < 0) {
+                        perror( "failure" );
                         return 1;
                 }
         }
-        pthread_exit(NULL);
-        return 0;
+        printf("finish\n");
 }

src/libcfa/concurrency/alarm.c

@@ -43 +43 @@
 
 void __kernel_set_timer( __cfa_time_t alarm ) {
-        LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Kernel : set timer to %lu\n", (__cfa_time_t)alarm );
+        LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Kernel : set timer to %llu\n", (__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_value.tv_usec = max( (alarm % TIMEGRAN) / ( TIMEGRAN / 1_000_000L ), 1000 ); // microseconds
         val.it_interval.tv_sec = 0;
         val.it_interval.tv_usec = 0;

src/libcfa/concurrency/alarm.h

@@ -19 +19 @@
 
 #include <stdbool.h>
+#include <stdint.h>
 
 #include "assert"
 
-typedef unsigned long int __cfa_time_t;
+typedef uint64_t __cfa_time_t;
 
 struct thread_desc;

src/libcfa/concurrency/preemption.c

@@ -66 +66 @@
 
 void tick_preemption() {
-        // LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Ticking preemption\n" );
-
         alarm_list_t * alarms = &systemProcessor->alarms;
         __cfa_time_t currtime = __kernel_get_time();
+
+        // LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Ticking preemption @ %llu\n", currtime );
         while( alarms->head && alarms->head->alarm < currtime ) {
                 alarm_node_t * node = pop(alarms);
@@ -83 +83 @@
                 verify( validate( alarms ) );
 
-                if( node->period > 0 ) {
-                        node->alarm = currtime + node->period;
+                __cfa_time_t period = node->period;
+                if( period > 0 ) {
+                        node->alarm = currtime + period;
+                        // LIB_DEBUG_PRINT_BUFFER_LOCAL( STDERR_FILENO, "Reinsert %p @ %llu (%llu + %llu)\n", node, node->alarm, currtime, period );
                         insert( alarms, node );
                 }
@@ -101 +103 @@
 
 void update_preemption( processor * this, __cfa_time_t duration ) {
-        LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Processor : %p updating preemption to %lu\n", this, duration );
+        LIB_DEBUG_PRINT_BUFFER_DECL( STDERR_FILENO, "Processor : %p updating preemption to %llu\n", this, duration );
 
         alarm_node_t * alarm = this->preemption_alarm;
@@ -273 +275 @@
                 siginfo_t info;
                 int sig = sigwaitinfo( &mask, &info );
-                if( sig < 0 ) {
-                        abortf( "internal error, sigwait" );
-                }
-                else if( sig == SIGALRM )
+                assertf(sig == SIGALRM, "Kernel Internal Error, sigwait: Unexpected signal %d (%d : %d)\n", sig, info.si_code, info.si_value.sival_int);
+
+                LIB_DEBUG_PRINT_SAFE("Kernel : Caught alarm from %d with %d\n", info.si_code, info.si_value.sival_int );
+                switch( info.si_code )
                 {
-                        LIB_DEBUG_PRINT_SAFE("Kernel : Caught signal %d (%d)\n", sig, info.si_value.sival_int );
-                        if( info.si_value.sival_int == 0 )
-                        {
-                                LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread tick\n");
-                                lock( &systemProcessor->alarm_lock DEBUG_CTX2 );
-                                tick_preemption();
-                                unlock( &systemProcessor->alarm_lock );
-                        }
-                        else if( info.si_value.sival_int == 1 )
-                        {
-                                break;
-                        }
-                }
-                else
-                {
-                        LIB_DEBUG_PRINT_SAFE("Kernel : Unexpected signal %d (%d)\n", sig, info.si_value.sival_int);
-                }
-        }
-
+                case SI_TIMER:
+                case SI_KERNEL:
+                        LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread tick\n");
+                        lock( &systemProcessor->alarm_lock DEBUG_CTX2 );
+                        tick_preemption();
+                        unlock( &systemProcessor->alarm_lock );
+                        break;
+                case SI_QUEUE:
+                        goto EXIT;
+                }
+        }
+
+EXIT:
         LIB_DEBUG_PRINT_SAFE("Kernel : Preemption thread stopping\n");
         return NULL;

src/tests/preempt_longrun/Makefile.am

@@ -31 +31 @@
 all-local: ${TESTS:=.run}
 
+clean-local:
+        rm -f ${TESTS}
+
 % : %.c ${CC}
         ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}

src/tests/preempt_longrun/Makefile.in

@@ -790 +790 @@
 clean: clean-am
 
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-local mostlyclean-am
 
 distclean: distclean-am
@@ -857 +857 @@
 
 .PHONY: all all-am all-local check check-TESTS check-am clean \
-        clean-generic cscopelist-am ctags-am distclean \
+        clean-generic clean-local cscopelist-am ctags-am distclean \
         distclean-generic distdir dvi dvi-am html html-am info info-am \
         install install-am install-data install-data-am install-dvi \
@@ -875 +875 @@
 all-local: ${TESTS:=.run}
 
+clean-local:
+        rm -f ${TESTS}
+
 % : %.c ${CC}
         ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}

src/tests/sched-int-barge.c

@@ -4 +4 @@
 #include <stdlib>
 #include <thread>
+
+#ifndef N
+#define N 100_000
+#endif
 
 enum state_t { WAIT, SIGNAL, BARGE };
@@ -73 +77 @@
         }
 
-        if( c->counter >= 100_000 ) c->done = true;
+        if( c->counter >= N ) c->done = true;
         return !c->done;
 }