Fixed merge issues, and minor pull-request comments

	modified:   ../orte/mca/rml/base/base.h
	modified:   ../orte/mca/rml/base/rml_base_frame.c
	modified:   ../orte/mca/rml/ofi/rml_ofi.h
	modified:   ../orte/mca/rml/ofi/rml_ofi_component.c

Author: anandhis

orte/mca/rml/base/base.h

@@ -145,9 +145,6 @@ typedef struct {
     opal_object_t super;
     opal_event_t ev;
     orte_rml_send_t send;
-    //[Anandhi] fix this, maybe define this withing ofi?
-    /* ofi_prov_id */
-    orte_rml_conduit_t ofi_prov_id;
 } orte_rml_send_request_t;
 OBJ_CLASS_DECLARATION(orte_rml_send_request_t);
 

orte/mca/rml/base/rml_base_frame.c

@@ -205,31 +205,6 @@ int orte_rml_base_select(void)
         }
     }
 
-    /* Open the default oob conduit */
-    /*opal_output_verbose(10, orte_rml_base_framework.framework_output,
-                        "%s Opening the default conduit - oob component",
-                        ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); */
-    opal_output_verbose(10, orte_rml_base_framework.framework_output,
-                         "%s Opening the default conduit ",
-                         ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)); 
-    OBJ_CONSTRUCT(&conduit_attr, opal_list_t);
-    
-    orte_set_attribute(&conduit_attr, ORTE_RML_INCLUDE_COMP_ATTRIB, ORTE_ATTR_LOCAL,"oob",OPAL_STRING); 
-    /* To set the default conduit to ofi-sockets, comment above line and uncomment below 2 lines*/
-    //orte_set_attribute( &conduit_attr, ORTE_RML_INCLUDE_COMP_ATTRIB, ORTE_ATTR_GLOBAL,"ofi",OPAL_STRING);
-    //orte_set_attribute( &conduit_attr, ORTE_RML_PROVIDER_ATTRIB, ORTE_ATTR_GLOBAL,"sockets",OPAL_STRING);
-
-    orte_rml_base.def_conduit_id = orte_rml_API_open_conduit(&conduit_attr);
-    OPAL_LIST_DESTRUCT(&conduit_attr);
-    if (0 <= orte_rml_base.def_conduit_id) {
-        opal_output_verbose(10, orte_rml_base_framework.framework_output,
-                            "%s Default conduit opened with conduit id = %d",
-                            ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), orte_rml_base.def_conduit_id);
-    } else {
-        opal_output_verbose(1, orte_rml_base_framework.framework_output,
-                            "%s Default conduit could not be opened",
-                            ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
-    }
     return ORTE_SUCCESS;
 }
 

orte/mca/rml/ofi/rml_ofi.h

@@ -32,9 +32,9 @@
 
 /** RML/OFI key values  **/
 /* (char*)  ofi socket address (type IN) of the node process is running on */
-#define OPAL_RML_OFI_FI_SOCKADDR_IN       "rml.ofi.fisockaddrin" 
+#define OPAL_RML_OFI_FI_SOCKADDR_IN     "rml.ofi.fisockaddrin"
 /* (char*)  ofi socket address (type PSM) of the node process is running on */
-#define OPAL_RML_OFI_FI_ADDR_PSMX                  "rml.ofi.fiaddrpsmx"
+#define OPAL_RML_OFI_FI_ADDR_PSMX       "rml.ofi.fiaddrpsmx"
 
 // MULTI_BUF_SIZE_FACTOR defines how large the multi recv buffer will be.
 // In order to use FI_MULTI_RECV feature efficiently, we need to have a

orte/mca/rml/ofi/rml_ofi_component.c

@@ -28,6 +28,7 @@
 
 #include "rml_ofi.h"
 
+
 static int rml_ofi_component_open(void);
 static int rml_ofi_component_close(void);
 static orte_rml_base_module_t* open_conduit(opal_list_t *attributes);
@@ -325,7 +326,6 @@ void print_provider_list_info (struct fi_info *fi )
  * This returns all the supported transports in the system that support endpoint type RDM (reliable datagram)
  * The providers returned is a list of type opal_valut_t holding opal_list_t
  */
