* update Red Storm compat code to match today's changes
This commit was SVN r6771.
Этот коммит содержится в:
родитель
e9ca560f16
Коммит
6e2b07db91
@ -29,31 +29,6 @@ mca_btl_portals_init_compat(mca_btl_portals_component_t *comp)
|
|||||||
{
|
{
|
||||||
int ret, max_interfaces;
|
int ret, max_interfaces;
|
||||||
uint32_t i;
|
uint32_t i;
|
||||||
struct mca_btl_portals_module_t *btl;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* create module - only ever one "NIC" on red storm
|
|
||||||
*/
|
|
||||||
comp->portals_num_modules = 1;
|
|
||||||
comp->portals_modules = calloc(comp->portals_num_modules,
|
|
||||||
sizeof(mca_btl_portals_module_t));
|
|
||||||
if (NULL == comp->portals_modules) {
|
|
||||||
opal_output_verbose(10, mca_btl_portals_component.portals_output,
|
|
||||||
"malloc failed in mca_btl_portals_init");
|
|
||||||
return OMPI_ERR_TEMP_OUT_OF_RESOURCE;
|
|
||||||
}
|
|
||||||
btl = &(comp->portals_modules[0]);
|
|
||||||
|
|
||||||
/* compat code is responsible for copying over the "template" onto
|
|
||||||
each module instance. The calling code will create the free
|
|
||||||
lists and the like - we're only responsible for the
|
|
||||||
Portals-specific entries */
|
|
||||||
for (i = 0 ; i < comp->portals_num_modules ; ++i) {
|
|
||||||
memcpy(&(comp->portals_modules[i]),
|
|
||||||
&mca_btl_portals_module,
|
|
||||||
sizeof(mca_btl_portals_module_t));
|
|
||||||
/* the defaults are good enough for the rest */
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Initialize Portals interface
|
* Initialize Portals interface
|
||||||
@ -71,8 +46,8 @@ mca_btl_portals_init_compat(mca_btl_portals_component_t *comp)
|
|||||||
ret = PtlNIInit(PTL_IFACE_DEFAULT, /* interface to initialize */
|
ret = PtlNIInit(PTL_IFACE_DEFAULT, /* interface to initialize */
|
||||||
PTL_PID_ANY, /* let library assign our pid */
|
PTL_PID_ANY, /* let library assign our pid */
|
||||||
NULL, /* no desired limits */
|
NULL, /* no desired limits */
|
||||||
&(btl->portals_ni_limits), /* save our limits somewhere */
|
NULL, /* actual limits */
|
||||||
&(btl->portals_ni_h) /* our interface handle */
|
&(mca_btl_portals_module.portals_ni_h) /* our interface handle */
|
||||||
);
|
);
|
||||||
if (PTL_OK != ret && PTL_IFACE_DUP != ret) {
|
if (PTL_OK != ret && PTL_IFACE_DUP != ret) {
|
||||||
opal_output_verbose(10, mca_btl_portals_component.portals_output,
|
opal_output_verbose(10, mca_btl_portals_component.portals_output,
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user