5dfd54c778
Clean up the remainder of the size_t references in the runtime itself. Convert to orte_std_cntr_t wherever it makes sense (only avoid those places where the actual memory size is referenced). Remove the obsolete oob barrier function (we actually obsoleted it a long time ago - just never bothered to clean it up). I have done my best to go through all the components and catch everything, even if I couldn't test compile them since I wasn't on that type of system. Still, I cannot guarantee that problems won't show up when you test this on specific systems. Usually, these will just show as "warning: comparison between signed and unsigned" notes which are easily fixed (just change a size_t to orte_std_cntr_t). In some places, people didn't use size_t, but instead used some other variant (e.g., I found several places with uint32_t). I tried to catch all of them, but... Once we get all the instances caught and fixed, this should once and for all resolve many of the heterogeneity problems. This commit was SVN r11204.
219 строки
4.5 KiB
C
219 строки
4.5 KiB
C
/*
|
|
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
|
* University Research and Technology
|
|
* Corporation. All rights reserved.
|
|
* Copyright (c) 2004-2005 The University of Tennessee and The University
|
|
* of Tennessee Research Foundation. All rights
|
|
* reserved.
|
|
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
|
* University of Stuttgart. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
#include "orte_config.h"
|
|
#include <errno.h>
|
|
#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif
|
|
#include <string.h>
|
|
|
|
#include "opal/util/trace.h"
|
|
|
|
#include "orte/orte_constants.h"
|
|
#include "orte/dss/dss.h"
|
|
#include "orte/mca/rmgr/base/base.h"
|
|
#include "orte/mca/errmgr/errmgr.h"
|
|
|
|
|
|
/*
|
|
*
|
|
*/
|
|
|
|
int orte_rmgr_base_pack_cmd(orte_buffer_t* buffer, orte_rmgr_cmd_t cmd, orte_jobid_t jobid)
|
|
{
|
|
int rc;
|
|
|
|
OPAL_TRACE(4);
|
|
|
|
rc = orte_dss.pack(buffer, &cmd, 1, ORTE_RMGR_CMD);
|
|
if(ORTE_SUCCESS != rc) {
|
|
ORTE_ERROR_LOG(rc);
|
|
return rc;
|
|
}
|
|
|
|
rc = orte_dss.pack(buffer, &jobid, 1, ORTE_JOBID);
|
|
if(ORTE_SUCCESS != rc) {
|
|
ORTE_ERROR_LOG(rc);
|
|
return rc;
|
|
}
|
|
return ORTE_SUCCESS;
|
|
}
|
|
|
|
/*
|
|
*
|
|
*/
|
|
|
|
int orte_rmgr_base_pack_create_cmd(
|
|
orte_buffer_t* buffer,
|
|
orte_app_context_t** context,
|
|
orte_std_cntr_t num_context)
|
|
{
|
|
int rc;
|
|
|
|
orte_rmgr_cmd_t cmd = ORTE_RMGR_CMD_CREATE;
|
|
|
|
OPAL_TRACE(4);
|
|
|
|
rc = orte_dss.pack(buffer, &cmd, 1, ORTE_RMGR_CMD);
|
|
if(ORTE_SUCCESS != rc) {
|
|
ORTE_ERROR_LOG(rc);
|
|
return rc;
|
|
}
|
|
|
|
rc = orte_dss.pack(buffer, &num_context, 1, ORTE_STD_CNTR);
|
|
if(ORTE_SUCCESS != rc) {
|
|
ORTE_ERROR_LOG(rc);
|
|
return rc;
|
|
}
|
|
rc = orte_dss.pack(buffer, context, num_context, ORTE_APP_CONTEXT);
|
|
if(ORTE_SUCCESS != rc) {
|
|
ORTE_ERROR_LOG(rc);
|
|
return rc;
|
|
}
|
|
return ORTE_SUCCESS;
|
|
}
|
|
|
|
|
|
int orte_rmgr_base_pack_terminate_proc_cmd(
|
|
orte_buffer_t* buffer,
|
|
const orte_process_name_t* name)
|
|
{
|
|
int rc;
|
|
|
|
orte_rmgr_cmd_t cmd = ORTE_RMGR_CMD_TERM_PROC;
|
|
|
|
OPAL_TRACE(4);
|
|
|
|
rc = orte_dss.pack(buffer, &cmd, 1, ORTE_RMGR_CMD);
|
|
if(ORTE_SUCCESS != rc) {
|
|
ORTE_ERROR_LOG(rc);
|
|
return rc;
|
|
}
|
|
|
|
rc = orte_dss.pack(buffer, (void*)name, 1, ORTE_NAME);
|
|
if(ORTE_SUCCESS != rc) {
|
|
ORTE_ERROR_LOG(rc);
|
|
return rc;
|
|
}
|
|
return ORTE_SUCCESS;
|
|
}
|
|
|
|
|
|
int orte_rmgr_base_pack_signal_job_cmd(
|
|
orte_buffer_t* buffer,
|
|
orte_jobid_t job,
|
|
int32_t signal)
|
|
{
|
|
int rc;
|
|
|
|
orte_rmgr_cmd_t cmd = ORTE_RMGR_CMD_SIGNAL_JOB;
|
|
|
|
OPAL_TRACE(4);
|
|
|
|
rc = orte_dss.pack(buffer, &cmd, 1, ORTE_RMGR_CMD);
|
|
if(ORTE_SUCCESS != rc) {
|
|
ORTE_ERROR_LOG(rc);
|
|
return rc;
|
|
}
|
|
|
|
rc = orte_dss.pack(buffer, &job, 1, ORTE_JOBID);
|
|
if(ORTE_SUCCESS != rc) {
|
|
ORTE_ERROR_LOG(rc);
|
|
return rc;
|
|
}
|
|
|
|
rc = orte_dss.pack(buffer, (void*)&signal, 1, ORTE_INT32);
|
|
if(ORTE_SUCCESS != rc) {
|
|
ORTE_ERROR_LOG(rc);
|
|
return rc;
|
|
}
|
|
|
|
return ORTE_SUCCESS;
|
|
}
|
|
|
|
|
|
int orte_rmgr_base_pack_signal_proc_cmd(
|
|
orte_buffer_t* buffer,
|
|
const orte_process_name_t* name,
|
|
int32_t signal)
|
|
{
|
|
int rc;
|
|
|
|
orte_rmgr_cmd_t cmd = ORTE_RMGR_CMD_SIGNAL_PROC;
|
|
|
|
OPAL_TRACE(4);
|
|
|
|
rc = orte_dss.pack(buffer, &cmd, 1, ORTE_RMGR_CMD);
|
|
if(ORTE_SUCCESS != rc) {
|
|
ORTE_ERROR_LOG(rc);
|
|
return rc;
|
|
}
|
|
|
|
rc = orte_dss.pack(buffer, (void*)name, 1, ORTE_NAME);
|
|
if(ORTE_SUCCESS != rc) {
|
|
ORTE_ERROR_LOG(rc);
|
|
return rc;
|
|
}
|
|
|
|
rc = orte_dss.pack(buffer, (void*)&signal, 1, ORTE_INT32);
|
|
if(ORTE_SUCCESS != rc) {
|
|
ORTE_ERROR_LOG(rc);
|
|
return rc;
|
|
}
|
|
|
|
return ORTE_SUCCESS;
|
|
}
|
|
|
|
|
|
int orte_rmgr_base_unpack_rsp(
|
|
orte_buffer_t* buffer)
|
|
{
|
|
int32_t rc;
|
|
orte_std_cntr_t cnt = 1;
|
|
|
|
OPAL_TRACE(4);
|
|
|
|
if(ORTE_SUCCESS != (rc = orte_dss.unpack(buffer,&rc,&cnt,ORTE_INT32))) {
|
|
ORTE_ERROR_LOG(rc);
|
|
return rc;
|
|
}
|
|
return rc;
|
|
}
|
|
|
|
int orte_rmgr_base_unpack_create_rsp(
|
|
orte_buffer_t* buffer,
|
|
orte_jobid_t* jobid)
|
|
{
|
|
int32_t rc;
|
|
orte_std_cntr_t cnt;
|
|
|
|
OPAL_TRACE(4);
|
|
|
|
cnt = 1;
|
|
if(ORTE_SUCCESS != (rc = orte_dss.unpack(buffer,jobid,&cnt,ORTE_JOBID))) {
|
|
ORTE_ERROR_LOG(rc);
|
|
return rc;
|
|
}
|
|
cnt = 1;
|
|
if(ORTE_SUCCESS != (rc = orte_dss.unpack(buffer,&rc,&cnt,ORTE_INT32))) {
|
|
ORTE_ERROR_LOG(rc);
|
|
return rc;
|
|
}
|
|
return rc;
|
|
}
|
|
|
|
|