Index: src/driver/cfa.cc =================================================================== --- src/driver/cfa.cc (revision c81ebf924fb91ca84affb100df945a8a6441e956) +++ src/driver/cfa.cc (revision c5ac6d50679bfa2c0447315ee7255a5bdfb68af2) @@ -271,4 +271,6 @@ args[nargs] = "-ldl"; nargs += 1; + args[nargs] = "-lrt"; + nargs += 1; args[nargs] = "-Xlinker"; nargs += 1; Index: src/libcfa/Makefile.am =================================================================== --- src/libcfa/Makefile.am (revision c81ebf924fb91ca84affb100df945a8a6441e956) +++ src/libcfa/Makefile.am (revision c5ac6d50679bfa2c0447315ee7255a5bdfb68af2) @@ -54,5 +54,5 @@ # not all platforms support concurrency, add option do disable it if BUILD_CONCURRENCY -libsrc += concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/alarm.c concurrency/invoke.c concurrency/signal.c +libsrc += concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/alarm.c concurrency/invoke.c concurrency/preemption.c endif Index: src/libcfa/Makefile.in =================================================================== --- src/libcfa/Makefile.in (revision c81ebf924fb91ca84affb100df945a8a6441e956) +++ src/libcfa/Makefile.in (revision c5ac6d50679bfa2c0447315ee7255a5bdfb68af2) @@ -46,5 +46,5 @@ # not all platforms support concurrency, add option do disable it -@BUILD_CONCURRENCY_TRUE@am__append_4 = concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/alarm.c concurrency/invoke.c concurrency/signal.c +@BUILD_CONCURRENCY_TRUE@am__append_4 = concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/alarm.c concurrency/invoke.c concurrency/preemption.c subdir = src/libcfa DIST_COMMON = $(am__nobase_cfa_include_HEADERS_DIST) \ @@ -104,5 +104,5 @@ concurrency/kernel.c concurrency/monitor.c \ concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/alarm.c \ - concurrency/invoke.c concurrency/signal.c + concurrency/invoke.c concurrency/preemption.c am__dirstamp = $(am__leading_dot)dirstamp @BUILD_CONCURRENCY_TRUE@am__objects_1 = concurrency/libcfa_d_a-coroutine.$(OBJEXT) \ @@ -122,5 +122,5 @@ @BUILD_CONCURRENCY_TRUE@ concurrency/libcfa_d_a-alarm.$(OBJEXT) \ @BUILD_CONCURRENCY_TRUE@ concurrency/libcfa_d_a-invoke.$(OBJEXT) \ -@BUILD_CONCURRENCY_TRUE@ concurrency/libcfa_d_a-signal.$(OBJEXT) +@BUILD_CONCURRENCY_TRUE@ concurrency/libcfa_d_a-preemption.$(OBJEXT) am__objects_4 = libcfa_d_a-libcfa-prelude.$(OBJEXT) \ libcfa_d_a-interpose.$(OBJEXT) \ @@ -138,5 +138,5 @@ concurrency/kernel.c concurrency/monitor.c \ concurrency/CtxSwitch-@MACHINE_TYPE@.S concurrency/alarm.c \ - concurrency/invoke.c concurrency/signal.c + concurrency/invoke.c concurrency/preemption.c @BUILD_CONCURRENCY_TRUE@am__objects_5 = concurrency/libcfa_a-coroutine.$(OBJEXT) \ @BUILD_CONCURRENCY_TRUE@ concurrency/libcfa_a-thread.$(OBJEXT) \ @@ -154,5 +154,5 @@ @BUILD_CONCURRENCY_TRUE@ concurrency/libcfa_a-alarm.$(OBJEXT) \ @BUILD_CONCURRENCY_TRUE@ concurrency/libcfa_a-invoke.$(OBJEXT) \ -@BUILD_CONCURRENCY_TRUE@ concurrency/libcfa_a-signal.$(OBJEXT) +@BUILD_CONCURRENCY_TRUE@ concurrency/libcfa_a-preemption.$(OBJEXT) am__objects_8 = libcfa_a-libcfa-prelude.$(OBJEXT) \ libcfa_a-interpose.$(OBJEXT) \ @@ -445,5 +445,6 @@ concurrency/libcfa_d_a-invoke.$(OBJEXT): concurrency/$(am__dirstamp) \ concurrency/$(DEPDIR)/$(am__dirstamp) -concurrency/libcfa_d_a-signal.$(OBJEXT): concurrency/$(am__dirstamp) \ +concurrency/libcfa_d_a-preemption.$(OBJEXT): \ + concurrency/$(am__dirstamp) \ concurrency/$(DEPDIR)/$(am__dirstamp) libcfa-d.a: $(libcfa_d_a_OBJECTS) $(libcfa_d_a_DEPENDENCIES) $(EXTRA_libcfa_d_a_DEPENDENCIES) @@ -473,5 +474,6 @@ concurrency/libcfa_a-invoke.$(OBJEXT): concurrency/$(am__dirstamp) \ concurrency/$(DEPDIR)/$(am__dirstamp) -concurrency/libcfa_a-signal.$(OBJEXT): concurrency/$(am__dirstamp) \ +concurrency/libcfa_a-preemption.$(OBJEXT): \ + concurrency/$(am__dirstamp) \ concurrency/$(DEPDIR)/$(am__dirstamp) libcfa.a: $(libcfa_a_OBJECTS) $(libcfa_a_DEPENDENCIES) $(EXTRA_libcfa_a_DEPENDENCIES) @@ -488,5 +490,5 @@ -rm -f concurrency/libcfa_a-kernel.$(OBJEXT) -rm -f concurrency/libcfa_a-monitor.$(OBJEXT) - -rm -f concurrency/libcfa_a-signal.$(OBJEXT) + -rm -f concurrency/libcfa_a-preemption.$(OBJEXT) -rm -f concurrency/libcfa_a-thread.$(OBJEXT) -rm -f concurrency/libcfa_d_a-alarm.$(OBJEXT) @@ -495,5 +497,5 @@ -rm -f concurrency/libcfa_d_a-kernel.$(OBJEXT) -rm -f concurrency/libcfa_d_a-monitor.$(OBJEXT) - -rm -f concurrency/libcfa_d_a-signal.$(OBJEXT) + -rm -f concurrency/libcfa_d_a-preemption.$(OBJEXT) -rm -f concurrency/libcfa_d_a-thread.$(OBJEXT) -rm -f containers/libcfa_a-maybe.$(OBJEXT) @@ -537,5 +539,5 @@ @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_a-kernel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_a-monitor.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_a-signal.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_a-preemption.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_a-thread.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_d_a-alarm.Po@am__quote@ @@ -544,5 +546,5 @@ @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_d_a-kernel.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_d_a-monitor.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_d_a-signal.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_d_a-preemption.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@concurrency/$(DEPDIR)/libcfa_d_a-thread.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@containers/$(DEPDIR)/libcfa_a-maybe.Po@am__quote@ @@ -869,17 +871,17 @@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_d_a-invoke.obj `if test -f 'concurrency/invoke.c'; then $(CYGPATH_W) 'concurrency/invoke.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/invoke.c'; fi` -concurrency/libcfa_d_a-signal.o: concurrency/signal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_d_a-signal.o -MD -MP -MF concurrency/$(DEPDIR)/libcfa_d_a-signal.Tpo -c -o concurrency/libcfa_d_a-signal.o `test -f 'concurrency/signal.c' || echo '$(srcdir)/'`concurrency/signal.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_d_a-signal.Tpo concurrency/$(DEPDIR)/libcfa_d_a-signal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='concurrency/signal.c' object='concurrency/libcfa_d_a-signal.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_d_a-signal.o `test -f 'concurrency/signal.c' || echo '$(srcdir)/'`concurrency/signal.c - -concurrency/libcfa_d_a-signal.obj: concurrency/signal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_d_a-signal.obj -MD -MP -MF concurrency/$(DEPDIR)/libcfa_d_a-signal.Tpo -c -o concurrency/libcfa_d_a-signal.obj `if test -f 'concurrency/signal.c'; then $(CYGPATH_W) 'concurrency/signal.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/signal.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_d_a-signal.Tpo concurrency/$(DEPDIR)/libcfa_d_a-signal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='concurrency/signal.c' object='concurrency/libcfa_d_a-signal.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_d_a-signal.obj `if test -f 'concurrency/signal.c'; then $(CYGPATH_W) 'concurrency/signal.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/signal.c'; fi` +concurrency/libcfa_d_a-preemption.o: concurrency/preemption.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_d_a-preemption.o -MD -MP -MF concurrency/$(DEPDIR)/libcfa_d_a-preemption.Tpo -c -o concurrency/libcfa_d_a-preemption.o `test -f 'concurrency/preemption.c' || echo '$(srcdir)/'`concurrency/preemption.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_d_a-preemption.Tpo concurrency/$(DEPDIR)/libcfa_d_a-preemption.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='concurrency/preemption.c' object='concurrency/libcfa_d_a-preemption.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_d_a-preemption.o `test -f 'concurrency/preemption.c' || echo '$(srcdir)/'`concurrency/preemption.c + +concurrency/libcfa_d_a-preemption.obj: concurrency/preemption.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_d_a-preemption.obj -MD -MP -MF concurrency/$(DEPDIR)/libcfa_d_a-preemption.Tpo -c -o concurrency/libcfa_d_a-preemption.obj `if test -f 'concurrency/preemption.c'; then $(CYGPATH_W) 'concurrency/preemption.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/preemption.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_d_a-preemption.Tpo concurrency/$(DEPDIR)/libcfa_d_a-preemption.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='concurrency/preemption.c' object='concurrency/libcfa_d_a-preemption.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_d_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_d_a-preemption.obj `if test -f 'concurrency/preemption.c'; then $(CYGPATH_W) 'concurrency/preemption.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/preemption.c'; fi` libcfa_a-libcfa-prelude.obj: libcfa-prelude.c @@ -1163,17 +1165,17 @@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_a-invoke.obj `if test -f 'concurrency/invoke.c'; then $(CYGPATH_W) 'concurrency/invoke.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/invoke.c'; fi` -concurrency/libcfa_a-signal.o: concurrency/signal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_a-signal.o -MD -MP -MF concurrency/$(DEPDIR)/libcfa_a-signal.Tpo -c -o concurrency/libcfa_a-signal.o `test -f 'concurrency/signal.c' || echo '$(srcdir)/'`concurrency/signal.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_a-signal.Tpo concurrency/$(DEPDIR)/libcfa_a-signal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='concurrency/signal.c' object='concurrency/libcfa_a-signal.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_a-signal.o `test -f 'concurrency/signal.c' || echo '$(srcdir)/'`concurrency/signal.c - -concurrency/libcfa_a-signal.obj: concurrency/signal.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_a-signal.obj -MD -MP -MF concurrency/$(DEPDIR)/libcfa_a-signal.Tpo -c -o concurrency/libcfa_a-signal.obj `if test -f 'concurrency/signal.c'; then $(CYGPATH_W) 'concurrency/signal.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/signal.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_a-signal.Tpo concurrency/$(DEPDIR)/libcfa_a-signal.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='concurrency/signal.c' object='concurrency/libcfa_a-signal.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_a-signal.obj `if test -f 'concurrency/signal.c'; then $(CYGPATH_W) 'concurrency/signal.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/signal.c'; fi` +concurrency/libcfa_a-preemption.o: concurrency/preemption.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_a-preemption.o -MD -MP -MF concurrency/$(DEPDIR)/libcfa_a-preemption.Tpo -c -o concurrency/libcfa_a-preemption.o `test -f 'concurrency/preemption.c' || echo '$(srcdir)/'`concurrency/preemption.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_a-preemption.Tpo concurrency/$(DEPDIR)/libcfa_a-preemption.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='concurrency/preemption.c' object='concurrency/libcfa_a-preemption.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_a-preemption.o `test -f 'concurrency/preemption.c' || echo '$(srcdir)/'`concurrency/preemption.c + +concurrency/libcfa_a-preemption.obj: concurrency/preemption.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -MT concurrency/libcfa_a-preemption.obj -MD -MP -MF concurrency/$(DEPDIR)/libcfa_a-preemption.Tpo -c -o concurrency/libcfa_a-preemption.obj `if test -f 'concurrency/preemption.c'; then $(CYGPATH_W) 'concurrency/preemption.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/preemption.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) concurrency/$(DEPDIR)/libcfa_a-preemption.Tpo concurrency/$(DEPDIR)/libcfa_a-preemption.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='concurrency/preemption.c' object='concurrency/libcfa_a-preemption.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcfa_a_CFLAGS) $(CFLAGS) -c -o concurrency/libcfa_a-preemption.obj `if test -f 'concurrency/preemption.c'; then $(CYGPATH_W) 'concurrency/preemption.c'; else $(CYGPATH_W) '$(srcdir)/concurrency/preemption.c'; fi` install-nobase_cfa_includeHEADERS: $(nobase_cfa_include_HEADERS) @$(NORMAL_INSTALL) Index: src/libcfa/concurrency/preemption.c =================================================================== --- src/libcfa/concurrency/preemption.c (revision c5ac6d50679bfa2c0447315ee7255a5bdfb68af2) +++ src/libcfa/concurrency/preemption.c (revision c5ac6d50679bfa2c0447315ee7255a5bdfb68af2) @@ -0,0 +1,143 @@ +// -*- Mode: CFA -*- +// +// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo +// +// The contents of this file are covered under the licence agreement in the +// file "LICENCE" distributed with Cforall. +// +// signal.c -- +// +// Author : Thierry Delisle +// Created On : Mon Jun 5 14:20:42 2017 +// Last Modified By : Thierry Delisle +// Last Modified On : -- +// Update Count : 0 +// + +#include "preemption.h" + +extern "C" { +#include +} + +#define __CFA_DEFAULT_PREEMPTION__ 10 + +__attribute__((weak)) unsigned int default_preemption() { + return __CFA_DEFAULT_PREEMPTION__; +} + +static void preempt( processor * this ); +static void timeout( thread_desc * this ); + +//============================================================================================= +// Kernel Preemption logic +//============================================================================================= + +void kernel_start_preemption() { + +} + +void tick_preemption() { + alarm_list_t * alarms = &systemProcessor->alarms; + __cfa_time_t currtime = __kernel_get_time(); + while( alarms->head && alarms->head->alarm < currtime ) { + alarm_node_t * node = pop(alarms); + if( node->kernel_alarm ) { + preempt( node->proc ); + } + else { + timeout( node->thrd ); + } + + if( node->period > 0 ) { + node->alarm += node->period; + insert( alarms, node ); + } + else { + node->set = false; + } + } + + if( alarms->head ) { + __kernel_set_timer( alarms->head->alarm - currtime ); + } +} + +void update_preemption( processor * this, __cfa_time_t duration ) { + // assert( THREAD_GETMEM( disableInt ) && THREAD_GETMEM( disableIntCnt ) == 1 ); + alarm_node_t * alarm = this->preemption_alarm; + + // Alarms need to be enabled + if ( duration > 0 && !alarm->set ) { + alarm->alarm = __kernel_get_time() + duration; + alarm->period = duration; + register_self( alarm ); + } + // Zero duraction but alarm is set + else if ( duration == 0 && alarm->set ) { + unregister_self( alarm ); + alarm->alarm = 0; + alarm->period = 0; + } + // If alarm is different from previous, change it + else if ( duration > 0 && alarm->period != duration ) { + unregister_self( alarm ); + alarm->alarm = __kernel_get_time() + duration; + alarm->period = duration; + register_self( alarm ); + } +} + +void ?{}( preemption_scope * this, processor * proc ) { + (&this->alarm){ proc }; + this->proc = proc; + this->proc->preemption_alarm = &this->alarm; + update_preemption( this->proc, this->proc->preemption ); +} + +void ^?{}( preemption_scope * this ) { + update_preemption( this->proc, 0 ); +} + +//============================================================================================= +// Kernel Signal logic +//============================================================================================= + +static inline bool preemption_ready() { + return this_processor->disable_preempt_count == 0; +} + +static inline void defer_ctxSwitch() { + this_processor->pending_preemption = true; +} + +static inline void defer_alarm() { + systemProcessor->pending_alarm = true; +} + +void sigHandler_ctxSwitch( __attribute__((unused)) int sig ) { + if( preemption_ready() ) { + ScheduleInternal( this_processor->current_thread ); + } + else { + defer_ctxSwitch(); + } +} + +void sigHandler_alarm( __attribute__((unused)) int sig ) { + if( try_lock( &systemProcessor->alarm_lock ) ) { + tick_preemption(); + unlock( &systemProcessor->alarm_lock ); + } + else { + defer_alarm(); + } +} + +static void preempt( processor * this ) { + pthread_kill( this->kernel_thread, SIGUSR1 ); +} + +static void timeout( thread_desc * this ) { + //TODO : implement waking threads +} Index: c/libcfa/concurrency/signal.c =================================================================== --- src/libcfa/concurrency/signal.c (revision c81ebf924fb91ca84affb100df945a8a6441e956) +++ (revision ) @@ -1,143 +1,0 @@ -// -*- Mode: CFA -*- -// -// Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo -// -// The contents of this file are covered under the licence agreement in the -// file "LICENCE" distributed with Cforall. -// -// signal.c -- -// -// Author : Thierry Delisle -// Created On : Mon Jun 5 14:20:42 2017 -// Last Modified By : Thierry Delisle -// Last Modified On : -- -// Update Count : 0 -// - -#include "preemption.h" - -extern "C" { -#include -} - -#define __CFA_DEFAULT_PREEMPTION__ 10 - -__attribute__((weak)) unsigned int default_preemption() { - return __CFA_DEFAULT_PREEMPTION__; -} - -static void preempt( processor * this ); -static void timeout( thread_desc * this ); - -//============================================================================================= -// Kernel Preemption logic -//============================================================================================= - -void kernel_start_preemption() { - -} - -void tick_preemption() { - alarm_list_t * alarms = &systemProcessor->alarms; - __cfa_time_t currtime = __kernel_get_time(); - while( alarms->head && alarms->head->alarm < currtime ) { - alarm_node_t * node = pop(alarms); - if( node->kernel_alarm ) { - preempt( node->proc ); - } - else { - timeout( node->thrd ); - } - - if( node->period > 0 ) { - node->alarm += node->period; - insert( alarms, node ); - } - else { - node->set = false; - } - } - - if( alarms->head ) { - __kernel_set_timer( alarms->head->alarm - currtime ); - } -} - -void update_preemption( processor * this, __cfa_time_t duration ) { - // assert( THREAD_GETMEM( disableInt ) && THREAD_GETMEM( disableIntCnt ) == 1 ); - alarm_node_t * alarm = this->preemption_alarm; - - // Alarms need to be enabled - if ( duration > 0 && !alarm->set ) { - alarm->alarm = __kernel_get_time() + duration; - alarm->period = duration; - register_self( alarm ); - } - // Zero duraction but alarm is set - else if ( duration == 0 && alarm->set ) { - unregister_self( alarm ); - alarm->alarm = 0; - alarm->period = 0; - } - // If alarm is different from previous, change it - else if ( duration > 0 && alarm->period != duration ) { - unregister_self( alarm ); - alarm->alarm = __kernel_get_time() + duration; - alarm->period = duration; - register_self( alarm ); - } -} - -void ?{}( preemption_scope * this, processor * proc ) { - (&this->alarm){ proc }; - this->proc = proc; - this->proc->preemption_alarm = &this->alarm; - update_preemption( this->proc, this->proc->preemption ); -} - -void ^?{}( preemption_scope * this ) { - update_preemption( this->proc, 0 ); -} - -//============================================================================================= -// Kernel Signal logic -//============================================================================================= - -static inline bool preemption_ready() { - return this_processor->disable_preempt_count == 0; -} - -static inline void defer_ctxSwitch() { - this_processor->pending_preemption = true; -} - -static inline void defer_alarm() { - systemProcessor->pending_alarm = true; -} - -void sigHandler_ctxSwitch( __attribute__((unused)) int sig ) { - if( preemption_ready() ) { - ScheduleInternal( this_processor->current_thread ); - } - else { - defer_ctxSwitch(); - } -} - -void sigHandler_alarm( __attribute__((unused)) int sig ) { - if( try_lock( &systemProcessor->alarm_lock ) ) { - tick_preemption(); - unlock( &systemProcessor->alarm_lock ); - } - else { - defer_alarm(); - } -} - -static void preempt( processor * this ) { - pthread_kill( this->kernel_thread, SIGUSR1 ); -} - -static void timeout( thread_desc * this ) { - //TODO : implement waking threads -}