Changeset ee2938a

Timestamp:

Feb 12, 2018, 1:33:45 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

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:

ff2d1139

Parents:

48786bc8 (diff), cfe2f0a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src

Files:

• libcfa/concurrency/coroutine.c (modified) (2 diffs)
• tests/preempt_longrun/Makefile.am (modified) (2 diffs)
• tests/preempt_longrun/Makefile.in (modified) (3 diffs)
• tests/preempt_longrun/coroutine.c (added)

src/libcfa/concurrency/coroutine.c

@@ -99 +99 @@
 // Wrapper for co
 void CoroutineCtxSwitch(coroutine_desc* src, coroutine_desc* dst) {
-        // THREAD_GETMEM( This )->disableInterrupts();
+        disable_interrupts();
 
         // set state of current coroutine to inactive
@@ -115 +115 @@
         src->state = Active;
 
-        // THREAD_GETMEM( This )->enableInterrupts();
+        enable_interrupts( __cfaabi_dbg_ctx );
 } //ctxSwitchDirect
 

src/tests/preempt_longrun/Makefile.am

@@ -18 +18 @@
 max_time=600
 preempt=1_000ul
+debug=-debug
 
 REPEAT = ${abs_top_srcdir}/tools/repeat
 TIME = /usr/bin/time -f "%E"
 
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt}
 CFLAGS = ${BUILD_FLAGS}
 CC = @CFA_BINDIR@/@CFA_NAME@
 
-TESTS = block create disjoint enter enter3 processor stack wait yield
+TESTS = block coroutine create disjoint enter enter3 processor stack wait yield
 
 .INTERMEDIATE: ${TESTS}
@@ -36 +37 @@
 
 % : %.c ${CC}
-        ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}
+        ${AM_V_GEN}${CC} ${CFLAGS} ${<} $(debug) -o ${@}
 
 %.run : % ${REPEAT}

src/tests/preempt_longrun/Makefile.in

@@ -451 +451 @@
 max_time = 600
 preempt = 1_000ul
+debug = -debug
 REPEAT = ${abs_top_srcdir}/tools/repeat
 TIME = /usr/bin/time -f "%E"
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
-TESTS = block create disjoint enter enter3 processor stack wait yield
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -O2 -DPREEMPTION_RATE=${preempt}
+TESTS = block coroutine create disjoint enter enter3 processor stack wait yield
 all: all-am
 
@@ -643 +644 @@
         $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
         "$$tst" $(AM_TESTS_FD_REDIRECT)
+coroutine.log: coroutine
+        @p='coroutine'; \
+        b='coroutine'; \
+        $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+        --log-file $$b.log --trs-file $$b.trs \
+        $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+        "$$tst" $(AM_TESTS_FD_REDIRECT)
 create.log: create
         @p='create'; \
@@ -873 +881 @@
 
 % : %.c ${CC}
-        ${AM_V_GEN}${CC} ${CFLAGS} ${<} -o ${@}
+        ${AM_V_GEN}${CC} ${CFLAGS} ${<} $(debug) -o ${@}
 
 %.run : % ${REPEAT}