Changeset f1397d14 for libcfa/src/concurrency

Timestamp:

Nov 22, 2019, 2:40:46 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

9aa1317

Parents:

c701332a (diff), 2909b515 (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

File:

• libcfa/src/concurrency/kernel.cfa (modified) (3 diffs)

libcfa/src/concurrency/kernel.cfa

@@ -10 +10 @@
 // Created On       : Tue Jan 17 12:27:26 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun 20 17:21:23 2019
-// Update Count     : 25
+// Last Modified On : Thu Nov 21 16:46:59 2019
+// Update Count     : 27
 //
 
@@ -824 +824 @@
         if(thrd) {
                 int len = snprintf( abort_text, abort_text_size, "Error occurred while executing thread %.256s (%p)", thrd->self_cor.name, thrd );
-                __cfaabi_dbg_bits_write( abort_text, len );
+                __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
 
                 if ( &thrd->self_cor != thrd->curr_cor ) {
                         len = snprintf( abort_text, abort_text_size, " in coroutine %.256s (%p).\n", thrd->curr_cor->name, thrd->curr_cor );
-                        __cfaabi_dbg_bits_write( abort_text, len );
+                        __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
                 }
                 else {
-                        __cfaabi_dbg_bits_write( ".\n", 2 );
+                        __cfaabi_bits_write( STDERR_FILENO, ".\n", 2 );
                 }
         }
         else {
                 int len = snprintf( abort_text, abort_text_size, "Error occurred outside of any thread.\n" );
-                __cfaabi_dbg_bits_write( abort_text, len );
+                __cfaabi_bits_write( STDERR_FILENO, abort_text, len );
         }
 }
@@ -847 +847 @@
 
 extern "C" {
-        void __cfaabi_dbg_bits_acquire() {
+        void __cfaabi_bits_acquire() {
                 lock( kernel_debug_lock __cfaabi_dbg_ctx2 );
         }
 
-        void __cfaabi_dbg_bits_release() {
+        void __cfaabi_bits_release() {
                 unlock( kernel_debug_lock );
         }