rework SHMEM verbose macros to enable if --enable-debug specified

Refs trac:3763

This commit was SVN r29921.

The following Trac tickets were found above:
  Ticket 3763 --> https://svn.open-mpi.org/trac/ompi/ticket/3763

oshmem/mca/atomic/base/base.h

@@ -39,13 +39,19 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_atomic_base_framework;
 #define __ATOMIC_FILE__ __FILE__
 #endif
 
-#define ATOMIC_VERBOSE(level, format, ...) \
+void oshmem_output_verbose(int level, int output_id, const char* prefix, const char* file, int line, const char* function, const char* format, ...);
-	    opal_output_verbose(level, oshmem_atomic_base_framework.framework_output, "%s:%d - %s() " format, \
-				                        __ATOMIC_FILE__, __LINE__, __FUNCTION__, ## __VA_ARGS__)
 
-#define ATOMIC_ERROR(format, ... ) \
+#ifdef OPAL_ENABLE_DEBUG
-	    opal_output_verbose(0, oshmem_atomic_base_framework.framework_output, "Error: %s:%d - %s() " format, \
+#define ATOMIC_VERBOSE(level, ...) \
-				                        __ATOMIC_FILE__, __LINE__, __FUNCTION__, ## __VA_ARGS__)
+    oshmem_output_verbose(level, oshmem_atomic_base_framework.framework_output, \
+        "%s:%d - %s()", __ATOMIC_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
+#else
+#define ATOMIC_VERBOSE(level, ...)
+#endif
+
+#define ATOMIC_ERROR(...) \
+    oshmem_output_verbose(0, oshmem_atomic_base_framework.framework_output, \
+        "Error %s:%d - %s()", __ATOMIC_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
 
 END_C_DECLS
 

oshmem/mca/memheap/base/base.h

@@ -175,17 +175,24 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_memheap_base_framework;
 #define __SPML_FILE__ __FILE__
 #endif
 
-#define MEMHEAP_VERBOSE(level, format, ...) \
+void oshmem_output_verbose(int level, int output_id, const char* prefix, const char* file, int line, const char* function, const char* format, ...);
-	    opal_output_verbose(level, oshmem_memheap_base_framework.framework_output, "%s:%d - %s() " format, \
-				                        __SPML_FILE__, __LINE__, __FUNCTION__, ## __VA_ARGS__)
 
-#define MEMHEAP_ERROR(format, ... ) \
+#ifdef OPAL_ENABLE_DEBUG
-	    opal_output_verbose(0, oshmem_memheap_base_framework.framework_output, "Error: %s:%d - %s() " format, \
+#define MEMHEAP_VERBOSE(level, ...) \
-				                        __SPML_FILE__, __LINE__, __FUNCTION__, ## __VA_ARGS__)
+    oshmem_output_verbose(level, oshmem_memheap_base_framework.framework_output, \
+        "%s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
+#else
+#define MEMHEAP_VERBOSE(level, ...)
+#endif
+
+#define MEMHEAP_ERROR(...) \
+    oshmem_output_verbose(0, oshmem_memheap_base_framework.framework_output, \
+        "Error %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
+
+#define MEMHEAP_WARN(...) \
+    oshmem_output_verbose(0, oshmem_memheap_base_framework.framework_output, \
+        "Error %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
 
-#define MEMHEAP_WARN(format, ... ) \
-	    opal_output_verbose(0, oshmem_memheap_base_framework.framework_output, "Warning: %s:%d - %s() " format, \
-				                        __SPML_FILE__, __LINE__, __FUNCTION__, ## __VA_ARGS__)
 END_C_DECLS
 
 #endif /* MCA_MEMHEAP_BASE_H */

oshmem/mca/scoll/base/base.h

@@ -51,13 +51,19 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_scoll_base_framework;
 #define __SCOLL_FILE__ __FILE__
 #endif
 
-#define SCOLL_VERBOSE(level, format, ...) \
+void oshmem_output_verbose(int level, int output_id, const char* prefix, const char* file, int line, const char* function, const char* format, ...);
-	    opal_output_verbose(level, oshmem_scoll_base_framework.framework_output, "%s:%d - %s() " format, \
-				                        __SCOLL_FILE__, __LINE__, __FUNCTION__, ## __VA_ARGS__)
 
-#define SCOLL_ERROR(format, ... ) \
+#ifdef OPAL_ENABLE_DEBUG
-	    opal_output_verbose(0, oshmem_scoll_base_framework.framework_output, "Error: %s:%d - %s() " format, \
+#define SCOLL_VERBOSE(level, ...) \
-				                        __SCOLL_FILE__, __LINE__, __FUNCTION__, ## __VA_ARGS__)
+    oshmem_output_verbose(level, oshmem_scoll_base_framework.framework_output, \
+       "Error %s:%d - %s()", __SCOLL_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
+#else
+#define SCOLL_VERBOSE(...)
+#endif
+
+#define SCOLL_ERROR(...) \
+    oshmem_output_verbose(0, oshmem_scoll_base_framework.framework_output, \
+        "Error %s:%d - %s()",  __SCOLL_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
 
 END_C_DECLS
 

oshmem/mca/spml/base/base.h

@@ -80,13 +80,19 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_spml_base_framework;
 #define __SPML_FILE__ __FILE__
 #endif
 
-#define SPML_VERBOSE(level, format, ...) \
+void oshmem_output_verbose(int level, int output_id, const char* prefix, const char* file, int line, const char* function, const char* format, ...);
-	    opal_output_verbose(level, oshmem_spml_base_framework.framework_output, "%s:%d - %s() " format, \
-				                        __SPML_FILE__, __LINE__, __FUNCTION__, ## __VA_ARGS__)
 
-#define SPML_ERROR(format, ... ) \
+#ifdef OPAL_ENABLE_DEBUG
-	    opal_output_verbose(0, oshmem_spml_base_framework.framework_output, "Error: %s:%d - %s() " format, \
+#define SPML_VERBOSE(level, ...) \
-				                        __SPML_FILE__, __LINE__, __FUNCTION__, ## __VA_ARGS__)
+    oshmem_output_verbose(level, oshmem_spml_base_framework.framework_output, \
+        "%s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
+#else
+#define SPML_VERBOSE(level, ...)
+#endif
+
+#define SPML_ERROR(...) \
+    oshmem_output_verbose(0, oshmem_spml_base_framework.framework_output, \
+        "Error %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
 
 END_C_DECLS
 

oshmem/runtime/oshmem_shmem_abort.c

@@ -123,3 +123,14 @@ int oshmem_shmem_abort(int errcode)
 
     return OSHMEM_SUCCESS;
 }
+
+void oshmem_output_verbose(int level, int output_id, const char* prefix, const char* file, int line, const char* function, const char* format, ...)
+{
+    va_list args;
+    char *buffer;
+    va_start(args, format);
+    asprintf(&buffer, "%s %s", prefix, format);
+    opal_output_verbose(level, output_id, buffer, file, line, function, args);
+    va_end(args);
+    free(buffer);
+}

oshmem/shmem/shmem_api_logger.h

@@ -21,11 +21,18 @@ OSHMEM_DECLSPEC extern int shmem_api_logger_output;
 #define __SPML_FILE__ __FILE__
 #endif
 
-#define SHMEM_API_VERBOSE(level, format, ...) \
+void oshmem_output_verbose(int level, int output_id, const char* prefix, const char* file, int line, const char* function, const char* format, ...);
-            opal_output_verbose(level, shmem_api_logger_output, "%s:%d - %s() " format, \
+
-                                                            __SPML_FILE__, __LINE__, __FUNCTION__, ## __VA_ARGS__)
+#ifdef OPAL_ENABLE_DEBUG
+#define SHMEM_API_VERBOSE(level, ...) \
+    oshmem_output_verbose(level, shmem_api_logger_output, \
+        "%s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
+#else
+#define SHMEM_API_VERBOSE(level, ...)
+#endif
+
+#define SHMEM_API_ERROR(...) \
+    oshmem_output_verbose(0, shmem_api_logger_output, \
+        "Error: %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
 
-#define SHMEM_API_ERROR(format, ... ) \
-            opal_output_verbose(0, shmem_api_logger_output, "Error: %s:%d - %s() " format, \
-                                                            __SPML_FILE__, __LINE__, __FUNCTION__, ## __VA_ARGS__)
 #endif /*SHMEM_API_LOGGER_H*/