Changeset 3d560060 for src/libcfa/bits

Timestamp:

Nov 30, 2017, 3:05:25 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

557435e, 5da9d6a

Parents:

dd9b59e (diff), c2b9f21 (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/libcfa/bits

Files:

• align.h (moved) (moved from src/libcfa/libhdr/libalign.h) (1 diff)
• containers.h (modified) (1 diff)
• debug.c (moved) (moved from src/libcfa/libhdr/libdebug.c) (5 diffs)
• debug.h (added)
• defs.h (modified) (1 diff)
• locks.h (modified) (5 diffs)

src/libcfa/bits/align.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// libdebug.h --
+// align.h --
 //
 // Author           : Thierry Delisle

src/libcfa/bits/containers.h

@@ -15 +15 @@
 #pragma once
 
+#include "bits/align.h"
 #include "bits/defs.h"
-#include "libhdr.h"
 
 //-----------------------------------------------------------------------------

src/libcfa/bits/debug.c

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// libdebug.c --
+// debug.c --
 //
 // Author           : Thierry Delisle
@@ -28 +28 @@
 extern "C" {
 
-        void __lib_debug_write( const char *in_buffer, int len ) {
+        void __cfaabi_dbg_bits_write( const char *in_buffer, int len ) {
                 // ensure all data is written
                 for ( int count = 0, retcode; count < len; count += retcode ) {
@@ -44 +44 @@
         }
 
-        void __lib_debug_acquire() __attribute__((__weak__)) {}
-        void __lib_debug_release() __attribute__((__weak__)) {}
+        void __cfaabi_dbg_bits_acquire() __attribute__((__weak__)) {}
+        void __cfaabi_dbg_bits_release() __attribute__((__weak__)) {}
 
-        void __lib_debug_print_safe  ( const char fmt[], ... ) __attribute__(( format (printf, 1, 2) )) {
+        void __cfaabi_dbg_bits_print_safe  ( const char fmt[], ... ) __attribute__(( format (printf, 1, 2) )) {
                 va_list args;
 
                 va_start( args, fmt );
-                __lib_debug_acquire();
+                __cfaabi_dbg_bits_acquire();
 
                 int len = vsnprintf( buffer, buffer_size, fmt, args );
-                __lib_debug_write( buffer, len );
+                __cfaabi_dbg_bits_write( buffer, len );
 
-                __lib_debug_release();
+                __cfaabi_dbg_bits_release();
                 va_end( args );
         }
 
-        void __lib_debug_print_nolock( const char fmt[], ... ) __attribute__(( format (printf, 1, 2) )) {
+        void __cfaabi_dbg_bits_print_nolock( const char fmt[], ... ) __attribute__(( format (printf, 1, 2) )) {
                 va_list args;
 
@@ -66 +66 @@
 
                 int len = vsnprintf( buffer, buffer_size, fmt, args );
-                __lib_debug_write( buffer, len );
+                __cfaabi_dbg_bits_write( buffer, len );
 
                 va_end( args );
         }
 
-        void __lib_debug_print_vararg( const char fmt[], va_list args ) {
+        void __cfaabi_dbg_bits_print_vararg( const char fmt[], va_list args ) {
                 int len = vsnprintf( buffer, buffer_size, fmt, args );
-                __lib_debug_write( buffer, len );
+                __cfaabi_dbg_bits_write( buffer, len );
         }
 
-        void __lib_debug_print_buffer( char in_buffer[], int in_buffer_size, const char fmt[], ... ) __attribute__(( format (printf, 3, 4) )) {
+        void __cfaabi_dbg_bits_print_buffer( char in_buffer[], int in_buffer_size, const char fmt[], ... ) __attribute__(( format (printf, 3, 4) )) {
                 va_list args;
 
@@ -82 +82 @@
 
                 int len = vsnprintf( in_buffer, in_buffer_size, fmt, args );
-                __lib_debug_write( in_buffer, len );
+                __cfaabi_dbg_bits_write( in_buffer, len );
 
                 va_end( args );

src/libcfa/bits/defs.h

@@ -32 +32 @@
 #define __cfa_anonymous_object __cfa_anonymous_object
 #endif
+
+#ifdef __cforall
+extern "C" {
+#endif
+void abortf( const char fmt[], ... ) __attribute__ ((__nothrow__, __leaf__, __noreturn__));
+#ifdef __cforall
+}
+#endif

src/libcfa/bits/locks.h

@@ -16 +16 @@
 #pragma once
 
+#include "bits/debug.h"
 #include "bits/defs.h"
-
-#include "libhdr.h"
 
 // pause to prevent excess processor bus usage
@@ -65 +64 @@
 
         // Lock the spinlock, return false if already acquired
-        static inline _Bool try_lock  ( __spinlock_t & this DEBUG_CTX_PARAM2 ) {
+        static inline _Bool try_lock  ( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
                 _Bool result = __lock_test_and_test_and_set( this.lock );
-                LIB_DEBUG_DO(
+                __cfaabi_dbg_debug_do(
                         if( result ) {
                                 this.prev_name = caller;
@@ -77 +76 @@
 
         // Lock the spinlock, spin if already acquired
-        static inline void lock( __spinlock_t & this DEBUG_CTX_PARAM2 ) {
+        static inline void lock( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
                 #ifndef NOEXPBACK
                         enum { SPIN_START = 4, SPIN_END = 64 * 1024, };
@@ -98 +97 @@
                         #endif
                 }
-                LIB_DEBUG_DO(
+                __cfaabi_dbg_debug_do(
                         this.prev_name = caller;
                         this.prev_thrd = this_thread;
@@ -105 +104 @@
 
         // Lock the spinlock, spin if already acquired
-        static inline void lock_yield( __spinlock_t & this DEBUG_CTX_PARAM2 ) {
+        static inline void lock_yield( __spinlock_t & this __cfaabi_dbg_ctx_param2 ) {
                 for ( unsigned int i = 1;; i += 1 ) {
                         if ( __lock_test_and_test_and_set( this.lock ) ) break;
                         yield( i );
                 }
-                LIB_DEBUG_DO(
+                __cfaabi_dbg_debug_do(
                         this.prev_name = caller;
                         this.prev_thrd = this_thread;