Commit 6ae7e0da authored by Philip Carns's avatar Philip Carns

revert previous commit


git-svn-id: https://svn.mcs.anl.gov/repos/darshan/trunk@610 3b7491f3-a168-0410-bf4b-c445ed680a29
parent a2017060
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <search.h> #include <search.h>
#include <assert.h> #include <assert.h>
#include <libgen.h> #include <libgen.h>
#include <limits.h>
#define __USE_GNU #define __USE_GNU
#include <pthread.h> #include <pthread.h>
...@@ -101,7 +100,6 @@ DARSHAN_FORWARD_DECL(fwrite, size_t, (const void *ptr, size_t size, size_t nmemb ...@@ -101,7 +100,6 @@ DARSHAN_FORWARD_DECL(fwrite, size_t, (const void *ptr, size_t size, size_t nmemb
DARSHAN_FORWARD_DECL(fseek, int, (FILE *stream, long offset, int whence)); DARSHAN_FORWARD_DECL(fseek, int, (FILE *stream, long offset, int whence));
DARSHAN_FORWARD_DECL(fsync, int, (int fd)); DARSHAN_FORWARD_DECL(fsync, int, (int fd));
DARSHAN_FORWARD_DECL(fdatasync, int, (int fd)); DARSHAN_FORWARD_DECL(fdatasync, int, (int fd));
DARSHAN_FORWARD_DECL(chdir, int, (const char* path));
pthread_mutex_t cp_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP; pthread_mutex_t cp_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
struct darshan_job_runtime* darshan_global_job = NULL; struct darshan_job_runtime* darshan_global_job = NULL;
...@@ -124,8 +122,6 @@ static char* exclusions[] = { ...@@ -124,8 +122,6 @@ static char* exclusions[] = {
NULL NULL
}; };
static char working_dir[PATH_MAX] = {0};
static double posix_wtime(void); static double posix_wtime(void);
static void cp_access_counter(struct darshan_file_runtime* file, ssize_t size, enum cp_counter_type type); static void cp_access_counter(struct darshan_file_runtime* file, ssize_t size, enum cp_counter_type type);
...@@ -581,21 +577,6 @@ int DARSHAN_DECL(open)(const char *path, int flags, ...) ...@@ -581,21 +577,6 @@ int DARSHAN_DECL(open)(const char *path, int flags, ...)
return(ret); return(ret);
} }
int DARSHAN_DECL(chdir)(const char *path)
{
int ret;
MAP_OR_FAIL(chdir);
ret = __real_chdir(path);
if(ret == 0)
{
strncpy(working_dir, path, PATH_MAX-1);
}
return(ret);
}
FILE* DARSHAN_DECL(fopen64)(const char *path, const char *mode) FILE* DARSHAN_DECL(fopen64)(const char *path, const char *mode)
{ {
FILE* ret; FILE* ret;
...@@ -1102,13 +1083,6 @@ void darshan_initialize(int argc, char** argv, int nprocs, int rank) ...@@ -1102,13 +1083,6 @@ void darshan_initialize(int argc, char** argv, int nprocs, int rank)
/* turn off tracing */ /* turn off tracing */
return; return;
} }
/* find current working directory */
if(getcwd(working_dir, PATH_MAX) == NULL)
{
/* turn off tracing if we can't find working dir */
return;
}
disable_timing = getenv("DARSHAN_DISABLE_TIMING"); disable_timing = getenv("DARSHAN_DISABLE_TIMING");
...@@ -1141,7 +1115,6 @@ void darshan_initialize(int argc, char** argv, int nprocs, int rank) ...@@ -1141,7 +1115,6 @@ void darshan_initialize(int argc, char** argv, int nprocs, int rank)
darshan_mem_alignment = 1; darshan_mem_alignment = 1;
} }
/* allocate structure to track darshan_global_job information */ /* allocate structure to track darshan_global_job information */
darshan_global_job = malloc(sizeof(*darshan_global_job)); darshan_global_job = malloc(sizeof(*darshan_global_job));
if(!darshan_global_job) if(!darshan_global_job)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment