Skip to content
GitLab
Commit d5abad0f authored by Shane Snyder's avatar Shane Snyder
Browse files

remove profiling macros from posix module

parent ac6c6442
Hide whitespace changes
Inline Side-by-side
darshan-runtime/lib/darshan-posix.c
View file @ d5abad0f
......@@ -340,15 +340,6 @@ static void posix_shutdown(void);
(__file)->file_record->counters[POSIX_STATS] += 1; \
} while(0)
static double psx_wrap_time = 0.0;
#define PSX_PRE_WRAP() \
double pre_wrap = darshan_core_wtime();
#define PSX_POST_WRAP() \
double post_wrap = darshan_core_wtime(); \
psx_wrap_time += (post_wrap-pre_wrap);
/**********************************************************
* Wrappers for POSIX I/O functions of interest *
......@@ -360,8 +351,6 @@ int DARSHAN_DECL(open)(const char *path, int flags, ...)
int ret;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(open);
if(flags & O_CREAT)
......@@ -387,8 +376,6 @@ int DARSHAN_DECL(open)(const char *path, int flags, ...)
POSIX_RECORD_OPEN(ret, path, mode, 0, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -398,8 +385,6 @@ int DARSHAN_DECL(open64)(const char *path, int flags, ...)
int ret;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(open64);
if(flags & O_CREAT)
......@@ -425,8 +410,6 @@ int DARSHAN_DECL(open64)(const char *path, int flags, ...)
POSIX_RECORD_OPEN(ret, path, mode, 0, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -435,8 +418,6 @@ int DARSHAN_DECL(creat)(const char* path, mode_t mode)
int ret;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(creat);
tm1 = darshan_core_wtime();
......@@ -448,8 +429,6 @@ int DARSHAN_DECL(creat)(const char* path, mode_t mode)
POSIX_RECORD_OPEN(ret, path, mode, 0, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -458,8 +437,6 @@ int DARSHAN_DECL(creat64)(const char* path, mode_t mode)
int ret;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(creat64);
tm1 = darshan_core_wtime();
......@@ -471,8 +448,6 @@ int DARSHAN_DECL(creat64)(const char* path, mode_t mode)
POSIX_RECORD_OPEN(ret, path, mode, 0, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -482,8 +457,6 @@ FILE* DARSHAN_DECL(fopen)(const char *path, const char *mode)
int fd;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(fopen);
tm1 = darshan_core_wtime();
......@@ -500,8 +473,6 @@ FILE* DARSHAN_DECL(fopen)(const char *path, const char *mode)
POSIX_RECORD_OPEN(fd, path, 0, 1, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -511,8 +482,6 @@ FILE* DARSHAN_DECL(fopen64)(const char *path, const char *mode)
int fd;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(fopen64);
tm1 = darshan_core_wtime();
......@@ -529,8 +498,6 @@ FILE* DARSHAN_DECL(fopen64)(const char *path, const char *mode)
POSIX_RECORD_OPEN(fd, path, 0, 1, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -539,8 +506,6 @@ int DARSHAN_DECL(mkstemp)(char* template)
int ret;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(mkstemp);
tm1 = darshan_core_wtime();
......@@ -552,8 +517,6 @@ int DARSHAN_DECL(mkstemp)(char* template)
POSIX_RECORD_OPEN(ret, template, 0, 0, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -562,8 +525,6 @@ int DARSHAN_DECL(mkostemp)(char* template, int flags)
int ret;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(mkostemp);
tm1 = darshan_core_wtime();
......@@ -575,8 +536,6 @@ int DARSHAN_DECL(mkostemp)(char* template, int flags)
POSIX_RECORD_OPEN(ret, template, 0, 0, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -585,8 +544,6 @@ int DARSHAN_DECL(mkstemps)(char* template, int suffixlen)
int ret;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(mkstemps);
tm1 = darshan_core_wtime();
......@@ -598,8 +555,6 @@ int DARSHAN_DECL(mkstemps)(char* template, int suffixlen)
POSIX_RECORD_OPEN(ret, template, 0, 0, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -608,8 +563,6 @@ int DARSHAN_DECL(mkostemps)(char* template, int suffixlen, int flags)
int ret;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(mkostemps);
tm1 = darshan_core_wtime();
......@@ -621,8 +574,6 @@ int DARSHAN_DECL(mkostemps)(char* template, int suffixlen, int flags)
POSIX_RECORD_OPEN(ret, template, 0, 0, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -632,8 +583,6 @@ ssize_t DARSHAN_DECL(read)(int fd, void *buf, size_t count)
int aligned_flag = 0;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(read);
if((unsigned long)buf % darshan_mem_alignment == 0) aligned_flag = 1;
......@@ -647,8 +596,6 @@ ssize_t DARSHAN_DECL(read)(int fd, void *buf, size_t count)
POSIX_RECORD_READ(ret, fd, 0, 0, aligned_flag, 0, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -658,8 +605,6 @@ ssize_t DARSHAN_DECL(write)(int fd, const void *buf, size_t count)
int aligned_flag = 0;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(write);
if((unsigned long)buf % darshan_mem_alignment == 0) aligned_flag = 1;
......@@ -673,8 +618,6 @@ ssize_t DARSHAN_DECL(write)(int fd, const void *buf, size_t count)
POSIX_RECORD_WRITE(ret, fd, 0, 0, aligned_flag, 0, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -684,8 +627,6 @@ ssize_t DARSHAN_DECL(pread)(int fd, void *buf, size_t count, off_t offset)
int aligned_flag = 0;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(pread);
if((unsigned long)buf % darshan_mem_alignment == 0) aligned_flag = 1;
......@@ -699,8 +640,6 @@ ssize_t DARSHAN_DECL(pread)(int fd, void *buf, size_t count, off_t offset)
POSIX_RECORD_READ(ret, fd, 1, offset, aligned_flag, 0, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -710,8 +649,6 @@ ssize_t DARSHAN_DECL(pwrite)(int fd, const void *buf, size_t count, off_t offset
int aligned_flag = 0;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(pwrite);
if((unsigned long)buf % darshan_mem_alignment == 0) aligned_flag = 1;
......@@ -725,8 +662,6 @@ ssize_t DARSHAN_DECL(pwrite)(int fd, const void *buf, size_t count, off_t offset
POSIX_RECORD_WRITE(ret, fd, 1, offset, aligned_flag, 0, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -736,8 +671,6 @@ ssize_t DARSHAN_DECL(pread64)(int fd, void *buf, size_t count, off64_t offset)
int aligned_flag = 0;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(pread64);
if((unsigned long)buf % darshan_mem_alignment == 0) aligned_flag = 1;
......@@ -751,8 +684,6 @@ ssize_t DARSHAN_DECL(pread64)(int fd, void *buf, size_t count, off64_t offset)
POSIX_RECORD_READ(ret, fd, 1, offset, aligned_flag, 0, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -762,8 +693,6 @@ ssize_t DARSHAN_DECL(pwrite64)(int fd, const void *buf, size_t count, off64_t of
int aligned_flag = 0;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(pwrite64);
if((unsigned long)buf % darshan_mem_alignment == 0) aligned_flag = 1;
......@@ -777,8 +706,6 @@ ssize_t DARSHAN_DECL(pwrite64)(int fd, const void *buf, size_t count, off64_t of
POSIX_RECORD_WRITE(ret, fd, 1, offset, aligned_flag, 0, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -789,8 +716,6 @@ ssize_t DARSHAN_DECL(readv)(int fd, const struct iovec *iov, int iovcnt)
int i;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(readv);
for(i=0; i<iovcnt; i++)
......@@ -808,8 +733,6 @@ ssize_t DARSHAN_DECL(readv)(int fd, const struct iovec *iov, int iovcnt)
POSIX_RECORD_READ(ret, fd, 0, 0, aligned_flag, 0, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -820,8 +743,6 @@ ssize_t DARSHAN_DECL(writev)(int fd, const struct iovec *iov, int iovcnt)
int i;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(writev);
for(i=0; i<iovcnt; i++)
......@@ -839,8 +760,6 @@ ssize_t DARSHAN_DECL(writev)(int fd, const struct iovec *iov, int iovcnt)
POSIX_RECORD_WRITE(ret, fd, 0, 0, aligned_flag, 0, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -850,8 +769,6 @@ size_t DARSHAN_DECL(fread)(void *ptr, size_t size, size_t nmemb, FILE *stream)
int aligned_flag = 0;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(fread);
if((unsigned long)ptr % darshan_mem_alignment == 0) aligned_flag = 1;
......@@ -874,8 +791,6 @@ size_t DARSHAN_DECL(fread)(void *ptr, size_t size, size_t nmemb, FILE *stream)
}
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -885,8 +800,6 @@ size_t DARSHAN_DECL(fwrite)(const void *ptr, size_t size, size_t nmemb, FILE *st
int aligned_flag = 0;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(fwrite);
if((unsigned long)ptr % darshan_mem_alignment == 0) aligned_flag = 1;
......@@ -909,8 +822,6 @@ size_t DARSHAN_DECL(fwrite)(const void *ptr, size_t size, size_t nmemb, FILE *st
}
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -920,8 +831,6 @@ off_t DARSHAN_DECL(lseek)(int fd, off_t offset, int whence)
struct posix_file_runtime* file;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(lseek);
tm1 = darshan_core_wtime();
......@@ -944,8 +853,6 @@ off_t DARSHAN_DECL(lseek)(int fd, off_t offset, int whence)
POSIX_UNLOCK();
}
PSX_POST_WRAP();
return(ret);
}
......@@ -955,8 +862,6 @@ off_t DARSHAN_DECL(lseek64)(int fd, off_t offset, int whence)
struct posix_file_runtime* file;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(lseek64);
tm1 = darshan_core_wtime();
......@@ -979,8 +884,6 @@ off_t DARSHAN_DECL(lseek64)(int fd, off_t offset, int whence)
POSIX_UNLOCK();
}
PSX_POST_WRAP();
return(ret);
}
......@@ -990,8 +893,6 @@ int DARSHAN_DECL(fseek)(FILE *stream, long offset, int whence)
struct posix_file_runtime* file;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(fseek);
tm1 = darshan_core_wtime();
......@@ -1014,8 +915,6 @@ int DARSHAN_DECL(fseek)(FILE *stream, long offset, int whence)
POSIX_UNLOCK();
}
PSX_POST_WRAP();
return(ret);
}
......@@ -1024,8 +923,6 @@ int DARSHAN_DECL(__xstat)(int vers, const char *path, struct stat *buf)
int ret;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(__xstat);
tm1 = darshan_core_wtime();
......@@ -1040,8 +937,6 @@ int DARSHAN_DECL(__xstat)(int vers, const char *path, struct stat *buf)
POSIX_LOOKUP_RECORD_STAT(path, buf, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -1050,8 +945,6 @@ int DARSHAN_DECL(__xstat64)(int vers, const char *path, struct stat64 *buf)
int ret;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(__xstat64);
tm1 = darshan_core_wtime();
......@@ -1066,8 +959,6 @@ int DARSHAN_DECL(__xstat64)(int vers, const char *path, struct stat64 *buf)
POSIX_LOOKUP_RECORD_STAT(path, buf, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -1076,8 +967,6 @@ int DARSHAN_DECL(__lxstat)(int vers, const char *path, struct stat *buf)
int ret;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(__lxstat);
tm1 = darshan_core_wtime();
......@@ -1092,8 +981,6 @@ int DARSHAN_DECL(__lxstat)(int vers, const char *path, struct stat *buf)
POSIX_LOOKUP_RECORD_STAT(path, buf, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -1102,8 +989,6 @@ int DARSHAN_DECL(__lxstat64)(int vers, const char *path, struct stat64 *buf)
int ret;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(__lxstat64);
tm1 = darshan_core_wtime();
......@@ -1118,8 +1003,6 @@ int DARSHAN_DECL(__lxstat64)(int vers, const char *path, struct stat64 *buf)
POSIX_LOOKUP_RECORD_STAT(path, buf, tm1, tm2);
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -1129,8 +1012,6 @@ int DARSHAN_DECL(__fxstat)(int vers, int fd, struct stat *buf)
struct posix_file_runtime* file;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(__fxstat);
tm1 = darshan_core_wtime();
......@@ -1149,8 +1030,6 @@ int DARSHAN_DECL(__fxstat)(int vers, int fd, struct stat *buf)
}
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -1160,8 +1039,6 @@ int DARSHAN_DECL(__fxstat64)(int vers, int fd, struct stat64 *buf)
struct posix_file_runtime* file;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(__fxstat64);
tm1 = darshan_core_wtime();
......@@ -1180,8 +1057,6 @@ int DARSHAN_DECL(__fxstat64)(int vers, int fd, struct stat64 *buf)
}
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -1191,8 +1066,6 @@ void* DARSHAN_DECL(mmap)(void *addr, size_t length, int prot, int flags,
void* ret;
struct posix_file_runtime* file;
PSX_PRE_WRAP();
MAP_OR_FAIL(mmap);
ret = __real_mmap(addr, length, prot, flags, fd, offset);
......@@ -1208,8 +1081,6 @@ void* DARSHAN_DECL(mmap)(void *addr, size_t length, int prot, int flags,
}
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -1219,8 +1090,6 @@ void* DARSHAN_DECL(mmap64)(void *addr, size_t length, int prot, int flags,
void* ret;
struct posix_file_runtime* file;
PSX_PRE_WRAP();
MAP_OR_FAIL(mmap64);
ret = __real_mmap64(addr, length, prot, flags, fd, offset);
......@@ -1236,8 +1105,6 @@ void* DARSHAN_DECL(mmap64)(void *addr, size_t length, int prot, int flags,
}
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -1247,8 +1114,6 @@ int DARSHAN_DECL(fsync)(int fd)
struct posix_file_runtime* file;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(fsync);
tm1 = darshan_core_wtime();
......@@ -1270,8 +1135,6 @@ int DARSHAN_DECL(fsync)(int fd)
}
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -1281,8 +1144,6 @@ int DARSHAN_DECL(fdatasync)(int fd)
struct posix_file_runtime* file;
double tm1, tm2;
PSX_PRE_WRAP();
MAP_OR_FAIL(fdatasync);
tm1 = darshan_core_wtime();
......@@ -1304,8 +1165,6 @@ int DARSHAN_DECL(fdatasync)(int fd)
}
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -1315,8 +1174,6 @@ int DARSHAN_DECL(close)(int fd)
double tm1, tm2;
int ret;
PSX_PRE_WRAP();
MAP_OR_FAIL(close);
tm1 = darshan_core_wtime();
......@@ -1339,8 +1196,6 @@ int DARSHAN_DECL(close)(int fd)
}
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -1351,8 +1206,6 @@ int DARSHAN_DECL(fclose)(FILE *fp)
double tm1, tm2;
int ret;
PSX_PRE_WRAP();
MAP_OR_FAIL(fclose);
tm1 = darshan_core_wtime();
......@@ -1375,8 +1228,6 @@ int DARSHAN_DECL(fclose)(FILE *fp)
}
POSIX_UNLOCK();
PSX_POST_WRAP();
return(ret);
}
......@@ -1384,8 +1235,6 @@ int DARSHAN_DECL(aio_read)(struct aiocb *aiocbp)
{
int ret;
PSX_PRE_WRAP();
MAP_OR_FAIL(aio_read);
ret = __real_aio_read(aiocbp);
......@@ -1397,8 +1246,6 @@ int DARSHAN_DECL(aio_read)(struct aiocb *aiocbp)
POSIX_UNLOCK();
}
PSX_POST_WRAP();
return(ret);
}
......@@ -1406,8 +1253,6 @@ int DARSHAN_DECL(aio_write)(struct aiocb *aiocbp)
{
int ret;
PSX_PRE_WRAP();
MAP_OR_FAIL(aio_write);
ret = __real_aio_write(aiocbp);
......@@ -1419,8 +1264,6 @@ int DARSHAN_DECL(aio_write)(struct aiocb *aiocbp)
POSIX_UNLOCK();
}
PSX_POST_WRAP();
return(ret);
}
......@@ -1428,8 +1271,6 @@ int DARSHAN_DECL(aio_read64)(struct aiocb64 *aiocbp)
{
int ret;
PSX_PRE_WRAP();
MAP_OR_FAIL(aio_read64);
ret = __real_aio_read64(aiocbp);
......@@ -1441,8 +1282,6 @@ int DARSHAN_DECL(aio_read64)(struct aiocb64 *aiocbp)
POSIX_UNLOCK();
}
PSX_POST_WRAP();
return(ret);
}
......@@ -1450,8 +1289,6 @@ int DARSHAN_DECL(aio_write64)(struct aiocb64 *aiocbp)