Commit 82526cf0 authored by Philip Carns's avatar Philip Carns

fix previous commit


git-svn-id: https://svn.mcs.anl.gov/repos/darshan/trunk@402 3b7491f3-a168-0410-bf4b-c445ed680a29
parent ab4b6397
...@@ -24,8 +24,8 @@ static void cd_print_int(char * prefix, int arg1, int arg2) ...@@ -24,8 +24,8 @@ static void cd_print_int(char * prefix, int arg1, int arg2)
} }
static void cd_print_int64(char * prefix, int64_t arg1, int64_t arg2) static void cd_print_int64(char * prefix, int64_t arg1, int64_t arg2)
{ {
printf("- %s %PRId64\n", prefix, arg1); printf("- %s %" PRId64 "\n", prefix, arg1);
printf("+ %s %PRId64\n", prefix, arg2); printf("+ %s %" PRId64 "\n", prefix, arg2);
} }
...@@ -116,11 +116,11 @@ int main(int argc, char ** argv) ...@@ -116,11 +116,11 @@ int main(int argc, char ** argv)
for(i=0; i<CP_NUM_INDICES; i++) { for(i=0; i<CP_NUM_INDICES; i++) {
if (cp_file1.counters[i] != cp_file2.counters[i]) { if (cp_file1.counters[i] != cp_file2.counters[i]) {
printf("- "); printf("- ");
printf("%PRId64\t%PRIu64\t%s\t%PRId64\t...%s\n", printf("%" PRId64 "\t%" PRIu64 "\t%s\t%" PRId64 "\t...%s\n",
cp_file1.rank, cp_file1.hash, darshan_names[i], cp_file1.rank, cp_file1.hash, darshan_names[i],
cp_file1.counters[i], cp_file1.name_suffix); cp_file1.counters[i], cp_file1.name_suffix);
printf("+ "); printf("+ ");
printf("%PRId64\t%PRIu64\t%s\t%PRId64\t...%s\n", printf("%" PRId64 "\t%" PRIu64 "\t%s\t%" PRId64 "\t...%s\n",
cp_file2.rank, cp_file2.hash, darshan_names[i], cp_file2.rank, cp_file2.hash, darshan_names[i],
cp_file2.counters[i], cp_file2.name_suffix); cp_file2.counters[i], cp_file2.name_suffix);
} }
...@@ -128,11 +128,11 @@ int main(int argc, char ** argv) ...@@ -128,11 +128,11 @@ int main(int argc, char ** argv)
for(i=0; i<CP_F_NUM_INDICES; i++) { for(i=0; i<CP_F_NUM_INDICES; i++) {
if (cp_file1.fcounters[i] != cp_file2.fcounters[i]) { if (cp_file1.fcounters[i] != cp_file2.fcounters[i]) {
printf("- "); printf("- ");
printf("%PRId64\t%PRIu64\t%s\t%f\t...%s\n", printf("%" PRId64 "\t%" PRIu64 "\t%s\t%f\t...%s\n",
cp_file1.rank, cp_file1.hash, darshan_f_names[i], cp_file1.rank, cp_file1.hash, darshan_f_names[i],
cp_file1.fcounters[i], cp_file1.name_suffix); cp_file1.fcounters[i], cp_file1.name_suffix);
printf("+ "); printf("+ ");
printf("%PRId64\t%PRIu64\t%s\t%f\t...%s\n", printf("%" PRId64 "\t%" PRIu64 "\t%s\t%f\t...%s\n",
cp_file2.rank, cp_file2.hash, darshan_f_names[i], cp_file2.rank, cp_file2.hash, darshan_f_names[i],
cp_file2.fcounters[i], cp_file2.name_suffix); cp_file2.fcounters[i], cp_file2.name_suffix);
} }
......
...@@ -23,23 +23,23 @@ ...@@ -23,23 +23,23 @@
const char *insert_job_fmt = "insert into %s values('%d','%s','%s','%s',\ const char *insert_job_fmt = "insert into %s values('%d','%s','%s','%s',\
'%d','%ld','%ld','%d')"; '%d','%ld','%ld','%d')";
const char *insert_mnt_fmt = "insert into %s values('%d','%d','%PRId64','%s','%s')"; const char *insert_mnt_fmt = "insert into %s values('%d','%d','%" PRId64 "','%s','%s')";
const char *insert_file_fmt = "insert into %s values('%d','%ld','%PRId64','%d',\ const char *insert_file_fmt = "insert into %s values('%d','%ld','%" PRId64 "','%d',\
'%s',\ '%s',\
'%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64',\ '%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "',\
'%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64',\ '%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "',\
'%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64',\ '%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "',\
'%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64',\ '%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "',\
'%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64',\ '%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "',\
'%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64',\ '%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "',\
'%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64',\ '%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "',\
'%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64',\ '%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "',\
'%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64',\ '%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "',\
'%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64',\ '%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "',\
'%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64',\ '%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "',\
'%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64',\ '%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "',\
'%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64',\ '%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "',\
'%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64','%PRId64',\ '%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "','%" PRId64 "',\
'%.16lf','%.16lf','%.16lf','%.16lf','%.16lf',\ '%.16lf','%.16lf','%.16lf','%.16lf','%.16lf',\
'%.16lf','%.16lf','%.16lf','%.16lf','%.16lf',\ '%.16lf','%.16lf','%.16lf','%.16lf','%.16lf',\
'%.16lf','%.16lf','%.16lf','%.16lf')"; '%.16lf','%.16lf','%.16lf','%.16lf')";
......
...@@ -6,18 +6,22 @@ ...@@ -6,18 +6,22 @@
#ifndef __DARSHAN_LOG_FORMAT_H #ifndef __DARSHAN_LOG_FORMAT_H
#define __DARSHAN_LOG_FORMAT_H #define __DARSHAN_LOG_FORMAT_H
#include "darshan-config.h"
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <stdint.h> #include <stdint.h>
#ifdef HAVE_INTTYPES_H #ifdef HAVE_INTTYPES_H
#include <inttypes.h> #include <inttypes.h>
#endif #endif
#include "darshan-config.h"
#if !defined PRId64 || PRI_MACROS_BROKEN #if !defined PRId64 || PRI_MACROS_BROKEN
# undef PRId64 # undef PRId64
# define PRId64 (sizeof (long) == 8 ? "ld" : "lld") # define PRId64 (sizeof (long) == 8 ? "ld" : "lld")
#endif #endif
#if !defined PRIu64 || PRI_MACROS_BROKEN
# undef PRIu64
# define PRIu64 (sizeof (long) == 8 ? "lu" : "llu")
#endif
/* update this on file format changes */ /* update this on file format changes */
#define CP_VERSION "2.00" #define CP_VERSION "2.00"
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
* See COPYRIGHT in top-level directory. * See COPYRIGHT in top-level directory.
*/ */
#include "darshan-config.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#include <stdlib.h> #include <stdlib.h>
#include <inttypes.h> #include <inttypes.h>
#include "darshan-logutils.h" #include "darshan-logutils.h"
#include "darshan-config.h"
/* isn't there a clever c way to avoid this? */ /* isn't there a clever c way to avoid this? */
char *darshan_names[] = { char *darshan_names[] = {
...@@ -366,7 +366,7 @@ int darshan_log_getmounts(darshan_fd fd, int64_t** devs, char*** mnt_pts, char** ...@@ -366,7 +366,7 @@ int darshan_log_getmounts(darshan_fd fd, int64_t** devs, char*** mnt_pts, char**
(*fs_types)[array_index] = malloc(CP_EXE_LEN); (*fs_types)[array_index] = malloc(CP_EXE_LEN);
assert((*fs_types)[array_index]); assert((*fs_types)[array_index]);
ret = sscanf(++pos, "%PRId64\t%s\t%s", &(*devs)[array_index], ret = sscanf(++pos, "%" PRId64 "\t%s\t%s", &(*devs)[array_index],
(*fs_types)[array_index], (*mnt_pts)[array_index]); (*fs_types)[array_index], (*mnt_pts)[array_index]);
if(ret != 3) if(ret != 3)
......
...@@ -34,13 +34,13 @@ void darshan_log_print_version_warnings(struct darshan_job *job); ...@@ -34,13 +34,13 @@ void darshan_log_print_version_warnings(struct darshan_job *job);
/* convenience macros for printing out counters */ /* convenience macros for printing out counters */
#define CP_PRINT_HEADER() printf("#<rank>\t<file>\t<counter>\t<value>\t<name suffix>\t<mount pt>\t<fs type>\n") #define CP_PRINT_HEADER() printf("#<rank>\t<file>\t<counter>\t<value>\t<name suffix>\t<mount pt>\t<fs type>\n")
#define CP_PRINT(__job, __file, __counter, __mnt_pt, __fs_type) do {\ #define CP_PRINT(__job, __file, __counter, __mnt_pt, __fs_type) do {\
printf("%PRId64\t%PRIu64\t%s\t%PRId64\t...%s\t%s\t%s\n", \ printf("%" PRId64 "\t%" PRIu64 "\t%s\t%" PRId64 "\t...%s\t%s\t%s\n", \
(__file)->rank, (__file)->hash, darshan_names[__counter], \ (__file)->rank, (__file)->hash, darshan_names[__counter], \
(__file)->counters[__counter], (__file)->name_suffix, \ (__file)->counters[__counter], (__file)->name_suffix, \
__mnt_pt, __fs_type); \ __mnt_pt, __fs_type); \
} while(0) } while(0)
#define CP_F_PRINT(__job, __file, __counter, __mnt_pt, __fs_type) do {\ #define CP_F_PRINT(__job, __file, __counter, __mnt_pt, __fs_type) do {\
printf("%PRId64\t%PRIu64\t%s\t%f\t...%s\t%s\t%s\n", \ printf("%" PRId64 "\t%" PRIu64 "\t%s\t%f\t...%s\t%s\t%s\n", \
(__file)->rank, (__file)->hash, darshan_f_names[__counter], \ (__file)->rank, (__file)->hash, darshan_f_names[__counter], \
(__file)->fcounters[__counter], (__file)->name_suffix, \ (__file)->fcounters[__counter], (__file)->name_suffix, \
__mnt_pt, __fs_type); \ __mnt_pt, __fs_type); \
......
...@@ -234,17 +234,17 @@ int main(int argc, char **argv) ...@@ -234,17 +234,17 @@ int main(int argc, char **argv)
printf("# size of file statistics: %zu bytes\n", sizeof(cp_file)); printf("# size of file statistics: %zu bytes\n", sizeof(cp_file));
printf("# size of job statistics: %zu bytes\n", sizeof(job)); printf("# size of job statistics: %zu bytes\n", sizeof(job));
printf("# exe: %s\n", tmp_string); printf("# exe: %s\n", tmp_string);
printf("# uid: %PRId64\n", job.uid); printf("# uid: %" PRId64 "\n", job.uid);
printf("# jobid: %PRId64\n", job.jobid); printf("# jobid: %" PRId64 "\n", job.jobid);
printf("# start_time: %PRId64\n", job.start_time); printf("# start_time: %" PRId64 "\n", job.start_time);
tmp_time += job.start_time; tmp_time += job.start_time;
printf("# start_time_asci: %s", ctime(&tmp_time)); printf("# start_time_asci: %s", ctime(&tmp_time));
printf("# end_time: %PRId64\n", job.end_time); printf("# end_time: %" PRId64 "\n", job.end_time);
tmp_time = 0; tmp_time = 0;
tmp_time += job.end_time; tmp_time += job.end_time;
printf("# end_time_asci: %s", ctime(&tmp_time)); printf("# end_time_asci: %s", ctime(&tmp_time));
printf("# nprocs: %PRId64\n", job.nprocs); printf("# nprocs: %" PRId64 "\n", job.nprocs);
printf("# run time: %PRId64\n", job.end_time - job.start_time + 1); printf("# run time: %" PRId64 "\n", job.end_time - job.start_time + 1);
/* print table of mounted file systems */ /* print table of mounted file systems */
ret = darshan_log_getmounts(file, &devs, &mnt_pts, &fs_types, &mount_count, ret = darshan_log_getmounts(file, &devs, &mnt_pts, &fs_types, &mount_count,
...@@ -253,7 +253,7 @@ int main(int argc, char **argv) ...@@ -253,7 +253,7 @@ int main(int argc, char **argv)
printf("# -------------------------------------------------------\n"); printf("# -------------------------------------------------------\n");
for(i=0; i<mount_count; i++) for(i=0; i<mount_count; i++)
{ {
printf("# mount entry: %PRId64\t%s\t%s\n", devs[i], mnt_pts[i], fs_types[i]); printf("# mount entry: %" PRId64 "\t%s\t%s\n", devs[i], mnt_pts[i], fs_types[i]);
} }
if(no_files_flag) if(no_files_flag)
...@@ -408,7 +408,7 @@ int main(int argc, char **argv) ...@@ -408,7 +408,7 @@ int main(int argc, char **argv)
{ {
for(i=0; i<CP_NUM_INDICES; i++) for(i=0; i<CP_NUM_INDICES; i++)
{ {
printf("total_%s: %PRId64\n", printf("total_%s: %" PRId64 "\n",
darshan_names[i], total.counters[i]); darshan_names[i], total.counters[i]);
} }
for(i=0; i<CP_F_NUM_INDICES; i++) for(i=0; i<CP_F_NUM_INDICES; i++)
...@@ -424,7 +424,7 @@ int main(int argc, char **argv) ...@@ -424,7 +424,7 @@ int main(int argc, char **argv)
{ {
printf("\n# performance\n"); printf("\n# performance\n");
printf("# -----------\n"); printf("# -----------\n");
printf("# total_bytes: %PRId64\n", pdata.total_bytes); printf("# total_bytes: %" PRId64 "\n", pdata.total_bytes);
printf("# slowest_rank_time: %lf\n", pdata.slowest_rank_time); printf("# slowest_rank_time: %lf\n", pdata.slowest_rank_time);
printf("# slowest_rank_meta_time: %lf\n", pdata.slowest_rank_meta_time); printf("# slowest_rank_meta_time: %lf\n", pdata.slowest_rank_meta_time);
printf("# shared_time_by_cumul: %lf\n", pdata.shared_time_by_cumul); printf("# shared_time_by_cumul: %lf\n", pdata.shared_time_by_cumul);
...@@ -443,27 +443,27 @@ int main(int argc, char **argv) ...@@ -443,27 +443,27 @@ int main(int argc, char **argv)
{ {
printf("\n# files\n"); printf("\n# files\n");
printf("# -----\n"); printf("# -----\n");
printf("# total: %PRId64 %PRId64 %PRId64\n", printf("# total: %" PRId64 " %" PRId64 " %" PRId64 "\n",
fdata.total, fdata.total,
fdata.total_size, fdata.total_size,
fdata.total_max); fdata.total_max);
printf("# read_only: %PRId64 %PRId64 %PRId64\n", printf("# read_only: %" PRId64 " %" PRId64 " %" PRId64 "\n",
fdata.read_only, fdata.read_only,
fdata.read_only_size, fdata.read_only_size,
fdata.read_only_max); fdata.read_only_max);
printf("# write_only: %PRId64 %PRId64 %PRId64\n", printf("# write_only: %" PRId64 " %" PRId64 " %" PRId64 "\n",
fdata.write_only, fdata.write_only,
fdata.write_only_size, fdata.write_only_size,
fdata.write_only_max); fdata.write_only_max);
printf("# read_write: %PRId64 %PRId64 %PRId64\n", printf("# read_write: %" PRId64 " %" PRId64 " %" PRId64 "\n",
fdata.read_write, fdata.read_write,
fdata.read_write_size, fdata.read_write_size,
fdata.read_write_max); fdata.read_write_max);
printf("# unique: %PRId64 %PRId64 %PRId64\n", printf("# unique: %" PRId64 " %" PRId64 " %" PRId64 "\n",
fdata.unique, fdata.unique,
fdata.unique_size, fdata.unique_size,
fdata.unique_max); fdata.unique_max);
printf("# shared: %PRId64 %PRId64 %PRId64\n", printf("# shared: %" PRId64 " %" PRId64 " %" PRId64 "\n",
fdata.shared, fdata.shared,
fdata.shared_size, fdata.shared_size,
fdata.shared_max); fdata.shared_max);
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
* See COPYRIGHT in top-level directory. * See COPYRIGHT in top-level directory.
*/ */
#include "darshan-config.h"
#include <stdio.h> #include <stdio.h>
#include <pthread.h> #include <pthread.h>
#include <string.h> #include <string.h>
#include "mpi.h" #include "mpi.h"
#include "darshan.h" #include "darshan.h"
#include "darshan-config.h"
/* hope this doesn't change any time soon */ /* hope this doesn't change any time soon */
typedef int hid_t; typedef int hid_t;
......
...@@ -603,7 +603,7 @@ void darshan_shutdown(int timing_flag) ...@@ -603,7 +603,7 @@ void darshan_shutdown(int timing_flag)
logmod = darshan_hash((void*)hname,strlen(hname),0); logmod = darshan_hash((void*)hname,strlen(hname),0);
ret = snprintf(logfile_name, PATH_MAX, ret = snprintf(logfile_name, PATH_MAX,
"%s/%d/%d/%d/%s_%s_id%d_%d-%d-%d-%PRIu64.darshan_partial", "%s/%d/%d/%d/%s_%s_id%d_%d-%d-%d-%" PRIu64 ".darshan_partial",
logpath, (my_tm->tm_year+1900), logpath, (my_tm->tm_year+1900),
(my_tm->tm_mon+1), my_tm->tm_mday, (my_tm->tm_mon+1), my_tm->tm_mday,
cuser, __progname, jobid, cuser, __progname, jobid,
...@@ -1995,7 +1995,7 @@ static void cp_access_walker(const void* nodep, const VISIT which, const int dep ...@@ -1995,7 +1995,7 @@ static void cp_access_walker(const void* nodep, const VISIT which, const int dep
case leaf: case leaf:
counter = *(struct cp_access_counter**)nodep; counter = *(struct cp_access_counter**)nodep;
#if 0 #if 0
printf(" type %d size: %PRId64, freq: %d\n", walker_validx, counter->size, counter->freq); printf(" type %d size: %" PRId64 ", freq: %d\n", walker_validx, counter->size, counter->freq);
#endif #endif
CP_COUNTER_INC(walker_file, counter->size, counter->freq, 1, walker_validx, walker_cntidx); CP_COUNTER_INC(walker_file, counter->size, counter->freq, 1, walker_validx, walker_cntidx);
default: default:
...@@ -2135,7 +2135,7 @@ static char* darshan_get_exe_and_mounts(struct darshan_job_runtime* final_job) ...@@ -2135,7 +2135,7 @@ static char* darshan_get_exe_and_mounts(struct darshan_job_runtime* final_job)
mnt_array_index++; mnt_array_index++;
} }
ret = snprintf(tmp_mnt, 256, "\n%PRId64\t%s\t%s", tmp_st_dev, ret = snprintf(tmp_mnt, 256, "\n%" PRId64 "\t%s\t%s", tmp_st_dev,
entry->mnt_type, entry->mnt_dir); entry->mnt_type, entry->mnt_dir);
if(ret >= 256) if(ret >= 256)
{ {
...@@ -2148,7 +2148,7 @@ static char* darshan_get_exe_and_mounts(struct darshan_job_runtime* final_job) ...@@ -2148,7 +2148,7 @@ static char* darshan_get_exe_and_mounts(struct darshan_job_runtime* final_job)
space_left -= strlen(tmp_mnt); space_left -= strlen(tmp_mnt);
} }
#if 0 #if 0
printf("dev: %PRId64, mnt_pt: %s, type: %s\n", printf("dev: %" PRId64 ", mnt_pt: %s, type: %s\n",
tmp_st_dev, entry->mnt_dir, entry->mnt_type); tmp_st_dev, entry->mnt_dir, entry->mnt_type);
#endif #endif
} }
......
...@@ -3,12 +3,12 @@ ...@@ -3,12 +3,12 @@
* See COPYRIGHT in top-level directory. * See COPYRIGHT in top-level directory.
*/ */
#include "darshan-config.h"
#include <stdio.h> #include <stdio.h>
#include <pthread.h> #include <pthread.h>
#include <string.h> #include <string.h>
#include "mpi.h" #include "mpi.h"
#include "darshan.h" #include "darshan.h"
#include "darshan-config.h"
#ifdef DARSHAN_PRELOAD #ifdef DARSHAN_PRELOAD
#define __USE_GNU #define __USE_GNU
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* See COPYRIGHT in top-level directory. * See COPYRIGHT in top-level directory.
*/ */
#include "darshan-config.h"
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
...@@ -21,7 +22,6 @@ ...@@ -21,7 +22,6 @@
#include <pthread.h> #include <pthread.h>
#include "darshan.h" #include "darshan.h"
#include "darshan-config.h"
#ifndef HAVE_OFF64_T #ifndef HAVE_OFF64_T
typedef int64_t off64_t; typedef int64_t off64_t;
......
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