From fd742c573bc7ae32bcfed61c2f74ebf62be25f30 Mon Sep 17 00:00:00 2001
From: Andreas Galonska <a.galonska@fz-juelich.de>
Date: Wed, 8 Mar 2017 16:57:01 +0100
Subject: [PATCH] fix
---
src/nam_ext_interface.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/nam_ext_interface.c b/src/nam_ext_interface.c
index f975432..51fbc69 100644
--- a/src/nam_ext_interface.c
+++ b/src/nam_ext_interface.c
@@ -398,10 +398,9 @@ ssize_t nam_get_max_bytes(nam_ext_allocation_t *ext_alloc)
{
ssize_t rc;
- if(ext_alloc->alloc->status == ALLOC_CPRS)
- rc = ext_alloc->max_bytes;
- else
- rc = -1;
+
+ rc = ext_alloc->max_bytes;
+
return rc;
@@ -625,7 +624,7 @@ int nam_restart(nam_cp_args_t *args)
if(rank_to_rebuild < 0)
{
nam_print(0, "Error: no rank found which has no data. aborting restart process!");
- rc = 1;
+ rc = 0;
goto error;
}
@@ -702,7 +701,7 @@ int nam_restart(nam_cp_args_t *args)
}
}
- sleep(3);
+
MPI_Barrier(comm);
//set all memory to unactive
extoll_reset_memory();
@@ -1170,7 +1169,7 @@ nam_ext_allocation_t *nam_alloc_cprs(int root, MPI_Comm comm)
#ifndef ATEST
MPI_Allgather(&my_rank_global, 1, MPI_INT, ext_alloc->global_ranks, 1, MPI_INT, comm_local);
#else
- dummy_allgather(&my_rank_global, 1, MPI_INT, ext_alloc->global_ranks, comm);
+ dummy_allgather(&my_rank_global, 1, MPI_INT, ext_alloc->global_ranks, comm_local);
#endif
--
GitLab