allow DAPL_DBG_TYPE settings between device opens

Signed-off-by: Arlin Davis <arlin.r.davis@intel.com>

diff --git a/dapl/common/dapl_ia_open.c b/dapl/common/dapl_ia_open.c
index e43d78d3e2b5fb226b8ee76c3f972d44311ad53d..10c48d4fae72c09833901cca738cd7ec37ad00aa 100644 (file)
--- a/dapl/common/dapl_ia_open.c
+++ b/dapl/common/dapl_ia_open.c
@@ -122,6 +122,10 @@ dapl_ia_open(IN const DAT_NAME_PTR name,
        /* get the hca_ptr */
        hca_ptr = (DAPL_HCA *) provider->extension;
 
+       /* log levels could be reset and set between opens */
+       if (dapl_os_get_env_val("DAPL_DBG_TYPE", 0))
+               g_dapl_dbg_type =  dapl_os_get_env_val("DAPL_DBG_TYPE", 0);
+
        /*
         * Open the HCA if it has not been done before.
         */

diff --git a/dapl/include/dapl_debug.h b/dapl/include/dapl_debug.h
index f1d80a541d2705f7d6eeed521d7ca01ba335bef7..ccc06fcb597858f7fae3c8426672431f98f3a460 100644 (file)
--- a/dapl/include/dapl_debug.h
+++ b/dapl/include/dapl_debug.h
@@ -95,10 +95,10 @@ extern int          g_dapl_dbg_mem;
 
 extern void dapl_internal_dbg_log(DAPL_DBG_TYPE type,  const char *fmt,  ...);
 
-#define dapl_log g_dapl_dbg_level==0 ? (void) 1 : dapl_internal_dbg_log
+#define dapl_log !g_dapl_dbg_type && !g_dapl_dbg_level ? (void) 1 : dapl_internal_dbg_log
 
 #if defined(DAPL_DBG)
-#define dapl_dbg_log g_dapl_dbg_level==0 ? (void) 1 : dapl_internal_dbg_log
+#define dapl_dbg_log !g_dapl_dbg_type && !g_dapl_dbg_level ? (void) 1 : dapl_internal_dbg_log
 #else
 #define dapl_dbg_log(...)
 #endif