Add a second trace option to pass an argument

This commit was SVN r7433.

opal/util/trace.h

@@ -33,13 +33,21 @@ extern "C" {
 #endif
 
 #define OPAL_TRACE(verbose) \
-    do {                                                    \
+    do {                                                                       \
         opal_output_verbose(verbose, opal_trace_handle, "TRACE: %s @ %s:%d",   \
-            __func__, __FILE__, __LINE__);                  \
+            __func__, __FILE__, __LINE__);                                     \
        } while (0)
+
+#define OPAL_TRACE_ARG(verbose, foo) \
+    do {                                                                       \
+        opal_output_verbose(verbose, opal_trace_handle, "TRACE: %s @ %s:%d arg: %lu",   \
+            __func__, __FILE__, __LINE__, (unsigned long)foo);                                     \
+       } while (0)
+        
 #else
 
 #define OPAL_TRACE(verbose)
+#define OPAL_TRACE_ARG(verbose, foo)
 
 #endif /* ENABLE_TRACE */
 

orte/tools/orterun/orterun.c

@@ -434,7 +434,7 @@ static void dump_aborted_procs(orte_jobid_t jobid)
         NULL
     };
 
-    OPAL_TRACE(1);
+    OPAL_TRACE_ARG(1, jobid);
     
     /* query the job segment on the registry */
     if(ORTE_SUCCESS != (rc = orte_schema.get_job_segment_name(&segment, jobid))) {
@@ -536,7 +536,7 @@ static void dump_aborted_procs(orte_jobid_t jobid)
 
 static void job_state_callback(orte_jobid_t jobid, orte_proc_state_t state)
 {
-    OPAL_TRACE(1);
+    OPAL_TRACE_ARG(1, jobid);
     
     OPAL_THREAD_LOCK(&orterun_globals.lock);