Changeset b826e6b for src/libcfa/libhdr

Timestamp:

Jul 19, 2017, 11:49:33 AM (9 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:

9cc0472

Parents:

fea3faa (diff), a57cb58 (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/libhdr

Files:

• libalign.h (modified) (3 diffs)
• libdebug.h (modified) (2 diffs)

src/libcfa/libhdr/libalign.h

@@ -1 @@
-//                              -*- Mode: C++ -*- 
+//                              -*- Mode: C++ -*-
 //
 // Cforall Version 1.0.0 Copyright (C) 2016 University of Waterloo
@@ -18 +18 @@
 // Free Software  Foundation; either  version 2.1 of  the License, or  (at your
 // option) any later version.
-// 
+//
 // This library is distributed in the  hope that it will be useful, but WITHOUT
 // ANY  WARRANTY;  without even  the  implied  warranty  of MERCHANTABILITY  or
 // FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
 // for more details.
-// 
+//
 // You should  have received a  copy of the  GNU Lesser General  Public License
 // along  with this library.
-// 
+//
 
 
@@ -33 +33 @@
 
 #include "assert"
+#include <stdbool.h>
 
-// Minimum size used to align memory boundaries for memory allocations. 
+// Minimum size used to align memory boundaries for memory allocations.
 #define libAlign() (sizeof(double))
 

src/libcfa/libhdr/libdebug.h

@@ -18 +18 @@
 
 #ifdef __CFA_DEBUG__
-        #define LIB_DEBUG_DO(x) x
-        #define LIB_NO_DEBUG_DO(x) ((void)0)
+        #define LIB_DEBUG_DO(...) __VA_ARGS__
+        #define LIB_NO_DEBUG_DO(...)
+        #define DEBUG_CTX __PRETTY_FUNCTION__
+        #define DEBUG_CTX2 , __PRETTY_FUNCTION__
+        #define DEBUG_CTX_PARAM const char * caller
+        #define DEBUG_CTX_PARAM2 , const char * caller
 #else
-        #define LIB_DEBUG_DO(x) ((void)0)
-        #define LIB_NO_DEBUG_DO(x) x      
+        #define LIB_DEBUG_DO(...)
+        #define LIB_NO_DEBUG_DO(...) __VA_ARGS__
+        #define DEBUG_CTX
+        #define DEBUG_CTX2
+        #define DEBUG_CTX_PARAM
+        #define DEBUG_CTX_PARAM2
 #endif
 
@@ -51 +59 @@
 
 #ifdef __CFA_DEBUG_PRINT__
-      #define LIB_DEBUG_WRITE( fd, buffer, len )  __lib_debug_write( fd, buffer, len )
-      #define LIB_DEBUG_ACQUIRE()                 __lib_debug_acquire()
-      #define LIB_DEBUG_RELEASE()                 __lib_debug_release()
-      #define LIB_DEBUG_PRINT_SAFE(...)           __lib_debug_print_safe   (__VA_ARGS__)
-      #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_WRITE( fd, buffer, len )     __lib_debug_write( fd, buffer, len )
+        #define LIB_DEBUG_ACQUIRE()                    __lib_debug_acquire()
+        #define LIB_DEBUG_RELEASE()                    __lib_debug_release()
+        #define LIB_DEBUG_PRINT_SAFE(...)              __lib_debug_print_safe   (__VA_ARGS__)
+        #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 );
 #else
-      #define LIB_DEBUG_WRITE(...)          ((void)0)
-      #define LIB_DEBUG_ACQUIRE()           ((void)0)
-      #define LIB_DEBUG_RELEASE()           ((void)0)
-      #define LIB_DEBUG_PRINT_SAFE(...)     ((void)0)
-      #define LIB_DEBUG_PRINT_NOLOCK(...)   ((void)0)
-      #define LIB_DEBUG_PRINT_BUFFER(...)   ((void)0)
+        #define LIB_DEBUG_WRITE(...)               ((void)0)
+        #define LIB_DEBUG_ACQUIRE()                ((void)0)
+        #define LIB_DEBUG_RELEASE()                ((void)0)
+        #define LIB_DEBUG_PRINT_SAFE(...)          ((void)0)
+        #define LIB_DEBUG_PRINT_NOLOCK(...)        ((void)0)
+        #define LIB_DEBUG_PRINT_BUFFER(...)        ((void)0)
+        #define LIB_DEBUG_PRINT_BUFFER_DECL(...)   ((void)0)
+        #define LIB_DEBUG_PRINT_BUFFER_LOCAL(...)  ((void)0)
 #endif