-/*[Anandhi] old defn static int orte_rml_ofi_query_transports(opal_value_t **providers) */
 static orte_rml_pathway_t* query_transports(void)
 {
     opal_list_t *ofi_prov = NULL;
@@ -334,139 +334,11 @@ static orte_rml_pathway_t* query_transports(void)
     int ret = 0, ofi_prov_num = 0;
 
  opal_output_verbose(10,orte_rml_base_framework.framework_output,
-                        "\n%s:%d OFI Query Interface not implemented",__FILE__,__LINE__);
-/* [Anandhi] comment fully for now, as this implementation is for old defn needs to be re-written
-    opal_output_verbose(10,orte_rml_base_framework.framework_output,
-                        " %s -Begin of query_transports()",ORTE_NAME_PRINT(ORTE_PROC_MY_NAME) );
-    if ( NULL == *providers)
-    {
-        *providers = OBJ_NEW(opal_value_t);
-    }
-
-    providers_list = *providers;
-
-    //Create the opal_value_t list in which each item is an opal_list_t that holds the provider details
-    opal_output_verbose(10,orte_rml_base_framework.framework_output,
-      "Starting to add the providers in a loop from orte_rml_ofi.ofi_prov[] %s:%d",__FILE__,__LINE__);
+                        "%s:%d OFI Query Interface not implemented",__FILE__,__LINE__);
 
-    for ( ofi_prov_num = 0; ofi_prov_num < orte_rml_ofi.ofi_prov_open_num ; ofi_prov_num++ ) {
-        cur_fi = orte_rml_ofi.ofi_prov[ofi_prov_num].fabric_info;
-        if( NULL != prev_provider)
-        {
-           //if there is another provider in the array, then add another item to the providers_list
-           next_provider = OBJ_NEW(opal_value_t);
-           providers_list->super.opal_list_next = &next_provider->super;
-           providers_list->super.opal_list_prev = &prev_provider->super;
-           providers_list = (opal_value_t *)providers_list->super.opal_list_next;
-        }
-
-        /*  populate the opal_list_t *ofi_prov with provider details from the
-         *  orte_rml_ofi.fi_info_list array populated in the rml_ofi_component_init() fn.*/
-/*        ofi_prov = OBJ_NEW(opal_list_t);
-        opal_output_verbose(10,orte_rml_base_framework.framework_output,
-                            "\n loading the attribute ORTE_PROVIDER_ID");
-        if( ORTE_SUCCESS !=
-                (ret = orte_set_attribute( ofi_prov, ORTE_PROVIDER_ID, ORTE_ATTR_GLOBAL,
-                       (void *)&orte_rml_ofi.ofi_prov[ofi_prov_num].ofi_prov_id ,OPAL_UINT8))) {
-            opal_output_verbose(1,orte_rml_base_framework.framework_output,
-                                       "%s:%d Not able to add provider ofi_prov_id ",__FILE__,__LINE__);
-                   return ORTE_ERROR;
-        }
-        opal_output_verbose(10,orte_rml_base_framework.framework_output,
-                     "\n provider ofi_prov_id : %d",orte_rml_ofi.ofi_prov[ofi_prov_num].ofi_prov_id);
-        opal_output_verbose(10,orte_rml_base_framework.framework_output,
-                            "\n loading the attribute ORTE_PROV_NAME");
-        if( ORTE_SUCCESS ==
-            (ret = orte_set_attribute( ofi_prov, ORTE_PROV_NAME, ORTE_ATTR_GLOBAL,cur_fi->fabric_attr->prov_name ,OPAL_STRING))) {
-            opal_output_verbose(10,orte_rml_base_framework.framework_output,
-                                "\n loading the attribute ORTE_PROTOCOL %s",fi_tostr(&cur_fi->ep_attr->protocol,FI_TYPE_PROTOCOL));
-            if( ORTE_SUCCESS ==
-                (ret = orte_set_attribute( ofi_prov, ORTE_PROTOCOL, ORTE_ATTR_GLOBAL,(void *)&cur_fi->ep_attr->protocol ,OPAL_UINT32))) {
-               // insert the opal_list_t into opal_value_t list
-               opal_value_load(providers_list,ofi_prov,OPAL_PTR);
-               opal_output_verbose(10,orte_rml_base_framework.framework_output,
-                                  "\n loading the provider opal_list_t* prov=%x into opal_value_t list successful",
-                                  ofi_prov);
-            } else {
-                   opal_output_verbose(1,orte_rml_base_framework.framework_output,
-                                       "%s:%d Not able to add provider name ",__FILE__,__LINE__);
-                   return ORTE_ERROR;
-            }
-        } else {
-               opal_output_verbose(1,orte_rml_base_framework.framework_output,
-                                   "%s:%d Not able to add provider name ",__FILE__,__LINE__);
-               return ORTE_ERROR;
-        }
-
-        prev_provider = providers_list;
-        cur_fi = cur_fi->next;
-    }
-
-    opal_output_verbose(10,orte_rml_base_framework.framework_output,
-                        "\n%s:%d Completed Query Interface",__FILE__,__LINE__);*/
     return ORTE_SUCCESS;
 }
 
