Changeset 6a5be52 for src/libcfa/libhdr

Timestamp:

Oct 27, 2017, 5:54:56 PM (7 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:

af0c8da

Parents:

9f0b975

Message:

Modified waitfor to sort monitors

Location:

src/libcfa/libhdr

Files:

• libdebug.c (modified) (6 diffs)
• libdebug.h (modified) (3 diffs)

src/libcfa/libhdr/libdebug.c

@@ -9 +9 @@
 // Author           : Thierry Delisle
 // Created On       : Thu Mar 30 12:30:01 2017
-// Last Modified By : 
-// Last Modified On : 
+// Last Modified By :
+// Last Modified On :
 // Update Count     : 0
 //
@@ -28 +28 @@
 extern "C" {
 
-        void __lib_debug_write( int fd, const char *in_buffer, int len ) {
+        void __lib_debug_write( const char *in_buffer, int len ) {
                 // ensure all data is written
-                for ( int count = 0, retcode; count < len; count += retcode ) { 
+                for ( int count = 0, retcode; count < len; count += retcode ) {
                         in_buffer += count;
 
                         for ( ;; ) {
-                                retcode = write( fd, in_buffer, len - count );
+                                retcode = write( STDERR_FILENO, in_buffer, len - count );
 
                                 // not a timer interrupt ?
-                                if ( retcode != -1 || errno != EINTR ) break; 
+                                if ( retcode != -1 || errno != EINTR ) break;
                         }
 
@@ -52 +52 @@
                 va_start( args, fmt );
                 __lib_debug_acquire();
-                
+
                 int len = vsnprintf( buffer, buffer_size, fmt, args );
-                __lib_debug_write( STDERR_FILENO, buffer, len );
+                __lib_debug_write( buffer, len );
 
                 __lib_debug_release();
@@ -64 +64 @@
 
                 va_start( args, fmt );
-                
+
                 int len = vsnprintf( buffer, buffer_size, fmt, args );
-                __lib_debug_write( STDERR_FILENO, buffer, len );
+                __lib_debug_write( buffer, len );
 
                 va_end( args );
@@ -73 +73 @@
         void __lib_debug_print_vararg( const char fmt[], va_list args ) {
                 int len = vsnprintf( buffer, buffer_size, fmt, args );
-                __lib_debug_write( STDERR_FILENO, buffer, len );
+                __lib_debug_write( buffer, len );
         }
 
@@ -80 +80 @@
 
                 va_start( args, fmt );
-                
+
                 int len = vsnprintf( in_buffer, in_buffer_size, fmt, args );
-                __lib_debug_write( STDERR_FILENO, in_buffer, len );
+                __lib_debug_write( in_buffer, len );
 
                 va_end( args );

src/libcfa/libhdr/libdebug.h

@@ -44 +44 @@
 extern "C" {
 #endif
-      #include <stdarg.h>
+        #include <stdarg.h>
+        #include <stdio.h>
 
-      extern void __lib_debug_write( int fd, const char *buffer, int len );
+      extern void __lib_debug_write( const char *buffer, int len );
       extern void __lib_debug_acquire();
       extern void __lib_debug_release();
@@ -58 +59 @@
 
 #ifdef __CFA_DEBUG_PRINT__
-        #define LIB_DEBUG_WRITE( fd, buffer, len )     __lib_debug_write( fd, buffer, len )
+        #define LIB_DEBUG_WRITE( buffer, len )         __lib_debug_write( buffer, len )
         #define LIB_DEBUG_ACQUIRE()                    __lib_debug_acquire()
         #define LIB_DEBUG_RELEASE()                    __lib_debug_release()
@@ -64 +65 @@
         #define LIB_DEBUG_PRINT_NOLOCK(...)            __lib_debug_print_nolock (__VA_ARGS__)
         #define LIB_DEBUG_PRINT_BUFFER(...)            __lib_debug_print_buffer (__VA_ARGS__)
-        #define LIB_DEBUG_PRINT_BUFFER_DECL(fd, ...)   char text[256]; int len = snprintf( text, 256, __VA_ARGS__ ); __lib_debug_write( fd, text, len );
-        #define LIB_DEBUG_PRINT_BUFFER_LOCAL(fd, ...)  len = snprintf( text, 256, __VA_ARGS__ ); __lib_debug_write( fd, text, len );
+        #define LIB_DEBUG_PRINT_BUFFER_DECL(...)       char __dbg_text[256]; int __dbg_len = snprintf( __dbg_text, 256, __VA_ARGS__ ); __lib_debug_write( __dbg_text, __dbg_len );
+        #define LIB_DEBUG_PRINT_BUFFER_LOCAL(...)      __dbg_len = snprintf( __dbg_text, 256, __VA_ARGS__ ); __lib_debug_write( __dbg_text, __dbg_len );
 #else
         #define LIB_DEBUG_WRITE(...)               ((void)0)