Skip to content

Commit 90c06ff

Browse files
Checkpoint gds/shmem work. (#2579)
Signed-off-by: Samuel K. Gutierrez <samuel@lanl.gov>
1 parent 3766868 commit 90c06ff

File tree

8 files changed

+697
-209
lines changed

8 files changed

+697
-209
lines changed

src/mca/gds/shmem/gds_shmem.c

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@
1919
#include "gds_shmem_store.h"
2020
#include "gds_shmem_fetch.h"
2121

22-
#include "src/mca/gds/base/base.h"
23-
#include "src/mca/pcompress/base/base.h"
24-
2522
#include "src/class/pmix_list.h"
2623
#include "src/client/pmix_client_ops.h"
2724
#include "src/server/pmix_server_ops.h"
@@ -32,6 +29,8 @@
3229
#include "src/util/pmix_environ.h"
3330
#include "src/util/pmix_shmem.h"
3431

32+
#include "src/mca/pcompress/base/base.h"
33+
3534
#ifdef HAVE_STRING_H
3635
#include <string.h>
3736
#endif
@@ -825,6 +824,8 @@ job_construct(
825824
//
826825
j->nspace = NULL;
827826
//
827+
PMIX_CONSTRUCT(&j->jobinfo, pmix_list_t);
828+
//
828829
PMIX_CONSTRUCT(&j->nodeinfo, pmix_list_t);
829830
//
830831
j->session = NULL;
@@ -853,6 +854,8 @@ job_destruct(
853854
//
854855
PMIX_RELEASE(j->nspace);
855856
//
857+
PMIX_LIST_DESTRUCT(&j->jobinfo);
858+
//
856859
PMIX_LIST_DESTRUCT(&j->nodeinfo);
857860
//
858861
PMIX_RELEASE(j->session);
@@ -900,9 +903,11 @@ static void
900903
app_destruct(
901904
pmix_gds_shmem_app_t *a
902905
) {
906+
a->appnum = 0;
903907
PMIX_LIST_DESTRUCT(&a->appinfo);
904908
PMIX_LIST_DESTRUCT(&a->nodeinfo);
905909
PMIX_RELEASE(a->job);
910+
a->job = NULL;
906911
}
907912

908913
PMIX_CLASS_INSTANCE(
@@ -1232,6 +1237,7 @@ store(
12321237
else if (PMIX_CHECK_KEY(kval, PMIX_JOB_INFO_ARRAY)) {
12331238
return PMIX_ERR_NOT_SUPPORTED;
12341239
}
1240+
// Else we aren't dealing with an array type.
12351241
// See if the proc is me. We cannot use CHECK_PROCID
12361242
// as we don't want rank=wildcard to match.
12371243
if (proc->rank == pmix_globals.myid.rank &&

src/mca/gds/shmem/gds_shmem.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@
2626

2727
#include "include/pmix_common.h"
2828

29+
#ifdef HAVE_UNISTD_H
30+
#include <unistd.h>
31+
#endif
32+
2933
/**
3034
* The name of this module.
3135
*/
@@ -110,9 +114,11 @@ typedef struct {
110114
char *nspace_id;
111115
/** Pointer to the namespace. */
112116
pmix_namespace_t *nspace;
113-
// TODO(skg) Is the session nodeinfo the same info?
117+
/** Job information. */
118+
pmix_list_t jobinfo;
114119
/** Node information. */
115120
pmix_list_t nodeinfo;
121+
// TODO(skg) Is the session nodeinfo the same info?
116122
/** Session information. */
117123
pmix_gds_shmem_session_t *session;
118124
/** List of applications in this job. */

src/mca/gds/shmem/gds_shmem_component.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@
3030

3131
#include "gds_shmem.h"
3232

33-
#ifdef HAVE_UNISTD_H
34-
#include <unistd.h>
35-
#endif
36-
3733
static int
3834
component_open(void)
3935
{

0 commit comments

Comments
 (0)