* Add OMPI_OUTPUT_VERBOSE macro that (like OMPI_OUTPUT) is a no-op when

debugging is disabled.
* convert one more output to only happen when debugging is enabled

This commit was SVN r5707.

src/mca/ptl/portals/src/ptl_portals_send.c

@@ -64,9 +64,9 @@ mca_ptl_portals_send(struct mca_ptl_base_module_t *ptl_base,
     mca_ptl_base_header_t* hdr;
     int ret;
 
-    ompi_output_verbose(100, mca_ptl_portals_component.portals_output,
-                        "mca_ptl_portals_send to %lu, %lu",
-                        peer_id->nid, peer_id->pid);
+    OMPI_OUTPUT_VERBOSE((100, mca_ptl_portals_component.portals_output,
+                         "mca_ptl_portals_send to %lu, %lu",
+                         peer_id->nid, peer_id->pid));
 
     if (sendreq->req_cached && offset == 0) {
         sendfrag = (mca_ptl_portals_send_frag_t*)(sendreq+1);

src/util/output.h

@@ -383,6 +383,15 @@ OMPI_DECLSPEC   void ompi_output_set_verbosity(int output_id, int level);
    * @see ompi_output()
    */
 #define OMPI_OUTPUT(a) ompi_output a
+
+    /** 
+     * Macro for use in sending debugging output to the output
+     * streams.  Will be "compiled out" when OMPI is configured
+     * without --enable-debug.
+     *
+     * @see ompi_output_verbose()
+     */
+#define OMPI_OUTPUT_VERBOSE(a) ompi_output_verbose a
 #else
   /**
    * Main macro for use in sending debugging output to output streams;
@@ -392,6 +401,15 @@ OMPI_DECLSPEC   void ompi_output_set_verbosity(int output_id, int level);
    * @see ompi_output()
    */
 #define OMPI_OUTPUT(a)
+
+    /** 
+     * Macro for use in sending debugging output to the output
+     * streams.  Will be "compiled out" when OMPI is configured
+     * without --enable-debug.
+     *
+     * @see ompi_output_verbose()
+     */
+#define OMPI_OUTPUT_VERBOSE(a)
 #endif
 #if defined(c_plusplus) || defined(__cplusplus)
 }