Remove stale fields from global objects - have been moved to the layer that actually uses them
This commit was SVN r24644.
Этот коммит содержится в:
родитель
8858d9a40e
Коммит
39369f8807
@ -150,9 +150,6 @@ int orte_dt_copy_app_context(orte_app_context_t **dest, orte_app_context_t *src,
|
||||
}
|
||||
|
||||
/* copy data into it */
|
||||
if (NULL != src->name) {
|
||||
(*dest)->name = strdup(src->name);
|
||||
}
|
||||
(*dest)->idx = src->idx;
|
||||
if (NULL != src->app) {
|
||||
(*dest)->app = strdup(src->app);
|
||||
@ -165,9 +162,6 @@ int orte_dt_copy_app_context(orte_app_context_t **dest, orte_app_context_t *src,
|
||||
}
|
||||
(*dest)->user_specified_cwd = src->user_specified_cwd;
|
||||
|
||||
(*dest)->uid = src->uid;
|
||||
(*dest)->gid = src->gid;
|
||||
|
||||
if (NULL != src->hostfile) {
|
||||
(*dest)->hostfile = strdup(src->hostfile);
|
||||
}
|
||||
|
@ -526,13 +526,6 @@ int orte_dt_pack_app_context(opal_buffer_t *buffer, const void *src,
|
||||
app_context = (orte_app_context_t**) src;
|
||||
|
||||
for (i=0; i < num_vals; i++) {
|
||||
/* pack the user's name for this app */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(app_context[i]->name)), 1, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the application index (for multiapp jobs) */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(app_context[i]->idx)), 1, ORTE_STD_CNTR))) {
|
||||
@ -762,18 +755,6 @@ int orte_dt_pack_app_context(opal_buffer_t *buffer, const void *src,
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* pack the uid and gid */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(app_context[i]->uid)), 1, OPAL_INT32))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_pack_buffer(buffer,
|
||||
(void*)(&(app_context[i]->gid)), 1, OPAL_INT32))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
#if OPAL_ENABLE_FT_CR == 1
|
||||
/* Pack the preload_files_src_dir if we have one */
|
||||
if (NULL != app_context[i]->sstore_load) {
|
||||
|
@ -532,9 +532,8 @@ int orte_dt_print_app_context(char **output, char *prefix, orte_app_context_t *s
|
||||
asprintf(&pfx2, "%s", prefix);
|
||||
}
|
||||
|
||||
asprintf(&tmp, "\n%sData for app_context: name: %s\t index %lu\tuid: %d\tgid: %d\tapp: %s\n%s\tNum procs: %lu\tRecovery: %s\tMax Restarts: %d",
|
||||
pfx2, (NULL == src->name) ? "NULL" : src->name,
|
||||
(unsigned long)src->idx, src->uid, src->gid,
|
||||
asprintf(&tmp, "\n%sData for app_context: index %lu\tapp: %s\n%s\tNum procs: %lu\tRecovery: %s\tMax Restarts: %d",
|
||||
pfx2, (unsigned long)src->idx,
|
||||
(NULL == src->app) ? "NULL" : src->app,
|
||||
pfx2, (unsigned long)src->num_procs,
|
||||
(src->recovery_defined) ? "DEFINED" : "DEFAULT",
|
||||
|
@ -577,14 +577,6 @@ int orte_dt_unpack_app_context(opal_buffer_t *buffer, void *dest,
|
||||
return ORTE_ERR_OUT_OF_RESOURCE;
|
||||
}
|
||||
|
||||
/* get the name */
|
||||
max_n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &(app_context[i]->name),
|
||||
&max_n, OPAL_STRING))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* get the app index number */
|
||||
max_n = 1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &(app_context[i]->idx),
|
||||
@ -840,20 +832,6 @@ int orte_dt_unpack_app_context(opal_buffer_t *buffer, void *dest,
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* unpack the uid and gid */
|
||||
max_n=1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &app_context[i]->uid,
|
||||
&max_n, OPAL_INT32))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
max_n=1;
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &app_context[i]->gid,
|
||||
&max_n, OPAL_INT32))) {
|
||||
ORTE_ERROR_LOG(rc);
|
||||
return rc;
|
||||
}
|
||||
|
||||
#if OPAL_ENABLE_FT_CR == 1
|
||||
/* Unpack the sstore_load */
|
||||
if (ORTE_SUCCESS != (rc = opal_dss_unpack_buffer(buffer, &have_preload_files_dest_dir,
|
||||
|
@ -546,8 +546,6 @@ int orte_global_comm(orte_process_name_t *recipient,
|
||||
|
||||
static void orte_app_context_construct(orte_app_context_t* app_context)
|
||||
{
|
||||
app_context->name = NULL;
|
||||
app_context->version = NULL;
|
||||
app_context->idx=0;
|
||||
app_context->app=NULL;
|
||||
app_context->num_procs=0;
|
||||
@ -565,9 +563,6 @@ static void orte_app_context_construct(orte_app_context_t* app_context)
|
||||
app_context->preload_files_dest_dir = NULL;
|
||||
app_context->preload_files_src_dir = NULL;
|
||||
app_context->used_on_node = false;
|
||||
/* set to invalid value */
|
||||
app_context->gid = -1;
|
||||
app_context->uid = -1;
|
||||
|
||||
#if OPAL_ENABLE_FT_CR == 1
|
||||
app_context->sstore_load = NULL;
|
||||
@ -578,14 +573,6 @@ static void orte_app_context_construct(orte_app_context_t* app_context)
|
||||
|
||||
static void orte_app_context_destructor(orte_app_context_t* app_context)
|
||||
{
|
||||
if (NULL != app_context->name) {
|
||||
free(app_context->name);
|
||||
}
|
||||
|
||||
if (NULL != app_context->version) {
|
||||
free(app_context->version);
|
||||
}
|
||||
|
||||
if (NULL != app_context->app) {
|
||||
free (app_context->app);
|
||||
app_context->app = NULL;
|
||||
|
@ -180,13 +180,6 @@ struct orte_job_map_t;
|
||||
typedef struct {
|
||||
/** Parent object */
|
||||
opal_object_t super;
|
||||
/** unique name for this application - has
|
||||
* nothing to do with argv[0], but has meaning
|
||||
* to the user, if provided
|
||||
*/
|
||||
char *name;
|
||||
/* a version string */
|
||||
char *version;
|
||||
/** Unique index when multiple apps per job */
|
||||
orte_app_idx_t idx;
|
||||
/** Absolute pathname of argv[0] */
|
||||
@ -225,10 +218,6 @@ typedef struct {
|
||||
char *preload_files_src_dir;
|
||||
/* is being used on the local node */
|
||||
bool used_on_node;
|
||||
/* uid under which to run the app */
|
||||
int32_t uid;
|
||||
/* gid under which to run the app */
|
||||
int32_t gid;
|
||||
#if OPAL_ENABLE_FT_CR == 1
|
||||
/** What files SStore should load before local launch, if any */
|
||||
char *sstore_load;
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user