use memcpy in ds_copy.
This commit was SVN r24942.
Этот коммит содержится в:
родитель
96ef2fc0e4
Коммит
adde221413
@ -149,14 +149,7 @@ static int
|
||||
ds_copy(const opal_shmem_ds_t *from,
|
||||
opal_shmem_ds_t *to)
|
||||
{
|
||||
/* SKG */
|
||||
to->flags = from->flags;
|
||||
to->seg_base_addr = from->seg_base_addr;
|
||||
to->opid = from->opid;
|
||||
to->seg_id = from->seg_id;
|
||||
to->seg_size = from->seg_size;
|
||||
to->seg_cpid = from->seg_cpid;
|
||||
memcpy(to->seg_name, from->seg_name, OPAL_PATH_MAX);
|
||||
memcpy(to, from, sizeof(opal_shmem_ds_t));
|
||||
|
||||
OPAL_OUTPUT_VERBOSE(
|
||||
(70, opal_shmem_base_output,
|
||||
|
@ -55,7 +55,7 @@
|
||||
int
|
||||
shmem_posix_shm_open(char *posix_file_name_buff, size_t size)
|
||||
{
|
||||
int attempt = 0, fd = -1;
|
||||
int attempt = 0, fd = -1;
|
||||
|
||||
/* workaround for simultaneous posix shm_opens on the same node (e.g.
|
||||
* multiple Open MPI jobs sharing a node). name collision during component
|
||||
|
@ -148,15 +148,7 @@ static int
|
||||
ds_copy(const opal_shmem_ds_t *from,
|
||||
opal_shmem_ds_t *to)
|
||||
{
|
||||
|
||||
/* SKG */
|
||||
to->flags = from->flags;
|
||||
to->seg_base_addr = from->seg_base_addr;
|
||||
to->opid = from->opid;
|
||||
to->seg_id = from->seg_id;
|
||||
to->seg_size = from->seg_size;
|
||||
to->seg_cpid = from->seg_cpid;
|
||||
memcpy(to->seg_name, from->seg_name, OPAL_PATH_MAX);
|
||||
memcpy(to, from, sizeof(opal_shmem_ds_t));
|
||||
|
||||
OPAL_OUTPUT_VERBOSE(
|
||||
(70, opal_shmem_base_output,
|
||||
|
@ -153,14 +153,7 @@ static int
|
||||
ds_copy(const opal_shmem_ds_t *from,
|
||||
opal_shmem_ds_t *to)
|
||||
{
|
||||
/* SKG */
|
||||
to->flags = from->flags;
|
||||
to->seg_base_addr = from->seg_base_addr;
|
||||
to->opid = from->opid;
|
||||
to->seg_id = from->seg_id;
|
||||
to->seg_size = from->seg_size;
|
||||
to->seg_cpid = from->seg_cpid;
|
||||
memcpy(to->seg_name, from->seg_name, OPAL_PATH_MAX);
|
||||
memcpy(to, from, sizeof(opal_shmem_ds_t));
|
||||
|
||||
OPAL_OUTPUT_VERBOSE(
|
||||
(70, opal_shmem_base_output,
|
||||
|
@ -146,25 +146,7 @@ static int
|
||||
ds_copy(const opal_shmem_ds_t *from,
|
||||
opal_shmem_ds_t *to)
|
||||
{
|
||||
pid_t my_pid = getpid();
|
||||
|
||||
/* inter-process copy - exclude process-specific data */
|
||||
if (from->opid != my_pid) {
|
||||
/* mask out internal flags */
|
||||
to->flags = (from->flags & OPAL_SHMEM_DS_FLAGS_INTERNAL_MASK);
|
||||
to->seg_base_addr = NULL;
|
||||
}
|
||||
/* i am the owner process, so i can safely copy all the information */
|
||||
else {
|
||||
to->flags = from->flags;
|
||||
to->seg_base_addr = from->seg_base_addr;
|
||||
}
|
||||
|
||||
to->opid = my_pid;
|
||||
to->seg_id = from->seg_id;
|
||||
to->seg_size = from->seg_size;
|
||||
to->seg_cpid = from->seg_cpid;
|
||||
memcpy(to->seg_name, from->seg_name, OPAL_PATH_MAX);
|
||||
memcpy(to, from, sizeof(opal_shmem_ds_t));
|
||||
|
||||
OPAL_OUTPUT_VERBOSE(
|
||||
(70, opal_shmem_base_output,
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user