Changeset a6e0e4c for libcfa/src/concurrency

Timestamp:

Dec 11, 2020, 3:44:29 PM (5 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

361bf01, 6ce9a4f2

Parents:

b3a0df6 (diff), 4422579 (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:

libcfa/src/concurrency

Files:

• coroutine.hfa (modified) (1 diff)
• io/setup.cfa (modified) (6 diffs)

libcfa/src/concurrency/coroutine.hfa

@@ -144 +144 @@
 
         if( unlikely(dst->context.SP == 0p) ) {
-                active_thread()->curr_cor = dst;
                 __stack_prepare(&dst->stack, 65000);
                 __cfactx_start(main, dst, cor, __cfactx_invoke_coroutine);
-                active_thread()->curr_cor = src;
         }
 

libcfa/src/concurrency/io/setup.cfa

@@ -17 +17 @@
 #define _GNU_SOURCE         /* See feature_test_macros(7) */
 
+#if defined(__CFA_DEBUG__)
+        // #define __CFA_DEBUG_PRINT_IO__
+        // #define __CFA_DEBUG_PRINT_IO_CORE__
+#endif
+
 #include "io/types.hfa"
 #include "kernel.hfa"
@@ -111 +116 @@
 
         void __kernel_io_startup(void) {
-                __cfaabi_dbg_print_safe( "Kernel : Creating EPOLL instance\n" );
+                __cfadbg_print_safe(io_core, "Kernel : Creating EPOLL instance\n" );
 
                 iopoll.epollfd = epoll_create1(0);
@@ -118 +123 @@
                 }
 
-                __cfaabi_dbg_print_safe( "Kernel : Starting io poller thread\n" );
+                __cfadbg_print_safe(io_core, "Kernel : Starting io poller thread\n" );
 
                 iopoll.run = true;
@@ -141 +146 @@
                 // Io polling is now fully stopped
 
-                __cfaabi_dbg_print_safe( "Kernel : IO poller stopped\n" );
+                __cfadbg_print_safe(io_core, "Kernel : IO poller stopped\n" );
         }
 
@@ -149 +154 @@
                 id.id = doregister(&id);
                 __cfaabi_tls.this_proc_id = &id;
-                __cfaabi_dbg_print_safe( "Kernel : IO poller thread starting\n" );
+                __cfadbg_print_safe(io_core, "Kernel : IO poller thread starting\n" );
 
                 // Block signals to control when they arrive
@@ -184 +189 @@
                 }
 
-                __cfaabi_dbg_print_safe( "Kernel : IO poller thread stopping\n" );
+                __cfadbg_print_safe(io_core, "Kernel : IO poller thread stopping\n" );
                 unregister(&id);
                 return 0p;