ports/openmpi
ports/openmpi
1
1
Fork 0
Code Releases Activity

Merge pull request #4620 from rhc54/topic/closefd

Browse Source 
Close the shmemfd to avoid leaking it
This commit is contained in:
Ralph Castain 2017-12-13 11:09:35 -08:00 committed by GitHub
commit 6ec4ab57fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
orte/mca/rtc/hwloc/rtc_hwloc.c
View File

@ -35,6 +35,7 @@
#include "opal/mca/hwloc/hwloc-internal.h"
#include "opal/mca/pmix/pmix_types.h"
#include "opal/util/argv.h"
#include "opal/util/fd.h"
#include "opal/util/opal_environ.h"
#include "opal/util/path.h"
@ -168,6 +169,8 @@ static int init(void)
shmemfile = NULL;
return ORTE_SUCCESS;
}
/* ensure nobody inherits this fd */
opal_fd_set_cloexec(shmemfd);
/* populate the shmem segment with the topology */
if (0 != (rc = hwloc_shmem_topology_write(opal_hwloc_topology, shmemfd, 0,
(void*)shmemaddr, shmemsize, 0))) {
@ -177,6 +180,8 @@ static int init(void)
unlink(shmemfile);
free(shmemfile);
shmemfile = NULL;
close(shmemfd);
shmemfd = -1;
return ORTE_SUCCESS;
}
#endif
@ -191,6 +196,9 @@ static void finalize(void)
unlink(shmemfile);
free(shmemfile);
}
if (0 <= shmemfd) {
close(shmemfd);
}
#endif
return;
}