1
1
This commit was SVN r18463.
Этот коммит содержится в:
Rolf vandeVaart 2008-05-20 14:11:10 +00:00
родитель d45cb82ecc
Коммит 71091a19c3

Просмотреть файл

@ -157,8 +157,8 @@ int mca_coll_base_comm_select(ompi_communicator_t *comm)
/* do the selection loop */ /* do the selection loop */
for (item = opal_list_remove_first(selectable); for (item = opal_list_remove_first(selectable);
NULL != item; NULL != item;
item = opal_list_remove_first(selectable)) item = opal_list_remove_first(selectable)) {
{
avail_coll_t *avail = (avail_coll_t*) item; avail_coll_t *avail = (avail_coll_t*) item;
/* initialize the module */ /* initialize the module */
@ -239,7 +239,6 @@ static opal_list_t *check_components(opal_list_t *components,
avail_coll_t *avail, *avail2; avail_coll_t *avail, *avail2;
/* Make a list of the components that query successfully */ /* Make a list of the components that query successfully */
selectable = OBJ_NEW(opal_list_t); selectable = OBJ_NEW(opal_list_t);
/* Scan through the list of components. This nested loop is O(N^2), /* Scan through the list of components. This nested loop is O(N^2),
@ -274,14 +273,12 @@ static opal_list_t *check_components(opal_list_t *components,
/* We have a component that indicated that it wants to run by /* We have a component that indicated that it wants to run by
giving us a module */ giving us a module */
avail = OBJ_NEW(avail_coll_t); avail = OBJ_NEW(avail_coll_t);
avail->ac_priority = priority; avail->ac_priority = priority;
avail->ac_module = module; avail->ac_module = module;
/* Put this item on the list in priority order (lowest /* Put this item on the list in priority order (lowest
priority first). Should it go first? */ priority first). Should it go first? */
for(item2 = opal_list_get_first(selectable); for(item2 = opal_list_get_first(selectable);
item2 != opal_list_get_end(selectable); item2 != opal_list_get_end(selectable);
item2 = opal_list_get_next(item2)) { item2 = opal_list_get_next(item2)) {
@ -301,14 +298,12 @@ static opal_list_t *check_components(opal_list_t *components,
} }
/* If we didn't find any available components, return an error */ /* If we didn't find any available components, return an error */
if (0 == opal_list_get_size(selectable)) { if (0 == opal_list_get_size(selectable)) {
OBJ_RELEASE(selectable); OBJ_RELEASE(selectable);
return NULL; return NULL;
} }
/* All done */ /* All done */
return selectable; return selectable;
} }