- Just changes to comments, deletion of spaces to make diff smaller
This commit was SVN r7030.
Этот коммит содержится в:
родитель
56f722c6c1
Коммит
f52784bad3
@ -292,7 +292,7 @@ typedef int (*orte_gpr_base_module_put_nb_fn_t)(size_t cnt, orte_gpr_value_t **v
|
||||
* described by the segment/token combination are to be returned.
|
||||
*
|
||||
* @param *cnt (OUT) A pointer to the number of objects returned by the request.
|
||||
* @param **values (OUT) A pointer to an array of orte_gpr_value_t object pointers
|
||||
* @param ***values (OUT) A pointer to an array of orte_gpr_value_t object pointers
|
||||
* containing the data
|
||||
* returned by the specified search, including the segment and container id info
|
||||
* for each keyval pair.
|
||||
@ -302,8 +302,11 @@ typedef int (*orte_gpr_base_module_put_nb_fn_t)(size_t cnt, orte_gpr_value_t **v
|
||||
*
|
||||
* @code
|
||||
* opal_list_t *keyval_list;
|
||||
* size_t cnt;
|
||||
* orte_gpr_value_t **values;
|
||||
*
|
||||
* status_code = orte_gpr.get(addr_mode, segment, tokens, keyval_list);
|
||||
* status_code = orte_gpr.get(addr_mode, segment, tokens, keyval_list,
|
||||
* &cnt, &values);
|
||||
* @endcode
|
||||
*/
|
||||
typedef int (*orte_gpr_base_module_get_fn_t)(orte_gpr_addr_mode_t addr_mode,
|
||||
|
@ -35,7 +35,6 @@
|
||||
*/
|
||||
static opal_list_item_t *cur_node_item = NULL;
|
||||
|
||||
|
||||
static int claim_slot(orte_rmaps_base_map_t *map,
|
||||
orte_ras_node_t *current_node,
|
||||
orte_jobid_t jobid, orte_vpid_t vpid, int proc_index)
|
||||
@ -94,7 +93,7 @@ static int claim_slot(orte_rmaps_base_map_t *map,
|
||||
* apps.
|
||||
*/
|
||||
static int map_app_by_node(
|
||||
orte_app_context_t* app,
|
||||
orte_app_context_t* app,
|
||||
orte_rmaps_base_map_t* map,
|
||||
orte_jobid_t jobid,
|
||||
orte_vpid_t vpid_start,
|
||||
@ -148,6 +147,7 @@ static int map_app_by_node(
|
||||
if (ORTE_SUCCESS != rc) {
|
||||
return rc;
|
||||
}
|
||||
|
||||
if (node->node_slots_alloc == 0) {
|
||||
opal_list_remove_item(nodes, (opal_list_item_t*)node);
|
||||
OBJ_RELEASE(node);
|
||||
@ -206,7 +206,7 @@ static int map_app_by_node(
|
||||
* apps.
|
||||
*/
|
||||
static int map_app_by_slot(
|
||||
orte_app_context_t* app,
|
||||
orte_app_context_t* app,
|
||||
orte_rmaps_base_map_t* map,
|
||||
orte_jobid_t jobid,
|
||||
orte_vpid_t vpid_start,
|
||||
@ -251,6 +251,7 @@ static int map_app_by_slot(
|
||||
if (ORTE_SUCCESS != rc) {
|
||||
return rc;
|
||||
}
|
||||
|
||||
++rank;
|
||||
++proc_index;
|
||||
|
||||
@ -267,7 +268,7 @@ static int map_app_by_slot(
|
||||
|
||||
cur_node_item = next;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* Did we allocate everything? */
|
||||
|
||||
@ -322,7 +323,7 @@ static int orte_rmaps_rr_map(orte_jobid_t jobid)
|
||||
|
||||
/* query for all nodes allocated to this job */
|
||||
OBJ_CONSTRUCT(&nodes, opal_list_t);
|
||||
if(ORTE_SUCCESS != (rc = orte_ras_base_node_query_alloc(&nodes,jobid))) {
|
||||
if(ORTE_SUCCESS != (rc = orte_ras_base_node_query_alloc(&nodes, jobid))) {
|
||||
OBJ_DESTRUCT(&nodes);
|
||||
return rc;
|
||||
}
|
||||
|
@ -36,7 +36,7 @@
|
||||
*/
|
||||
#define ORTE_JOB_SEGMENT "orte-job"
|
||||
#define ORTE_NODE_SEGMENT "orte-node"
|
||||
#define ORTE_JOBINFO_SEGMENT "orte_active_jobs"
|
||||
#define ORTE_JOBINFO_SEGMENT "orte-active-jobs"
|
||||
#define ORTE_RESOURCE_SEGMENT "orte-resources"
|
||||
|
||||
/*
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user