OSHMEM: fix output, lower prio for scoll/mpi

fixed by Roman/Elena, reviewed by Igor/Mike

cmr=v1.7.5:revewer=ompi-rm1.7

This commit was SVN r30957.

oshmem/mca/memheap/base/base.h

@@ -144,7 +144,7 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_memheap_base_framework;
 
 #define MEMHEAP_WARN(...) \
     oshmem_output_verbose(0, oshmem_memheap_base_framework.framework_output, \
-        "Error %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
+        "Warning %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
 
 END_C_DECLS
 

oshmem/mca/scoll/base/base.h

@@ -54,7 +54,7 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_scoll_base_framework;
 #ifdef OPAL_ENABLE_DEBUG
 #define SCOLL_VERBOSE(level, ...) \
     oshmem_output_verbose(level, oshmem_scoll_base_framework.framework_output, \
-       "Error %s:%d - %s()", __SCOLL_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
+       "%s:%d - %s()", __SCOLL_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
 #else
 #define SCOLL_VERBOSE(...)
 #endif

oshmem/mca/scoll/mpi/scoll_mpi_component.c

@@ -54,9 +54,9 @@ mca_scoll_mpi_component_t mca_scoll_mpi_component = {
         mca_scoll_mpi_init_query,
         mca_scoll_mpi_comm_query,
     },
-    90, /* priority */
+    60, /* priority */
     0,  /* verbose level */
-    1,   /* mpi_enable */
+    0,   /* mpi_enable */
     2   /*mpi_np */
 };
 

oshmem/mca/spml/base/base.h

@@ -94,7 +94,7 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_spml_base_framework;
 
 #define SPML_WARNING(...) \
     oshmem_output_verbose(0, oshmem_spml_base_framework.framework_output, \
-        "WARNING %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
+        "Warning %s:%d - %s()", __SPML_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
 
 END_C_DECLS
 

oshmem/mca/sshmem/base/base.h

@@ -142,7 +142,7 @@ OSHMEM_DECLSPEC extern mca_base_framework_t oshmem_sshmem_base_framework;
 
 #define SSHMEM_WARN(...) \
     oshmem_output_verbose(0, oshmem_sshmem_base_framework.framework_output, \
-        "Error %s:%d - %s()", __SSHMEM_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
+        "Warning %s:%d - %s()", __SSHMEM_FILE__, __LINE__, __FUNCTION__, __VA_ARGS__)
 
 END_C_DECLS