Clean-up the DSS API to remove two functions that are supposed to be used solely internally to the DSS. These were likely exposed because we need to call them when packing/unpacking declared types, but this means that developers may accidentally use the wrong functions, causing the DSS buffer to get confused. Instead, return the system to the way it used to work and hide those functions.
This commit was SVN r18684.
Этот коммит содержится в:
Ralph Castain
родитель
bc9b950162
Коммит
26c9ad5799
@ -546,15 +546,6 @@ typedef char* (*opal_dss_lookup_data_type_fn_t)(opal_data_type_t type);
|
||||
*/
|
||||
typedef void (*opal_dss_dump_data_types_fn_t)(int output);
|
||||
|
||||
/* utility funtions for specialized packing and unpacking.
|
||||
* These are useful for creating pack/unpack functions for user
|
||||
* defined types. these are NOT for general purpose use */
|
||||
typedef int (*opal_dss_pack_buffer_fn_t)(opal_buffer_t *buffer, const void *src,
|
||||
int32_t num_values, opal_data_type_t type);
|
||||
typedef int (*opal_dss_unpack_buffer_fn_t)(opal_buffer_t *buffer, void *dest,
|
||||
int32_t *num_values,
|
||||
opal_data_type_t type);
|
||||
|
||||
|
||||
/**
|
||||
* Base structure for the DSS
|
||||
@ -581,8 +572,6 @@ struct opal_dss_t {
|
||||
opal_dss_lookup_data_type_fn_t lookup_data_type;
|
||||
opal_dss_dump_data_types_fn_t dump_data_types;
|
||||
opal_dss_dump_fn_t dump;
|
||||
opal_dss_pack_buffer_fn_t pack_buffer;
|
||||
opal_dss_unpack_buffer_fn_t unpack_buffer;
|
||||
};
|
||||
typedef struct opal_dss_t opal_dss_t;
|
||||
|
||||
|
||||
@ -261,7 +261,7 @@ extern opal_data_type_t opal_dss_num_reg_types;
|
||||
void opal_dss_dump_data_types(int output);
|
||||
|
||||
/*
|
||||
* Specialized API functions
|
||||
* Specialized functions
|
||||
*/
|
||||
int opal_dss_pack_buffer(opal_buffer_t *buffer, const void *src,
|
||||
int32_t num_vals, opal_data_type_t type);
|
||||
|
||||
@ -54,9 +54,7 @@ opal_dss_t opal_dss = {
|
||||
opal_dss_register,
|
||||
opal_dss_lookup_data_type,
|
||||
opal_dss_dump_data_types,
|
||||
opal_dss_dump,
|
||||
opal_dss_pack_buffer,
|
||||
opal_dss_unpack_buffer
|
||||
opal_dss_dump
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@ -25,6 +25,7 @@
|
||||
|
||||
#include "orte/mca/errmgr/errmgr.h"
|
||||
#include "opal/dss/dss.h"
|
||||
#include "opal/dss/dss_internal.h"
|
||||
#include "orte/runtime/data_type_support/orte_dt_support.h"
|
||||
|
||||
/*
|
||||
@ -37,7 +38,7 @@ int orte_dt_pack_std_cntr(opal_buffer_t *buffer, const void *src,
|
||||
|
||||
/* Turn around and pack the real type */
|
||||
if (ORTE_SUCCESS != (
|
||||
ret = opal_dss.pack_buffer(buffer, src, num_vals, ORTE_STD_CNTR_T))) {
|
||||
ret = opal_dss_pack_buffer(buffer, src, num_vals, ORTE_STD_CNTR_T))) {
|
||||
ORTE_ERROR_LOG(ret);
|
||||
}
|
||||
|
||||
@ -109,7 +110,7 @@ int orte_dt_pack_jobid(opal_buffer_t *buffer, const void *src,
|
||||
|
||||
/* Turn around and pack the real type */
|
||||
if (ORTE_SUCCESS != (
|
||||
ret = opal_dss.pack_buffer(buffer, src, num_vals, ORTE_JOBID_T))) {
|
||||
ret = opal_dss_pack_buffer(buffer, src, num_vals, ORTE_JOBID_T))) {
|
||||
ORTE_ERROR_LOG(ret);
|
||||
}
|
||||
|
||||
@ -126,7 +127,7 @@ int orte_dt_pack_vpid(opal_buffer_t *buffer, const void *src,
|
||||
|
||||
/* Turn around and pack the real type */
|
||||
if (ORTE_SUCCESS != (
|
||||
ret = opal_dss.pack_buffer(buffer, src, num_vals, ORTE_VPID_T))) {
|
||||
ret = opal_dss_pack_buffer(buffer, src, num_vals, ORTE_VPID_T))) {
|
||||
ORTE_ERROR_LOG(ret);
|
||||
}
|
||||
|
||||
@ -152,14 +153,14 @@ int orte_dt_pack_job(opal_buffer_t *buffer, const void *src,
|
||||
|
||||
for (i=0; i < num_vals; i++) {
|
||||
/* pack the jobid */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(jobs[i]->jobid)), 1, ORTE_JOBID))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the number of apps */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(jobs[i]->num_apps)), 1, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -169,7 +170,7 @@ int orte_dt_pack_job(opal_buffer_t *buffer, const void *src,
|
||||
if (0 < jobs[i]->num_apps) {
|
||||
orte_app_context_t **apps = (orte_app_context_t**)jobs[i]->apps->addr;
|
||||
for (j=0; j < jobs[i]->num_apps; j++) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)&apps[j], 1, ORTE_APP_CONTEXT))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -178,14 +179,14 @@ int orte_dt_pack_job(opal_buffer_t *buffer, const void *src,
|
||||
}
|
||||
|
||||
/* pack the control flags */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(jobs[i]->controls)), 1, OPAL_UINT16))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the total slots allocated to the job */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(jobs[i]->total_slots_alloc)), 1, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -204,7 +205,7 @@ int orte_dt_pack_job(opal_buffer_t *buffer, const void *src,
|
||||
} else {
|
||||
/* pack a one to indicate a map is there */
|
||||
}
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)&j, 1, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -215,7 +216,7 @@ int orte_dt_pack_job(opal_buffer_t *buffer, const void *src,
|
||||
* or nodes as this info does not need to be transmitted
|
||||
*/
|
||||
if (NULL != jobs[i]->map) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(jobs[i]->map)), 1, ORTE_JOB_MAP))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -225,35 +226,35 @@ int orte_dt_pack_job(opal_buffer_t *buffer, const void *src,
|
||||
/* do not pack the bookmark or oversubscribe_override flags */
|
||||
|
||||
/* pack the job state */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(jobs[i]->state)), 1, ORTE_JOB_STATE))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the number launched */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(jobs[i]->num_launched)), 1, ORTE_VPID))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the number reported */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(jobs[i]->num_reported)), 1, ORTE_VPID))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the number terminated */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(jobs[i]->num_terminated)), 1, ORTE_VPID))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the abort flag */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(jobs[i]->abort)), 1, OPAL_BOOL))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -261,21 +262,21 @@ int orte_dt_pack_job(opal_buffer_t *buffer, const void *src,
|
||||
|
||||
#if OPAL_ENABLE_FT == 1
|
||||
/* pack the ckpt state */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(jobs[i]->ckpt_state)), 1, OPAL_SIZE))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the ckpt snapshot ref */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(jobs[i]->ckpt_snapshot_ref)), 1, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the ckpt snapshot loc */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(jobs[i]->ckpt_snapshot_loc)), 1, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -302,7 +303,7 @@ int orte_dt_pack_node(opal_buffer_t *buffer, const void *src,
|
||||
/* do not pack the index - it is meaningless on the other end */
|
||||
|
||||
/* pack the node name */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(nodes[i]->name)), 1, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -311,7 +312,7 @@ int orte_dt_pack_node(opal_buffer_t *buffer, const void *src,
|
||||
/* do not pack the allocate flag, daemon name, or launch id */
|
||||
|
||||
/* pack the number of procs on the node */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(nodes[i]->num_procs)), 1, ORTE_VPID))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -320,49 +321,49 @@ int orte_dt_pack_node(opal_buffer_t *buffer, const void *src,
|
||||
/* do not pack the proc info */
|
||||
|
||||
/* pack whether we are oversubscribed or not */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(nodes[i]->oversubscribed)), 1, OPAL_BOOL))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the arch */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(nodes[i]->arch)), 1, OPAL_INT32))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the state */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(nodes[i]->state)), 1, ORTE_NODE_STATE))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the number of slots */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(nodes[i]->slots)), 1, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the number of slots in use */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(nodes[i]->slots_inuse)), 1, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the number of slots allocated */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(nodes[i]->slots_alloc)), 1, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the max number of slots */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(nodes[i]->slots_max)), 1, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -388,49 +389,49 @@ int orte_dt_pack_proc(opal_buffer_t *buffer, const void *src,
|
||||
|
||||
for (i=0; i < num_vals; i++) {
|
||||
/* pack the name */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(procs[i]->name)), 1, ORTE_NAME))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the pid */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(procs[i]->pid)), 1, OPAL_PID))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the local rank */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(procs[i]->local_rank)), 1, OPAL_UINT8))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the node rank */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(procs[i]->node_rank)), 1, OPAL_UINT8))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the state */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(procs[i]->state)), 1, ORTE_PROC_STATE))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the app context index */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(procs[i]->app_idx)), 1, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the name of the node where this proc is executing */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(procs[i]->nodename)), 1, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -438,21 +439,21 @@ int orte_dt_pack_proc(opal_buffer_t *buffer, const void *src,
|
||||
|
||||
#if OPAL_ENABLE_FT == 1
|
||||
/* pack the ckpt state */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(procs[i]->ckpt_state)), 1, OPAL_SIZE))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the ckpt snapshot ref */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(procs[i]->ckpt_snapshot_ref)), 1, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the ckpt snapshot loc */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(procs[i]->ckpt_snapshot_loc)), 1, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -479,21 +480,21 @@ int orte_dt_pack_app_context(opal_buffer_t *buffer, const void *src,
|
||||
|
||||
for (i=0; i < num_vals; i++) {
|
||||
/* pack the application index (for multiapp jobs) */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(app_context[i]->idx)), 1, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the application name */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(app_context[i]->app)), 1, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the number of processes */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(app_context[i]->num_procs)), 1, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -501,14 +502,14 @@ int orte_dt_pack_app_context(opal_buffer_t *buffer, const void *src,
|
||||
|
||||
/* pack the number of entries in the argv array */
|
||||
count = opal_argv_count(app_context[i]->argv);
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer, (void*)(&count), 1, ORTE_STD_CNTR))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer, (void*)(&count), 1, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* if there are entries, pack the argv entries */
|
||||
if (0 < count) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(app_context[i]->argv), count, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -517,14 +518,14 @@ int orte_dt_pack_app_context(opal_buffer_t *buffer, const void *src,
|
||||
|
||||
/* pack the number of entries in the enviro array */
|
||||
count = opal_argv_count(app_context[i]->env);
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer, (void*)(&count), 1, ORTE_STD_CNTR))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer, (void*)(&count), 1, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* if there are entries, pack the enviro entries */
|
||||
if (0 < count) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(app_context[i]->env), count, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -532,7 +533,7 @@ int orte_dt_pack_app_context(opal_buffer_t *buffer, const void *src,
|
||||
}
|
||||
|
||||
/* pack the cwd */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(app_context[i]->cwd)), 1, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -544,21 +545,21 @@ int orte_dt_pack_app_context(opal_buffer_t *buffer, const void *src,
|
||||
} else {
|
||||
user_specified = 0;
|
||||
}
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&user_specified), 1, OPAL_INT8))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the hostfile name */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(app_context[i]->hostfile)), 1, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the add_hostfile name */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(app_context[i]->add_hostfile)), 1, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -566,14 +567,14 @@ int orte_dt_pack_app_context(opal_buffer_t *buffer, const void *src,
|
||||
|
||||
/* pack the dash host argv array */
|
||||
count = opal_argv_count(app_context[i]->dash_host);
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer, (void*)(&count), 1, ORTE_STD_CNTR))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer, (void*)(&count), 1, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* if there are entries, pack the argv entries */
|
||||
if (0 < count) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(app_context[i]->dash_host), count, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -587,21 +588,21 @@ int orte_dt_pack_app_context(opal_buffer_t *buffer, const void *src,
|
||||
have_prefix = 0;
|
||||
}
|
||||
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&have_prefix), 1, OPAL_INT8))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
if (have_prefix) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(app_context[i]->prefix_dir)), 1, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
}
|
||||
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(app_context[i]->preload_binary)), 1, OPAL_BOOL))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -614,7 +615,7 @@ int orte_dt_pack_app_context(opal_buffer_t *buffer, const void *src,
|
||||
have_preload_files = 0;
|
||||
}
|
||||
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&have_preload_files), 1, OPAL_INT8))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -622,7 +623,7 @@ int orte_dt_pack_app_context(opal_buffer_t *buffer, const void *src,
|
||||
|
||||
if( have_preload_files) {
|
||||
if( NULL != app_context[i]->preload_files) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(app_context[i]->preload_files)), 1, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -637,7 +638,7 @@ int orte_dt_pack_app_context(opal_buffer_t *buffer, const void *src,
|
||||
have_preload_files_dest_dir = 0;
|
||||
}
|
||||
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&have_preload_files_dest_dir), 1, OPAL_INT8))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -645,7 +646,7 @@ int orte_dt_pack_app_context(opal_buffer_t *buffer, const void *src,
|
||||
|
||||
if( have_preload_files_dest_dir) {
|
||||
if( NULL != app_context[i]->preload_files_dest_dir) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(app_context[i]->preload_files_dest_dir)), 1, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -665,7 +666,7 @@ int orte_dt_pack_exit_code(opal_buffer_t *buffer, const void *src,
|
||||
{
|
||||
int rc;
|
||||
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer, src, num_vals, ORTE_EXIT_CODE_T))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer, src, num_vals, ORTE_EXIT_CODE_T))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
}
|
||||
|
||||
@ -680,7 +681,7 @@ int orte_dt_pack_node_state(opal_buffer_t *buffer, const void *src,
|
||||
{
|
||||
int rc;
|
||||
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer, src, num_vals, ORTE_NODE_STATE_T))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer, src, num_vals, ORTE_NODE_STATE_T))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
}
|
||||
|
||||
@ -695,7 +696,7 @@ int orte_dt_pack_proc_state(opal_buffer_t *buffer, const void *src,
|
||||
{
|
||||
int rc;
|
||||
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer, src, num_vals, ORTE_PROC_STATE_T))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer, src, num_vals, ORTE_PROC_STATE_T))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
}
|
||||
|
||||
@ -710,7 +711,7 @@ int orte_dt_pack_job_state(opal_buffer_t *buffer, const void *src,
|
||||
{
|
||||
int rc;
|
||||
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer, src, num_vals, ORTE_JOB_STATE_T))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer, src, num_vals, ORTE_JOB_STATE_T))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
}
|
||||
|
||||
@ -734,49 +735,49 @@ int orte_dt_pack_map(opal_buffer_t *buffer, const void *src,
|
||||
|
||||
for (i=0; i < num_vals; i++) {
|
||||
/* pack the policy used to generate it */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer, &(maps[i]->policy), 1, OPAL_UINT8))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer, &(maps[i]->policy), 1, OPAL_UINT8))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the pernode flag */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer, &(maps[i]->pernode), 1, OPAL_BOOL))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer, &(maps[i]->pernode), 1, OPAL_BOOL))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the #procs/node */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer, &(maps[i]->npernode), 1, ORTE_STD_CNTR))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer, &(maps[i]->npernode), 1, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the oversubscribe flag */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer, &(maps[i]->oversubscribe), 1, OPAL_BOOL))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer, &(maps[i]->oversubscribe), 1, OPAL_BOOL))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the display map flag */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer, &(maps[i]->display_map), 1, OPAL_BOOL))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer, &(maps[i]->display_map), 1, OPAL_BOOL))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the number of new daemons */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer, &(maps[i]->num_new_daemons), 1, ORTE_STD_CNTR))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer, &(maps[i]->num_new_daemons), 1, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the daemon starting vpid */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer, &(maps[i]->daemon_vpid_start), 1, ORTE_VPID))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer, &(maps[i]->daemon_vpid_start), 1, ORTE_VPID))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the number of nodes */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer, &(maps[i]->num_nodes), 1, ORTE_STD_CNTR))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer, &(maps[i]->num_nodes), 1, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
@ -794,7 +795,7 @@ int orte_dt_pack_tag(opal_buffer_t *buffer, const void *src,
|
||||
int rc;
|
||||
|
||||
/* Turn around and pack the real type */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.pack_buffer(buffer, src, num_vals, ORTE_RML_TAG_T))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer, src, num_vals, ORTE_RML_TAG_T))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
}
|
||||
|
||||
@ -810,7 +811,7 @@ int orte_dt_pack_daemon_cmd(opal_buffer_t *buffer, const void *src, int32_t num_
|
||||
int ret;
|
||||
|
||||
/* Turn around and pack the real type */
|
||||
if (ORTE_SUCCESS != (ret = opal_dss.pack_buffer(buffer, src, num_vals, ORTE_DAEMON_CMD_T))) {
|
||||
if (ORTE_SUCCESS != (ret = opal_dss_pack_buffer(buffer, src, num_vals, ORTE_DAEMON_CMD_T))) {
|
||||
ORTE_ERROR_LOG(ret);
|
||||
}
|
||||
|
||||
@ -826,7 +827,7 @@ int orte_dt_pack_grpcomm_mode(opal_buffer_t *buffer, const void *src, int32_t nu
|
||||
int ret;
|
||||
|
||||
/* Turn around and pack the real type */
|
||||
if (ORTE_SUCCESS != (ret = opal_dss.pack_buffer(buffer, src, num_vals, ORTE_GRPCOMM_MODE_T))) {
|
||||
if (ORTE_SUCCESS != (ret = opal_dss_pack_buffer(buffer, src, num_vals, ORTE_GRPCOMM_MODE_T))) {
|
||||
ORTE_ERROR_LOG(ret);
|
||||
}
|
||||
|
||||
|
||||
@ -23,6 +23,7 @@
|
||||
|
||||
#include "orte/mca/errmgr/errmgr.h"
|
||||
#include "opal/dss/dss.h"
|
||||
#include "opal/dss/dss_internal.h"
|
||||
#include "orte/runtime/data_type_support/orte_dt_support.h"
|
||||
|
||||
/*
|
||||
@ -34,7 +35,7 @@ int orte_dt_unpack_std_cntr(opal_buffer_t *buffer, void *dest,
|
||||
int ret;
|
||||
|
||||
/* Turn around and unpack the real type */
|
||||
if (ORTE_SUCCESS != (ret = opal_dss.unpack_buffer(buffer, dest, num_vals, ORTE_STD_CNTR_T))) {
|
||||
if (ORTE_SUCCESS != (ret = opal_dss_unpack_buffer(buffer, dest, num_vals, ORTE_STD_CNTR_T))) {
|
||||
ORTE_ERROR_LOG(ret);
|
||||
}
|
||||
|
||||
@ -113,7 +114,7 @@ int orte_dt_unpack_jobid(opal_buffer_t *buffer, void *dest,
|
||||
int ret;
|
||||
|
||||
/* Turn around and unpack the real type */
|
||||
if (ORTE_SUCCESS != (ret = opal_dss.unpack_buffer(buffer, dest, num_vals, ORTE_JOBID_T))) {
|
||||
if (ORTE_SUCCESS != (ret = opal_dss_unpack_buffer(buffer, dest, num_vals, ORTE_JOBID_T))) {
|
||||
ORTE_ERROR_LOG(ret);
|
||||
}
|
||||
|
||||
@ -129,7 +130,7 @@ int orte_dt_unpack_vpid(opal_buffer_t *buffer, void *dest,
|
||||
int ret;
|
||||
|
||||
/* Turn around and unpack the real type */
|
||||
if (ORTE_SUCCESS != (ret = opal_dss.unpack_buffer(buffer, dest, num_vals, ORTE_VPID_T))) {
|
||||
if (ORTE_SUCCESS != (ret = opal_dss_unpack_buffer(buffer, dest, num_vals, ORTE_VPID_T))) {
|
||||
ORTE_ERROR_LOG(ret);
|
||||
}
|
||||
|
||||
@ -164,7 +165,7 @@ int orte_dt_unpack_job(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the jobid */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
&(jobs[i]->jobid), &n, ORTE_JOBID))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -172,7 +173,7 @@ int orte_dt_unpack_job(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the num apps */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(jobs[i]->num_apps)), &n, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -183,7 +184,7 @@ int orte_dt_unpack_job(opal_buffer_t *buffer, void *dest,
|
||||
orte_app_context_t *app;
|
||||
for (j=0; j < jobs[i]->num_apps; j++) {
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
&app, &n, ORTE_APP_CONTEXT))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -194,7 +195,7 @@ int orte_dt_unpack_job(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack control flags */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(jobs[i]->controls)), &n, OPAL_UINT16))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -202,7 +203,7 @@ int orte_dt_unpack_job(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the total slots allocated to the job */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(jobs[i]->total_slots_alloc)), &n, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -214,7 +215,7 @@ int orte_dt_unpack_job(opal_buffer_t *buffer, void *dest,
|
||||
* nothing to pack. Instead, we packed a flag to indicate whether or not
|
||||
* the map is included */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
&j, &n, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -222,7 +223,7 @@ int orte_dt_unpack_job(opal_buffer_t *buffer, void *dest,
|
||||
if (0 < j) {
|
||||
/* unpack the map */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(jobs[i]->map)), &n, ORTE_JOB_MAP))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -233,7 +234,7 @@ int orte_dt_unpack_job(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the job state */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(jobs[i]->state)), &n, ORTE_JOB_STATE))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -241,7 +242,7 @@ int orte_dt_unpack_job(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the number launched */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(jobs[i]->num_launched)), &n, ORTE_VPID))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -249,7 +250,7 @@ int orte_dt_unpack_job(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the number reported */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(jobs[i]->num_reported)), &n, ORTE_VPID))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -257,7 +258,7 @@ int orte_dt_unpack_job(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the number terminated */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(jobs[i]->num_terminated)), &n, ORTE_VPID))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -265,7 +266,7 @@ int orte_dt_unpack_job(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the abort flag */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(jobs[i]->abort)), &n, OPAL_BOOL))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -273,14 +274,14 @@ int orte_dt_unpack_job(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
#if OPAL_ENABLE_FT == 1
|
||||
/* unpack the ckpt state */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(jobs[i]->ckpt_state)), &n, OPAL_SIZE))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* unpack the ckpt snapshot ref */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(jobs[i]->ckpt_snapshot_ref)), &n, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -288,7 +289,7 @@ int orte_dt_unpack_job(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the ckpt snapshot loc */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(jobs[i]->ckpt_snapshot_loc)), &n, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -324,7 +325,7 @@ int orte_dt_unpack_node(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the node name */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
&(nodes[i]->name), &n, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -334,7 +335,7 @@ int orte_dt_unpack_node(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the number of procs on the node */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(nodes[i]->num_procs)), &n, ORTE_VPID))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -344,7 +345,7 @@ int orte_dt_unpack_node(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack whether we are oversubscribed or not */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(nodes[i]->oversubscribed)), &n, OPAL_BOOL))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -352,7 +353,7 @@ int orte_dt_unpack_node(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the arch */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(nodes[i]->arch)), &n, OPAL_INT32))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -360,7 +361,7 @@ int orte_dt_unpack_node(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the state */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(nodes[i]->state)), &n, ORTE_NODE_STATE))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -368,28 +369,28 @@ int orte_dt_unpack_node(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the number of slots */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(nodes[i]->slots)), &n, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* unpack the number of slots in use */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(nodes[i]->slots_inuse)), &n, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* unpack the number of slots allocated */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(nodes[i]->slots_alloc)), &n, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* unpack the max number of slots */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(nodes[i]->slots_max)), &n, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -423,7 +424,7 @@ int orte_dt_unpack_proc(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the name */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
&(procs[i]->name), &n, ORTE_NAME))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -431,7 +432,7 @@ int orte_dt_unpack_proc(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the pid */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(procs[i]->pid)), &n, OPAL_PID))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -439,7 +440,7 @@ int orte_dt_unpack_proc(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the local rank */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(procs[i]->local_rank)), &n, OPAL_UINT8))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -447,7 +448,7 @@ int orte_dt_unpack_proc(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the local rank */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(procs[i]->node_rank)), &n, OPAL_UINT8))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -455,7 +456,7 @@ int orte_dt_unpack_proc(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the state */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(procs[i]->state)), &n, ORTE_PROC_STATE))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -463,14 +464,14 @@ int orte_dt_unpack_proc(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the app context index */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(procs[i]->app_idx)), &n, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* unpack the name of the node where this proc is executing */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(void*)(&(procs[i]->nodename)), &n, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -478,14 +479,14 @@ int orte_dt_unpack_proc(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
#if OPAL_ENABLE_FT == 1
|
||||
/* unpack the ckpt state */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(procs[i]->ckpt_state)), &n, OPAL_SIZE))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* unpack the ckpt snapshot ref */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(procs[i]->ckpt_snapshot_ref)), &n, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -493,7 +494,7 @@ int orte_dt_unpack_proc(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the ckpt snapshot loc */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
(&(procs[i]->ckpt_snapshot_loc)), &n, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -527,7 +528,7 @@ int orte_dt_unpack_app_context(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* get the app index number */
|
||||
max_n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &(app_context[i]->idx),
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &(app_context[i]->idx),
|
||||
&max_n, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -535,7 +536,7 @@ int orte_dt_unpack_app_context(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the application name */
|
||||
max_n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &(app_context[i]->app),
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &(app_context[i]->app),
|
||||
&max_n, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -543,7 +544,7 @@ int orte_dt_unpack_app_context(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* get the number of processes */
|
||||
max_n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &(app_context[i]->num_procs),
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &(app_context[i]->num_procs),
|
||||
&max_n, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -551,7 +552,7 @@ int orte_dt_unpack_app_context(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* get the number of argv strings that were packed */
|
||||
max_n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &count, &max_n, ORTE_STD_CNTR))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &count, &max_n, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
@ -567,7 +568,7 @@ int orte_dt_unpack_app_context(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* and unpack them */
|
||||
max_n = count;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, app_context[i]->argv, &max_n, OPAL_STRING))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, app_context[i]->argv, &max_n, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
@ -575,7 +576,7 @@ int orte_dt_unpack_app_context(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* get the number of env strings */
|
||||
max_n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &count, &max_n, ORTE_STD_CNTR))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &count, &max_n, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
@ -591,7 +592,7 @@ int orte_dt_unpack_app_context(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* and unpack them */
|
||||
max_n = count;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, app_context[i]->env, &max_n, OPAL_STRING))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, app_context[i]->env, &max_n, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
@ -599,14 +600,14 @@ int orte_dt_unpack_app_context(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the cwd */
|
||||
max_n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &app_context[i]->cwd,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &app_context[i]->cwd,
|
||||
&max_n, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* unpack the user-specified cwd flag */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &user_specified,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &user_specified,
|
||||
&max_n, OPAL_INT8))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -619,7 +620,7 @@ int orte_dt_unpack_app_context(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the hostfile name */
|
||||
max_n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &(app_context[i]->hostfile),
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &(app_context[i]->hostfile),
|
||||
&max_n, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -627,7 +628,7 @@ int orte_dt_unpack_app_context(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the add_hostfile name */
|
||||
max_n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &(app_context[i]->add_hostfile),
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &(app_context[i]->add_hostfile),
|
||||
&max_n, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -635,7 +636,7 @@ int orte_dt_unpack_app_context(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* get the number of dash_host strings that were packed */
|
||||
max_n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &count, &max_n, ORTE_STD_CNTR))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &count, &max_n, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
@ -651,7 +652,7 @@ int orte_dt_unpack_app_context(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* and unpack them */
|
||||
max_n = count;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, app_context[i]->dash_host, &max_n, OPAL_STRING))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, app_context[i]->dash_host, &max_n, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
@ -659,13 +660,13 @@ int orte_dt_unpack_app_context(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the prefix dir if there is one */
|
||||
max_n=1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &have_prefix,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &have_prefix,
|
||||
&max_n, OPAL_INT8))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
if (have_prefix) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &app_context[i]->prefix_dir,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &app_context[i]->prefix_dir,
|
||||
&max_n, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -676,7 +677,7 @@ int orte_dt_unpack_app_context(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* Unpack the preload_binary flag */
|
||||
max_n=1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &(app_context[i]->preload_binary),
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &(app_context[i]->preload_binary),
|
||||
&max_n, OPAL_BOOL))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -684,13 +685,13 @@ int orte_dt_unpack_app_context(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* Unpack the preload_files set */
|
||||
max_n=1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &have_preload_files,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &have_preload_files,
|
||||
&max_n, OPAL_INT8))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
if (have_preload_files) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &app_context[i]->preload_files,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &app_context[i]->preload_files,
|
||||
&max_n, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -701,13 +702,13 @@ int orte_dt_unpack_app_context(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* Unpack the preload_files_dest_dir set */
|
||||
max_n=1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &have_preload_files_dest_dir,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &have_preload_files_dest_dir,
|
||||
&max_n, OPAL_INT8))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
if (have_preload_files_dest_dir) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &app_context[i]->preload_files_dest_dir,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &app_context[i]->preload_files_dest_dir,
|
||||
&max_n, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -729,7 +730,7 @@ int orte_dt_unpack_exit_code(opal_buffer_t *buffer, void *dest,
|
||||
{
|
||||
int rc;
|
||||
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, dest, num_vals, ORTE_EXIT_CODE_T))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, dest, num_vals, ORTE_EXIT_CODE_T))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
}
|
||||
|
||||
@ -744,7 +745,7 @@ int orte_dt_unpack_node_state(opal_buffer_t *buffer, void *dest,
|
||||
{
|
||||
int rc;
|
||||
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, dest, num_vals, ORTE_NODE_STATE_T))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, dest, num_vals, ORTE_NODE_STATE_T))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
}
|
||||
|
||||
@ -759,7 +760,7 @@ int orte_dt_unpack_proc_state(opal_buffer_t *buffer, void *dest,
|
||||
{
|
||||
int rc;
|
||||
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, dest, num_vals, ORTE_PROC_STATE_T))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, dest, num_vals, ORTE_PROC_STATE_T))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
}
|
||||
|
||||
@ -774,7 +775,7 @@ int orte_dt_unpack_job_state(opal_buffer_t *buffer, void *dest,
|
||||
{
|
||||
int rc;
|
||||
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, dest, num_vals, ORTE_JOB_STATE_T))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, dest, num_vals, ORTE_JOB_STATE_T))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
}
|
||||
|
||||
@ -806,7 +807,7 @@ int orte_dt_unpack_map(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the policy */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
&(maps[i]->policy), &n, OPAL_UINT8))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -814,7 +815,7 @@ int orte_dt_unpack_map(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the pernode flag */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
&(maps[i]->pernode), &n, OPAL_BOOL))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -822,7 +823,7 @@ int orte_dt_unpack_map(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the #procs/node */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
&(maps[i]->npernode), &n, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -830,7 +831,7 @@ int orte_dt_unpack_map(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the oversubscribe flag */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
&(maps[i]->oversubscribe), &n, OPAL_BOOL))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -838,7 +839,7 @@ int orte_dt_unpack_map(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the display map flag */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
&(maps[i]->display_map), &n, OPAL_BOOL))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -846,21 +847,21 @@ int orte_dt_unpack_map(opal_buffer_t *buffer, void *dest,
|
||||
|
||||
/* unpack the number of daemons to be created */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &(maps[i]->num_new_daemons), &n, ORTE_STD_CNTR))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &(maps[i]->num_new_daemons), &n, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* unpack the starting vpid of the new daemons */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer, &(maps[i]->daemon_vpid_start), &n, ORTE_VPID))) {
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &(maps[i]->daemon_vpid_start), &n, ORTE_VPID))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* unpack the number of nodes */
|
||||
n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss.unpack_buffer(buffer,
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer,
|
||||
&(maps[i]->num_nodes), &n, ORTE_STD_CNTR))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
@ -879,7 +880,7 @@ int orte_dt_unpack_tag(opal_buffer_t *buffer, void *dest,
|
||||
int ret;
|
||||
|
||||
/* Turn around and unpack the real type */
|
||||
if (ORTE_SUCCESS != (ret = opal_dss.unpack_buffer(buffer, dest, num_vals, ORTE_RML_TAG_T))) {
|
||||
if (ORTE_SUCCESS != (ret = opal_dss_unpack_buffer(buffer, dest, num_vals, ORTE_RML_TAG_T))) {
|
||||
ORTE_ERROR_LOG(ret);
|
||||
}
|
||||
|
||||
@ -895,7 +896,7 @@ int orte_dt_unpack_daemon_cmd(opal_buffer_t *buffer, void *dest, int32_t *num_va
|
||||
int ret;
|
||||
|
||||
/* turn around and unpack the real type */
|
||||
ret = opal_dss.unpack_buffer(buffer, dest, num_vals, ORTE_DAEMON_CMD_T);
|
||||
ret = opal_dss_unpack_buffer(buffer, dest, num_vals, ORTE_DAEMON_CMD_T);
|
||||
|
||||
return ret;
|
||||
}
|
||||
@ -909,7 +910,7 @@ int orte_dt_unpack_grpcomm_mode(opal_buffer_t *buffer, void *dest, int32_t *num_
|
||||
int ret;
|
||||
|
||||
/* turn around and unpack the real type */
|
||||
ret = opal_dss.unpack_buffer(buffer, dest, num_vals, ORTE_GRPCOMM_MODE_T);
|
||||
ret = opal_dss_unpack_buffer(buffer, dest, num_vals, ORTE_GRPCOMM_MODE_T);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
Загрузка…
Ссылка в новой задаче
Block a user