Turns out that there was exactly ONE place in all of the OMPI code base that still referred to OPAL_TRACE, though a few places retained the include file for no reason. So no point in letting this sit as it is clearly an unused "feature".

This commit was SVN r28789.
2013-07-14 18:57:20 +00:00 · 2013-07-14 18:57:20 +00:00 · 10ca1c1b04
--- a/config/opal_configure_options.m4
+++ b/config/opal_configure_options.m4
@ -17,6 +17,7 @@ dnl Copyright (c) 2009      Los Alamos National Security, LLC.  All rights
 dnl                         reserved.
 dnl Copyright (c) 2009-2011 Oak Ridge National Labs.  All rights reserved.
 dnl Copyright (c) 2011-2013 NVIDIA Corporation.  All rights reserved.
+dnl Copyright (c) 2013      Intel, Inc. All rights reserved
 dnl
 dnl $COPYRIGHT$
 dnl 
@ -301,26 +302,6 @@ AC_DEFINE_UNQUOTED([OPAL_ENABLE_HETEROGENEOUS_SUPPORT],
                   [Enable features required for heterogeneous support])


-#
-# Internal trace file logging (debugging)
-#
-
-AC_MSG_CHECKING([if want trace file debugging])
-AC_ARG_ENABLE([trace],
-    [AC_HELP_STRING([--enable-trace],
-                    [Enable internal tracing of OMPI/ORTE/OPAL calls -- used only for developer debugging, not tracing of MPI applications (default: disabled)])])
-if test "$enable_trace" = "yes"; then
-    AC_MSG_RESULT([yes])
-    opal_want_trace=1
-else
-    AC_MSG_RESULT([no])
-    opal_want_trace=0
-fi
-AC_DEFINE_UNQUOTED([OPAL_ENABLE_TRACE], [$opal_want_trace],
-                   [Enable run-time tracing of internal functions])
-
-
-
 #
 # Cross-compile data
 #
--- a/contrib/check_unnecessary_headers.sh
+++ b/contrib/check_unnecessary_headers.sh
@ -126,8 +126,7 @@ SEARCH_HEADER[41]="opal/util/printf.h snprintf vsnprintf asprintf vasprintf"
 SEARCH_HEADER[42]="opal/util/show_help.h opal_show_help_init opal_show_help_finalize opal_show_help opal_show_vhelp opal_show_help_string opal_show_help_finish_parsing"
 SEARCH_HEADER[43]="opal/util/strncpy.h opal_strncpy"
 SEARCH_HEADER[44]="opal/util/sys_limits.h opal_sys_limits opal_util_init_sys_limits"
-SEARCH_HEADER[45]="opal/util/trace.h OPAL_TRACE opal_trace_handle opal_trace_init opal_trace_finalize"
-SEARCH_HEADER[46]=""
+SEARCH_HEADER[45]=""

 delete_unnessary_header .

--- a/opal/runtime/opal_finalize.c
+++ b/opal/runtime/opal_finalize.c
@ -12,6 +12,7 @@
 * Copyright (c) 2008-2012 Cisco Systems, Inc.  All rights reserved.
 * Copyright (c) 2010-2013 Los Alamos National Security, LLC.
 *                         All rights reserved.
+ * Copyright (c) 2013      Intel, Inc. All rights reserved
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -25,7 +26,6 @@

 #include "opal/class/opal_object.h"
 #include "opal/dss/dss.h"
-#include "opal/util/trace.h"
 #include "opal/util/output.h"
 #include "opal/util/malloc.h"
 #include "opal/util/net.h"
@ -86,9 +86,6 @@ opal_finalize_util(void)
    /* finalize the memory allocator */
    opal_malloc_finalize();

-    /* finalize the trace system */
-    opal_trace_finalize();
-
    /* finalize the show_help system */
    opal_show_help_finalize();

--- a/opal/runtime/opal_init.c
+++ b/opal/runtime/opal_init.c
@ -15,6 +15,7 @@
 * Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
 * Copyright (c) 2010-2013 Los Alamos National Security, LLC.
 *                         All rights reserved.
+ * Copyright (c) 2013      Intel, Inc. All rights reserved
 * $COPYRIGHT$
 *
 * Additional copyrights may follow
@ -29,7 +30,6 @@
 #include "opal/util/malloc.h"
 #include "opal/util/arch.h"
 #include "opal/util/output.h"
