Merge pull request #136 from yfguo/misc-fix

Misc fix
pmodels · Jun 10, 2022 · 8c112d8 · 8c112d8
2 parents ef5fe00 + 791869b
commit 8c112d8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/include/shmem.h.in.tpl b/include/shmem.h.in.tpl
@@ -231,7 +231,7 @@ void shmem_putmem_signal_nbi(void *dest, const void *source, size_t nelems, uint
                              uint64_t signal, int sig_op, int pe);
 void shmem_ctx_putmem_signal_nbi(shmem_ctx_t ctx, void *dest, const void *source, size_t nelems,
                                  uint64_t *sig_addr, uint64_t signal, int sig_op, int pe);
-void shmem_signal_fetch(const uint64_t *sig_addr);
+uint64_t shmem_signal_fetch(const uint64_t *sig_addr);
 
 /* SHMEM_SIGNAL_TYPED_H start */
 /* SHMEM_SIGNAL_TYPED_H end */
@@ -289,6 +289,7 @@ void shmem_short_wait(short *ivar, short cmp_value);
 void shmem_int_wait(int *ivar, int cmp_value);
 void shmem_long_wait(long *ivar, long cmp_value);
 void shmem_longlong_wait(long long *ivar, long long cmp_value);
+uint64_t shmem_signal_wait_until(uint64_t *sig_addr, int cmp, uint64_t cmp_value);
 
 /* -- Memory Ordering -- */
 void shmem_fence(void);

diff --git a/src/shmem/p2p.c b/src/shmem/p2p.c
@@ -46,4 +46,10 @@ void shmem_longlong_wait(long long *ivar, long long cmp_value)
     OSHMPI_WAIT_UNTIL(ivar, SHMEM_CMP_NE, cmp_value, long long, MPI_LONG_LONG);
 }
 
+uint64_t shmem_signal_wait_until(uint64_t * sig_addr, int cmp, uint64_t cmp_value)
+{
+    OSHMPI_ASSERT(0);
+    return SHMEM_OTHER_ERR;
+}
+
 /* Deprecated APIs end */
diff --git a/src/shmem/signal.c b/src/shmem/signal.c
@@ -31,7 +31,8 @@ void shmem_ctx_putmem_signal_nbi(shmem_ctx_t ctx, void *dest, const void *source
     OSHMPI_ASSERT(0);
 }
 
-void shmem_signal_fetch(const uint64_t * sig_addr)
+uint64_t shmem_signal_fetch(const uint64_t * sig_addr)
 {
     OSHMPI_ASSERT(0);
+    return SHMEM_OTHER_ERR;
 }