Remove lingering references to opal_profile option

This commit was SVN r24709.

ompi/mca/bml/base/bml_base_init.c

@@ -88,9 +88,6 @@ int mca_bml_base_init( bool enable_progress_threads,
     else { 
         mca_bml_component = *best_component; 
         mca_bml = *best_module; 
-        if (opal_profile) {
-            opal_output(0, "bml:%s", mca_bml_component.bml_version.mca_component_name);
-        }
         return mca_base_components_close(mca_bml_base_output, 
                                          &mca_bml_base_components_available, 
                                          (mca_base_component_t*) best_component); 

ompi/mca/btl/base/btl_base_select.c

@@ -133,10 +133,6 @@ int mca_btl_base_select(bool enable_progress_threads,
                                     "select: init of component %s returned success",
                                     component->btl_version.mca_component_name);
 
-                if (opal_profile) {
-                    opal_output(0, "btl:%s", component->btl_version.mca_component_name);
-                }
-                
                 for (i = 0; i < num_btls; ++i) {
                     sm = OBJ_NEW(mca_btl_base_selected_module_t);
                     if (NULL == sm) {

ompi/mca/pml/base/pml_base_select.c

@@ -255,10 +255,6 @@ int mca_pml_base_select(bool enable_progress_threads,
                          "select: component %s selected",
                          mca_pml_base_selected_component.pmlm_version.mca_component_name );
 
-    if (opal_profile) {
-        opal_output(0, "pml:%s",  mca_pml_base_selected_component.pmlm_version.mca_component_name );
-    }
-    
     /* This base function closes, unloads, and removes from the
        available list all unselected components.  The available list will
        contain only the selected component. */

opal/mca/base/mca_base_components_select.c

@@ -118,9 +118,6 @@ int mca_base_select(const char *type_name, int output_id,
     opal_output_verbose(5, output_id,
                         "mca:base:select:(%5s) Selected component [%s]",
                         type_name, (*best_component)->mca_component_name);
-    if (opal_profile) {
-        opal_output(0, "%s:%s", type_name, (*best_component)->mca_component_name);
-    }
     
     /*
      * Close the non-selected components

opal/runtime/opal.h

@@ -30,10 +30,6 @@ BEGIN_C_DECLS
 /** version string of opal */
 OPAL_DECLSPEC extern const char opal_version_string[];
 
-/* profile flag */
-OPAL_DECLSPEC extern bool opal_profile;
-OPAL_DECLSPEC extern char *opal_profile_file;
-
 /* Size of a cache line.  To be replaced with real hwloc info (in
    trunk/v1.5 and beyond, only), but for the moment, just move it here
    so that we can remove opal/include/sys/cache.h whose only purpose

opal/runtime/opal_init.c

@@ -67,8 +67,6 @@ const char opal_version_string[] = OPAL_IDENT_STRING;
 
 int opal_initialized = 0;
 int opal_util_initialized = 0;
-bool opal_profile = false;
-char *opal_profile_file = NULL;
 int opal_cache_line_size;
 
 static int

opal/runtime/opal_params.c

@@ -77,19 +77,6 @@ int opal_register_params(void)
         free(string);
     }
 
-    {
-        int j;
-
-        mca_base_param_reg_int_name("opal", "profile", 
-                                    "Set to non-zero to profile component selections",
-                                    false, false, (int)false, &j);
-        opal_profile = OPAL_INT_TO_BOOL(j);
-
-        mca_base_param_reg_string_name("opal", "profile_file", 
-                                       "Name of the file containing the cluster configuration information",
-                                       false, false, NULL, &opal_profile_file);
-    }
-    
 #if OPAL_ENABLE_DEBUG
 
 

orte/mca/grpcomm/base/base.h

@@ -59,7 +59,6 @@ typedef struct {
     bool selected;
     opal_list_t components_available;
     orte_grpcomm_base_component_t selected_component;
-    int profile_fd;
     orte_grpcomm_daemon_collective_fn_t daemon_coll;
 } orte_grpcomm_base_t;
 

orte/mca/grpcomm/base/grpcomm_base_open.c

@@ -53,7 +53,6 @@ int orte_grpcomm_base_open(void)
     /* Debugging / verbose output.  Always have stream open, with
        verbose set by the mca open system... */
     orte_grpcomm_base.output = opal_output_open(NULL);
-    orte_grpcomm_base.profile_fd = -1;
     
     /* define the default daemon collective fn */
 #if ORTE_DISABLE_FULL_SUPPORT

orte/mca/grpcomm/hier/grpcomm_hier_module.c

@@ -427,18 +427,7 @@ static int modex(opal_list_t *procs)
                          ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
     
     /* if we were given a list of procs to modex with, then this is happening
-     * as part of a connect/accept operation. In this case, we -must- do the
+     * as part of a connect/accept operation
-     * modex for two reasons:
-     *
-     * (a) the modex could involve procs from different mpiruns. In this case,
-     *     there is no way for the two sets of procs to know which node the
-     *     other procs are on, so we cannot use the profile_file to determine
-     *     their contact info
-     *
-     * (b) in a comm_spawn, the parent job does not have a pidmap for the
-     *     child job. Thus, it cannot know where the child procs are located,
-     *     and cannot use the profile_file to determine their contact info
-     *
      */
     if (NULL != procs) {
         if (ORTE_SUCCESS != (rc = orte_grpcomm_base_full_modex(procs))) {

orte/mca/grpcomm/mcast/grpcomm_mcast.c

@@ -346,18 +346,7 @@ static int modex(opal_list_t *procs)
                          ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
     
     /* if we were given a list of procs to modex with, then this is happening
-     * as part of a connect/accept operation. In this case, we -must- do the
+     * as part of a connect/accept operation.
-     * modex for two reasons:
-     *
-     * (a) the modex could involve procs from different mpiruns. In this case,
-     *     there is no way for the two sets of procs to know which node the
-     *     other procs are on, so we cannot use the profile_file to determine
-     *     their contact info
-     *
-     * (b) in a comm_spawn, the parent job does not have a pidmap for the
-     *     child job. Thus, it cannot know where the child procs are located,
-     *     and cannot use the profile_file to determine their contact info
-     *
      */
     if (NULL != procs) {
         if (ORTE_SUCCESS != (rc = orte_grpcomm_base_full_modex(procs))) {

orte/mca/rml/rml_types.h

@@ -161,9 +161,6 @@ ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_msg_packet_t);
 /* debugger release */
 #define ORTE_RML_TAG_DEBUGGER_RELEASE       32
 
-/* profile data */
-#define ORTE_RML_TAG_GRPCOMM_PROFILE        33
-
 /* bootstrap */
 #define ORTE_RML_TAG_BOOTSTRAP              34
 

orte/orted/orted_main.c

@@ -246,13 +246,6 @@ int orte_daemon(int argc, char *argv[])
      */
     mca_base_cmd_line_process_args(cmd_line, &environ, &environ);
     
-    /* make sure that opal_profile is -not- set as we do not care
-     * what frameworks are opened by the daemons
-     */
-    if (NULL != getenv("OMPI_MCA_opal_profile")) {
-        putenv("OMPI_MCA_opal_profile=0");
-    }
-    
     /* Ensure that enough of OPAL is setup for us to be able to run */
     /*
      * NOTE: (JJH)

orte/runtime/help-orte-runtime.txt

@@ -43,22 +43,6 @@ a different location to be used (use -h to see the cmd line option), or
 simply let the system pick a default location.
 #
 #
-[orte_nidmap:file-cant-open]
-Unable to open the file that was to contain the cluster's profile. The file
-name we were given was:
-
-FILE: %s
-
-Please check to ensure this file exists and has appropriate read permissions.
-#
-[orte_nidmap:unable-read-file]
-An error occurred while trying to read the file containing the cluster's profile.
-The file we were reading was:
-
-FILE: %s
-
-Please check that this file was correctly generated.
-#
 [orte_nidmap:too_many_nodes]
 An error occurred while trying to pack the information about the job. More nodes
 have been found than the %d expected. Please check your configuration files such

orte/runtime/orte_globals.c

@@ -109,9 +109,6 @@ opal_pointer_array_t *orte_node_pool;
 /* a clean output channel without prefix */
 int orte_clean_output = -1;
 
-/* RHC: FLAG TO SELECT WHETHER OR NOT TO SEND PROFILE FILE IN NIDMAP */
-bool orte_send_profile;
-
 /* Nidmap and job maps */
 opal_pointer_array_t orte_nidmap;
 opal_pointer_array_t orte_jobmap;

orte/runtime/orte_globals.h

@@ -622,9 +622,6 @@ ORTE_DECLSPEC extern opal_pointer_array_t *orte_node_pool;
 /* a clean output channel without prefix */
 ORTE_DECLSPEC extern int orte_clean_output;
 
-/* RHC: FLAG TO SELECT WHETHER OR NOT TO SEND PROFILE FILE IN NIDMAP */
-ORTE_DECLSPEC extern bool orte_send_profile;
-
 /* Nidmap and job maps */
 ORTE_DECLSPEC extern opal_pointer_array_t orte_nidmap;
 ORTE_DECLSPEC extern opal_pointer_array_t orte_jobmap;

orte/runtime/orte_mca_params.c

@@ -100,12 +100,6 @@ int orte_register_params(void)
 
 #if !ORTE_DISABLE_FULL_SUPPORT
     
-    mca_base_param_reg_int_name("orte", "send_profile",
-                                "Send profile info in launch message",
-                                false, false,
-                                (int) false, &value);
-    orte_send_profile = OPAL_INT_TO_BOOL(value);
-
     mca_base_param_reg_int_name("orte", "debug",
                                 "Top-level ORTE debug switch (default verbosity: 1)",
                                 false, false, (int)false, &value);

orte/tools/orterun/orterun.c

@@ -109,7 +109,6 @@ static bool have_zero_np = false;
 static orte_std_cntr_t total_num_apps = 0;
 static bool want_prefix_by_default = (bool) ORTE_WANT_ORTERUN_PREFIX_BY_DEFAULT;
 static char *ompi_server=NULL;
-static bool profile_is_set = false;
 
 /*
  * Globals
@@ -1476,10 +1475,6 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr,
             free(param);
         }
     }
-    /* if profile was set, add it back in */
-    if (profile_is_set) {
-        opal_setenv("OMPI_MCA_opal_profile", "1", true, &app->env);
-    }
     
     /* add the ompi-server, if provided */
     if (NULL != ompi_server) {

orte/util/nidmap.c

@@ -387,40 +387,7 @@ int orte_util_encode_nodemap(opal_byte_object_t *boptr)
         return rc;
     }
     free(oversub);
-    
+        
-   /* check if we are to send the profile file data */
-    if (orte_send_profile) {
-        int fd;
-        opal_byte_object_t bo, *bptr;
-
-        /* there must be a file specified */
-        if (NULL == opal_profile_file) {
-            /* print an error message */
-            return ORTE_ERR_BAD_PARAM;
-        }
-        fd = open(opal_profile_file, O_RDONLY);
-        if (fd < 0) {
-            orte_show_help("help-orte-runtime.txt", "orte_nidmap:file-cant-open", true, opal_profile_file);
-            return ORTE_ERR_FILE_OPEN_FAILURE;
-        }
-        /* loop through file until end */
-        bptr = &bo;
-        while (0 < read(fd, &bo.size, sizeof(bo.size))) {
-            /* this is the number of bytes in the byte object */
-            bo.bytes = (uint8_t *) malloc(bo.size);
-            if (0 > read(fd, bo.bytes, bo.size)) {
-                orte_show_help("help-orte-runtime.txt", "orte_nidmap:unable-read-file", true, opal_profile_file);
-                close(fd);
-                return ORTE_ERR_FILE_READ_FAILURE;
-            }
-            if (ORTE_SUCCESS != (rc = opal_dss.pack(&buf, &bptr, 1, OPAL_BYTE_OBJECT))) {
-                ORTE_ERROR_LOG(rc);
-                return rc;
-            }
-            free(bo.bytes);
-        }
-    }
-    
     /* transfer the payload to the byte object */
     opal_dss.unload(&buf, (void**)&boptr->bytes, &boptr->size);
     OBJ_DESTRUCT(&buf);