-#include "opal/util/trace.h"
 #include "opal/util/show_help.h"
 #include "opal/memoryhooks/memory.h"
 #include "opal/mca/base/base.h"
@ -271,9 +271,6 @@ opal_init_util(int* pargc, char*** pargv)
        goto return_error;
    }

-    /* init the trace function */
-    opal_trace_init();
-
    /* keyval lex-based parser */
    if (OPAL_SUCCESS != (ret = opal_util_keyval_parse_init())) {
        error = "opal_util_keyval_parse_init";
--- a/opal/util/Makefile.am
+++ b/opal/util/Makefile.am
@ -11,6 +11,7 @@
 #                         All rights reserved.
 # Copyright (c) 2007-2010 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2013      NVIDIA Corporation.  All rights reserved.
+# Copyright (c) 2013      Intel, Inc. All rights reserved
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@ -64,7 +65,6 @@ headers = \
        stacktrace.h \
        strncpy.h \
        sys_limits.h \
-        trace.h \
 	uri.h

 libopalutil_la_SOURCES = \
@ -98,7 +98,6 @@ libopalutil_la_SOURCES = \
        stacktrace.c \
        strncpy.c \
        sys_limits.c \
-        trace.c \
 	uri.c

 libopalutil_la_LIBADD = \
--- a/opal/util/trace.c
+++ b/opal/util/trace.c
@ -1,77 +0,0 @@
-/* @file */
-/*
- * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
- *                         University Research and Technology
- *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
- *                         of Tennessee Research Foundation.  All rights
- *                         reserved.
- * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
- *                         University of Stuttgart.  All rights reserved.
- * Copyright (c) 2004-2005 The Regents of the University of California.
- *                         All rights reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- */
-
-#include "opal_config.h"
-#include "opal/util/output.h"
-#include "opal/mca/mca.h"
-#include "opal/mca/base/base.h"
-
-#include "opal/util/trace.h"
-
-int opal_trace_handle;
-
-/*
- * Local state
- */
-#if OPAL_ENABLE_TRACE
-static opal_output_stream_t tracer;
-#endif
-
-
-void opal_trace_init(void)
-{
-#if OPAL_ENABLE_TRACE
-
-    OBJ_CONSTRUCT(&tracer, opal_output_stream_t);
-
-    /* if the value is < 0, then we want the output to go to the screen */
-    if (0 > value) {
-        tracer.lds_want_file = false;
-        tracer.lds_want_stderr = true;
-        value = -1 * value;
-    } else if (0 == value) { /* don't provide any output */
-        opal_trace_handle = -1;
-        return;
-    } else {
-        /* get a file setup for opal_output to use for the trace */
-        tracer.lds_file_suffix = "trace";
-        tracer.lds_want_file = true;
-    }
-
-    tracer.lds_verbose_level = 0;
-    (void) mca_base_var_register ("opal", "trace", NULL, "verbose",
-                                  "Verbosity level for opal trace system",
-                                  MCA_BASE_VAR_TYPE_INT, NULL, 0,
-                                  MCA_BASE_VAR_VERBOSE_MPIDEV_ALL,
-                                  MCA_BASE_VAR_SCOPE_LOCAL,
-                                  &tracer.lds_verbose_level);
-
-    opal_trace_handle = opal_output_open(&tracer);
-#endif
-}
-
-void opal_trace_finalize(void)
-{
-#if OPAL_ENABLE_TRACE
-    mca_base_var_dereg_group (mca_base_var_find_group ("opal", "trace", NULL));
-
-    opal_output_close(opal_trace_handle);
-    OBJ_DESTRUCT(&tracer);
-#endif
-}
--- a/opal/util/trace.h
+++ b/opal/util/trace.h
@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
- *                         University Research and Technology
- *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2006 The University of Tennessee and The University
- *                         of Tennessee Research Foundation.  All rights
- *                         reserved.
- * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
- *                         University of Stuttgart.  All rights reserved.
- * Copyright (c) 2004-2005 The Regents of the University of California.
- *                         All rights reserved.
- * $COPYRIGHT$
- *
- * Additional copyrights may follow
- *
- * $HEADER$
- */
-
-#ifndef OPAL_TRACE_H_
-#define OPAL_TRACE_H_
-
-#include "opal_config.h"
-
-#ifndef OPAL_ENABLE_TRACE
-#define OPAL_ENABLE_TRACE 0
-#endif
-
-#if OPAL_ENABLE_TRACE
-
-#include "opal/util/output.h"
-
-#define OPAL_TRACE(verbose) \
-    do {                                                                       \
-        opal_output_verbose(verbose, opal_trace_handle, "TRACE: %s @ %s:%d",   \
-            __func__, __FILE__, __LINE__);                                     \
-       } while (0)
-
-#define OPAL_TRACE_ARG1(verbose, foo) \
-    do {                                                                       \
-        opal_output_verbose(verbose, opal_trace_handle, "TRACE: %s @ %s:%d arg: %lu",   \
-            __func__, __FILE__, __LINE__, (unsigned long)foo);                                     \
-       } while (0)
-
-#define OPAL_TRACE_ARG2(verbose, foo, foo2) \
-    do {                                                                       \
-        opal_output_verbose(verbose, opal_trace_handle, "TRACE: %s @ %s:%d arg: %lu\n\t0x%x",   \
-            __func__, __FILE__, __LINE__, (unsigned long)foo, (unsigned long)foo2);        \
-       } while (0)
-
-#else
-
-#define OPAL_TRACE(verbose)
-#define OPAL_TRACE_ARG1(verbose, foo)
-#define OPAL_TRACE_ARG2(verbose, foo, foo2)
-
-#endif /* ENABLE_TRACE */
-
-BEGIN_C_DECLS
-
-OPAL_DECLSPEC extern int opal_trace_handle;
-OPAL_DECLSPEC void opal_trace_init(void);
-OPAL_DECLSPEC void opal_trace_finalize(void);
-
-END_C_DECLS
-
-#endif /* OPAL_TRACE_H */
--- a/orte/mca/dfs/base/dfs_base_frame.c
+++ b/orte/mca/dfs/base/dfs_base_frame.c
@ -1,5 +1,6 @@
 /*
 * Copyright (c) 2012-2013 Los Alamos National Security, Inc.  All rights reserved. 
+ * Copyright (c) 2013      Intel, Inc. All rights reserved
 * $COPYRIGHT$
 * 
 * Additional copyrights may follow
@ -26,7 +27,6 @@

 #include "opal/util/opal_environ.h"
 #include "opal/util/output.h"
-#include "opal/util/trace.h"
 #include "opal/util/output.h"

 #include "orte/util/show_help.h"
--- a/orte/mca/errmgr/base/errmgr_base_fns.c
+++ b/orte/mca/errmgr/base/errmgr_base_fns.c
@ -13,6 +13,7 @@
 * Copyright (c) 2010-2011 Oak Ridge National Labs.  All rights reserved.
 * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
 *                         All rights reserved.
+ * Copyright (c) 2013      Intel, Inc. All rights reserved
 * $COPYRIGHT$
 * 
 * Additional copyrights may follow
@ -49,7 +50,6 @@

 #include "opal/mca/mca.h"
 #include "opal/mca/base/base.h"
-#include "opal/util/trace.h"
 #include "opal/util/os_dirpath.h"
 #include "opal/util/output.h"
 #include "opal/util/basename.h"
@ -182,8 +182,6 @@ void orte_errmgr_base_log(int error_code, char *filename, int line)
 {
    char *errstring = NULL;

-    OPAL_TRACE(1);
-    
    errstring = (char*)ORTE_ERROR_NAME(error_code);

    if (NULL == errstring) {
--- a/orte/mca/errmgr/base/errmgr_base_frame.c
+++ b/orte/mca/errmgr/base/errmgr_base_frame.c
@ -12,6 +12,7 @@
 * Copyright (c) 2010-2011 Oak Ridge National Labs.  All rights reserved.
 * Copyright (c) 2011-2013 Los Alamos National Security, LLC.
 *                         All rights reserved.
+ * Copyright (c) 2013      Intel, Inc. All rights reserved
 * $COPYRIGHT$
 * 
 * Additional copyrights may follow
@ -38,7 +39,6 @@

 #include "opal/util/opal_environ.h"
 #include "opal/util/output.h"
-#include "opal/util/trace.h"
 #include "opal/util/output.h"

 #include "orte/util/show_help.h"