-
-/*debug routine to print the opal_value_t returned by query interface */
-/* [Anandhi] - this has to be re-written
-void print_transports_query()
-{
-    opal_value_t *providers=NULL;
-    char* prov_name = NULL;
-    int ret;
-    int32_t *protocol_ptr, protocol;
-    int8_t* prov_num;
-
-    protocol_ptr = &protocol;
-
-    opal_output_verbose(10,orte_rml_base_framework.framework_output,
-                        "\n print_transports_query() Begin- %s:%d",__FILE__,__LINE__);
-    opal_output_verbose(10,orte_rml_base_framework.framework_output,
-                        "\n calling the orte_rml_ofi_query_transports() ");
-    if( ORTE_SUCCESS == orte_rml_ofi_query_transports(&providers))
-    {
-        opal_output_verbose(20,orte_rml_base_framework.framework_output,
-                "\n query_transports() completed, printing details\n");
-        while (providers)
-        {
-            //get the first opal_list_t;
-            opal_list_t *prov;
-            ret = opal_value_unload(providers,(void **)&prov,OPAL_PTR);
-            if (ret == OPAL_SUCCESS) {
-                if( orte_get_attribute( prov, ORTE_PROVIDER_ID, (void **)&prov_num,OPAL_UINT8)) {
-                    opal_output_verbose(10,orte_rml_base_framework.framework_output,
-                                        "\n OFI Provider ofi_prov_id  : %d",*prov_num);
-                }
-                if( orte_get_attribute( prov, ORTE_PROTOCOL, (void **)&protocol_ptr,OPAL_UINT32)) {
-                    opal_output_verbose(10,orte_rml_base_framework.framework_output,
-                                        "\n Protocol  : %d", *protocol_ptr);
-                }
-                if( orte_get_attribute( prov, ORTE_PROV_NAME, (void **)&prov_name ,OPAL_STRING)) {
-                    opal_output_verbose(10,orte_rml_base_framework.framework_output,
-                                        "\n Provider name : %s",prov_name);
-                } else {
-                    opal_output_verbose(10,orte_rml_base_framework.framework_output,
-                                    "\n Error in getting Provider name");
-                }
-            } else {
-                opal_output_verbose(1,orte_rml_base_framework.framework_output,
-                                    "\n %s:%d opal_value_unload() failed, opal_list* prov = %x",
-                                   __FILE__,__LINE__,prov);
-            }
-            providers = (opal_value_t *)providers->super.opal_list_next;
-        }
-    } else {
-        opal_output_verbose(10,orte_rml_base_framework.framework_output,
-                            "\n query_transports() returned Error ");
-    }
-    opal_output_verbose(10,orte_rml_base_framework.framework_output,
-                        "\n End of print_transports_query() \n");
-}
-*/
-
-
-
 /**
     ofi_prov [in]: the ofi ofi_prov_id that triggered the progress fn
  **/
@@ -640,7 +512,7 @@ int cq_progress_handler(int sd, short flags, void *cbdata)
 /* 
  * Returns the number of ofi-providers available
  */
-int rml_ofi_component_init()
+int rml_ofi_component_init(void)
 {
     int ret, fi_version;
     struct fi_info *hints, *fabric_info;
@@ -1165,7 +1037,7 @@ static orte_rml_base_module_t* make_module( int ofi_prov_id)
 * ORTE_RML_PROVIDER_ATTRIB               */
 static orte_rml_base_module_t* open_conduit(opal_list_t *attributes)
 {
-char *comp_attrib = NULL;
+    char *comp_attrib = NULL;
     char **comps;
     int i;
     orte_attribute_t *attr;
@@ -1220,6 +1092,7 @@ char *comp_attrib = NULL;
     /* Alternatively, check the attributes to see if we qualify - we only handle
      * "pt2pt" */
     OPAL_LIST_FOREACH(attr, attributes, orte_attribute_t) {
+        /* [TODO] add any additional attributes check here */
 
     }
 
@@ -1231,7 +1104,6 @@ char *comp_attrib = NULL;
 }
 
 
-
 static void orte_rml_ofi_fini(void *mod)
 {
     opal_list_item_t *item;
@@ -1370,9 +1242,9 @@ static void process_uri( char *uri)
          * the first containing the process name of our peer
          * and all others containing the OOB contact info
          */
-        ORTE_ERROR_LOG(ORTE_ERR_BAD_PARAM);
+        //[Anandhi] debug -> ORTE_ERROR_LOG(ORTE_ERR_BAD_PARAM);
         return;
-    }
+    } 
     *cptr = '\0';
     cptr++;
 
@@ -1474,9 +1346,10 @@ static void process_uri( char *uri)
 /* converts the socket uri returned by get_contact_info into sockaddr_in */
 void convert_to_sockaddr( char *ofiuri, struct sockaddr_in* ep_sockaddr)
 {
-char *tmp, *sin_fly, *sin_port, *sin_addr;
-short port;  
-int   res;              
+    char *tmp, *sin_fly, *sin_port, *sin_addr;
+    short port;
+    int   res;
+
     tmp = strchr(ofiuri,':');
     sin_fly = tmp+1;
     tmp = strchr(sin_fly,',');
@@ -1494,7 +1367,8 @@ int   res;
     ep_sockaddr->sin_port   = htons(port);
     res = inet_aton(sin_addr,(struct in_addr *)&ep_sockaddr->sin_addr);
 
-            opal_output_verbose(1,orte_rml_base_framework.framework_output,
-                            "%s OFI convert_to_sockaddr() port = 0x%x, InternetAddr = %s  ",
-                            ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),ntohs(ep_sockaddr->sin_port),inet_ntoa(ep_sockaddr->sin_addr));
+    opal_output_verbose(1,orte_rml_base_framework.framework_output,
+                        "%s OFI convert_to_sockaddr() port = 0x%x, InternetAddr = %s  ",
+                            ORTE_NAME_PRINT(ORTE_PROC_MY_NAME),ntohs(ep_sockaddr->sin_port),
+                            inet_ntoa(ep_sockaddr->sin_addr));
 }