Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix compile bugs related to apmpi coll_sync mode #17

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion apmpi/lib/darshan-apmpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <pthread.h>
#include <dlfcn.h>
#include <assert.h>

#include "uthash.h"
Expand All @@ -24,12 +25,28 @@ typedef long long ap_bytes_t;
#define MIN(x,y) ((x==0.0)?y:((x<y)?x:y))
#define APMPI_WTIME() __darshan_disabled ? 0 : darshan_core_wtime();

#ifdef DARSHAN_PRELOAD
extern int (*__real_MPI_Barrier)(MPI_Comm comm);
#define MAP_OR_FAIL_BARRIER() \
if (!(__real_PMPI_Barrier)) \
{ \
__real_PMPI_Barrier = dlsym(RTLD_NEXT, "PMPI_Barrier"); \
if(!(__real_PMPI_Barrier)) { \
darshan_core_fprintf(stderr, "Darshan failed to map symbol: PMPI_Barrier\n"); \
exit(1); \
} \
}
#else
extern int __real_MPI_Barrier(MPI_Comm comm);
#define MAP_OR_FAIL_BARRIER() do {} while(0)
#endif

#ifdef __APMPI_COLL_SYNC

#define TIME_SYNC(FUNC) \
double tm1, tm2, tm3, tdiff, tsync;\
int ret; \
MAP_OR_FAIL(PMPI_Barrier);\
MAP_OR_FAIL_BARRIER(); \
tm1 = APMPI_WTIME(); \
ret = __real_PMPI_Barrier(comm); \
tm2 = APMPI_WTIME(); \
Expand Down