Commit a3c693c6 authored by Shane Snyder's avatar Shane Snyder
Browse files

remove unneeded parameter to log_put_record

parent f4dcade3
...@@ -35,7 +35,7 @@ char *bgq_f_counter_names[] = { ...@@ -35,7 +35,7 @@ char *bgq_f_counter_names[] = {
#define DARSHAN_BGQ_FILE_SIZE_1 (112 + 8) #define DARSHAN_BGQ_FILE_SIZE_1 (112 + 8)
static int darshan_log_get_bgq_rec(darshan_fd fd, void** bgq_buf_p); static int darshan_log_get_bgq_rec(darshan_fd fd, void** bgq_buf_p);
static int darshan_log_put_bgq_rec(darshan_fd fd, void* bgq_buf, int ver); static int darshan_log_put_bgq_rec(darshan_fd fd, void* bgq_buf);
static void darshan_log_print_bgq_rec(void *file_rec, static void darshan_log_print_bgq_rec(void *file_rec,
char *file_name, char *mnt_pt, char *fs_type, int ver); char *file_name, char *mnt_pt, char *fs_type, int ver);
static void darshan_log_print_bgq_description(int ver); static void darshan_log_print_bgq_description(int ver);
...@@ -136,7 +136,7 @@ static int darshan_log_get_bgq_rec(darshan_fd fd, void** bgq_buf_p) ...@@ -136,7 +136,7 @@ static int darshan_log_get_bgq_rec(darshan_fd fd, void** bgq_buf_p)
} }
} }
static int darshan_log_put_bgq_rec(darshan_fd fd, void* bgq_buf, int ver) static int darshan_log_put_bgq_rec(darshan_fd fd, void* bgq_buf)
{ {
struct darshan_bgq_record *rec = (struct darshan_bgq_record *)bgq_buf; struct darshan_bgq_record *rec = (struct darshan_bgq_record *)bgq_buf;
int ret; int ret;
......
...@@ -407,7 +407,7 @@ int main(int argc, char **argv) ...@@ -407,7 +407,7 @@ int main(int argc, char **argv)
if(!hash || hash == base_rec->id) if(!hash || hash == base_rec->id)
{ {
ret = mod_logutils[i]->log_put_record(outfile, mod_buf, infile->mod_ver[i]); ret = mod_logutils[i]->log_put_record(outfile, mod_buf);
if(ret < 0) if(ret < 0)
{ {
darshan_log_close(infile); darshan_log_close(infile);
......
...@@ -31,7 +31,7 @@ char *hdf5_f_counter_names[] = { ...@@ -31,7 +31,7 @@ char *hdf5_f_counter_names[] = {
#undef X #undef X
static int darshan_log_get_hdf5_file(darshan_fd fd, void** hdf5_buf_p); static int darshan_log_get_hdf5_file(darshan_fd fd, void** hdf5_buf_p);
static int darshan_log_put_hdf5_file(darshan_fd fd, void* hdf5_buf, int ver); static int darshan_log_put_hdf5_file(darshan_fd fd, void* hdf5_buf);
static void darshan_log_print_hdf5_file(void *file_rec, static void darshan_log_print_hdf5_file(void *file_rec,
char *file_name, char *mnt_pt, char *fs_type, int ver); char *file_name, char *mnt_pt, char *fs_type, int ver);
static void darshan_log_print_hdf5_description(int ver); static void darshan_log_print_hdf5_description(int ver);
...@@ -97,7 +97,7 @@ static int darshan_log_get_hdf5_file(darshan_fd fd, void** hdf5_buf_p) ...@@ -97,7 +97,7 @@ static int darshan_log_get_hdf5_file(darshan_fd fd, void** hdf5_buf_p)
} }
} }
static int darshan_log_put_hdf5_file(darshan_fd fd, void* hdf5_buf, int ver) static int darshan_log_put_hdf5_file(darshan_fd fd, void* hdf5_buf)
{ {
struct darshan_hdf5_file *file = (struct darshan_hdf5_file *)hdf5_buf; struct darshan_hdf5_file *file = (struct darshan_hdf5_file *)hdf5_buf;
int ret; int ret;
......
...@@ -80,12 +80,10 @@ struct darshan_mod_logutil_funcs ...@@ -80,12 +80,10 @@ struct darshan_mod_logutil_funcs
* return 0 on success, -1 on error * return 0 on success, -1 on error
* - 'fd' is the file descriptor to put record into * - 'fd' is the file descriptor to put record into
* - 'buf' is the buffer containing the record data * - 'buf' is the buffer containing the record data
* - 'ver' is the version of the record
*/ */
int (*log_put_record)( int (*log_put_record)(
darshan_fd fd, darshan_fd fd,
void *buf, void *buf
int ver
); );
/* print the counters for a given log record /* print the counters for a given log record
* - 'file_rec' is the record's data buffer * - 'file_rec' is the record's data buffer
......
...@@ -25,7 +25,7 @@ char *lustre_counter_names[] = { ...@@ -25,7 +25,7 @@ char *lustre_counter_names[] = {
#undef X #undef X
static int darshan_log_get_lustre_record(darshan_fd fd, void** lustre_buf_p); static int darshan_log_get_lustre_record(darshan_fd fd, void** lustre_buf_p);
static int darshan_log_put_lustre_record(darshan_fd fd, void* lustre_buf, int ver); static int darshan_log_put_lustre_record(darshan_fd fd, void* lustre_buf);
static void darshan_log_print_lustre_record(void *file_rec, static void darshan_log_print_lustre_record(void *file_rec,
char *file_name, char *mnt_pt, char *fs_type, int ver); char *file_name, char *mnt_pt, char *fs_type, int ver);
static void darshan_log_print_lustre_description(int ver); static void darshan_log_print_lustre_description(int ver);
...@@ -114,7 +114,7 @@ static int darshan_log_get_lustre_record(darshan_fd fd, void** lustre_buf_p) ...@@ -114,7 +114,7 @@ static int darshan_log_get_lustre_record(darshan_fd fd, void** lustre_buf_p)
return(ret); return(ret);
} }
static int darshan_log_put_lustre_record(darshan_fd fd, void* lustre_buf, int ver) static int darshan_log_put_lustre_record(darshan_fd fd, void* lustre_buf)
{ {
struct darshan_lustre_record *rec = (struct darshan_lustre_record *)lustre_buf; struct darshan_lustre_record *rec = (struct darshan_lustre_record *)lustre_buf;
int ret; int ret;
......
...@@ -419,7 +419,7 @@ int main(int argc, char *argv[]) ...@@ -419,7 +419,7 @@ int main(int argc, char *argv[])
/* write out the shared records first */ /* write out the shared records first */
HASH_ITER(hlink, shared_rec_hash, sref, stmp) HASH_ITER(hlink, shared_rec_hash, sref, stmp)
{ {
ret = mod_logutils[i]->log_put_record(merge_fd, sref->agg_rec, in_fd->mod_ver[i]); ret = mod_logutils[i]->log_put_record(merge_fd, sref->agg_rec);
if(ret < 0) if(ret < 0)
{ {
fprintf(stderr, fprintf(stderr,
...@@ -443,7 +443,7 @@ int main(int argc, char *argv[]) ...@@ -443,7 +443,7 @@ int main(int argc, char *argv[])
if(sref) if(sref)
continue; /* skip shared records */ continue; /* skip shared records */
ret = mod_logutils[i]->log_put_record(merge_fd, mod_buf, in_fd->mod_ver[i]); ret = mod_logutils[i]->log_put_record(merge_fd, mod_buf);
if(ret < 0) if(ret < 0)
{ {
fprintf(stderr, fprintf(stderr,
......
...@@ -31,7 +31,7 @@ char *mpiio_f_counter_names[] = { ...@@ -31,7 +31,7 @@ char *mpiio_f_counter_names[] = {
#undef X #undef X
static int darshan_log_get_mpiio_file(darshan_fd fd, void** mpiio_buf_p); static int darshan_log_get_mpiio_file(darshan_fd fd, void** mpiio_buf_p);
static int darshan_log_put_mpiio_file(darshan_fd fd, void* mpiio_buf, int ver); static int darshan_log_put_mpiio_file(darshan_fd fd, void* mpiio_buf);
static void darshan_log_print_mpiio_file(void *file_rec, static void darshan_log_print_mpiio_file(void *file_rec,
char *file_name, char *mnt_pt, char *fs_type, int ver); char *file_name, char *mnt_pt, char *fs_type, int ver);
static void darshan_log_print_mpiio_description(int ver); static void darshan_log_print_mpiio_description(int ver);
...@@ -97,7 +97,7 @@ static int darshan_log_get_mpiio_file(darshan_fd fd, void** mpiio_buf_p) ...@@ -97,7 +97,7 @@ static int darshan_log_get_mpiio_file(darshan_fd fd, void** mpiio_buf_p)
} }
} }
static int darshan_log_put_mpiio_file(darshan_fd fd, void* mpiio_buf, int ver) static int darshan_log_put_mpiio_file(darshan_fd fd, void* mpiio_buf)
{ {
struct darshan_mpiio_file *file = (struct darshan_mpiio_file *)mpiio_buf; struct darshan_mpiio_file *file = (struct darshan_mpiio_file *)mpiio_buf;
int ret; int ret;
......
...@@ -33,7 +33,7 @@ char *null_f_counter_names[] = { ...@@ -33,7 +33,7 @@ char *null_f_counter_names[] = {
/* prototypes for each of the NULL module's logutil functions */ /* prototypes for each of the NULL module's logutil functions */
static int darshan_log_get_null_record(darshan_fd fd, void** null_buf_p); static int darshan_log_get_null_record(darshan_fd fd, void** null_buf_p);
static int darshan_log_put_null_record(darshan_fd fd, void* null_buf, int ver); static int darshan_log_put_null_record(darshan_fd fd, void* null_buf);
static void darshan_log_print_null_record(void *file_rec, static void darshan_log_print_null_record(void *file_rec,
char *file_name, char *mnt_pt, char *fs_type, int ver); char *file_name, char *mnt_pt, char *fs_type, int ver);
static void darshan_log_print_null_description(int ver); static void darshan_log_print_null_description(int ver);
...@@ -108,10 +108,10 @@ static int darshan_log_get_null_record(darshan_fd fd, void** null_buf_p) ...@@ -108,10 +108,10 @@ static int darshan_log_get_null_record(darshan_fd fd, void** null_buf_p)
} }
} }
/* write the NULL record stored in 'null_buf' (with version number 'ver') /* write the NULL record stored in 'null_buf' to log file descriptor 'fd'.
* to log file descriptor 'fd'. Return 0 on success, -1 on failure * Return 0 on success, -1 on failure
*/ */
static int darshan_log_put_null_record(darshan_fd fd, void* null_buf, int ver) static int darshan_log_put_null_record(darshan_fd fd, void* null_buf)
{ {
struct darshan_null_record *rec = (struct darshan_null_record *)null_buf; struct darshan_null_record *rec = (struct darshan_null_record *)null_buf;
int ret; int ret;
......
...@@ -31,7 +31,7 @@ char *pnetcdf_f_counter_names[] = { ...@@ -31,7 +31,7 @@ char *pnetcdf_f_counter_names[] = {
#undef X #undef X
static int darshan_log_get_pnetcdf_file(darshan_fd fd, void** pnetcdf_buf_p); static int darshan_log_get_pnetcdf_file(darshan_fd fd, void** pnetcdf_buf_p);
static int darshan_log_put_pnetcdf_file(darshan_fd fd, void* pnetcdf_buf, int ver); static int darshan_log_put_pnetcdf_file(darshan_fd fd, void* pnetcdf_buf);
static void darshan_log_print_pnetcdf_file(void *file_rec, static void darshan_log_print_pnetcdf_file(void *file_rec,
char *file_name, char *mnt_pt, char *fs_type, int ver); char *file_name, char *mnt_pt, char *fs_type, int ver);
static void darshan_log_print_pnetcdf_description(int ver); static void darshan_log_print_pnetcdf_description(int ver);
...@@ -97,7 +97,7 @@ static int darshan_log_get_pnetcdf_file(darshan_fd fd, void** pnetcdf_buf_p) ...@@ -97,7 +97,7 @@ static int darshan_log_get_pnetcdf_file(darshan_fd fd, void** pnetcdf_buf_p)
} }
} }
static int darshan_log_put_pnetcdf_file(darshan_fd fd, void* pnetcdf_buf, int ver) static int darshan_log_put_pnetcdf_file(darshan_fd fd, void* pnetcdf_buf)
{ {
struct darshan_pnetcdf_file *file = (struct darshan_pnetcdf_file *)pnetcdf_buf; struct darshan_pnetcdf_file *file = (struct darshan_pnetcdf_file *)pnetcdf_buf;
int ret; int ret;
......
...@@ -34,7 +34,7 @@ char *posix_f_counter_names[] = { ...@@ -34,7 +34,7 @@ char *posix_f_counter_names[] = {
#define DARSHAN_POSIX_FILE_SIZE_2 648 #define DARSHAN_POSIX_FILE_SIZE_2 648
static int darshan_log_get_posix_file(darshan_fd fd, void** posix_buf_p); static int darshan_log_get_posix_file(darshan_fd fd, void** posix_buf_p);
static int darshan_log_put_posix_file(darshan_fd fd, void* posix_buf, int ver); static int darshan_log_put_posix_file(darshan_fd fd, void* posix_buf);
static void darshan_log_print_posix_file(void *file_rec, static void darshan_log_print_posix_file(void *file_rec,
char *file_name, char *mnt_pt, char *fs_type, int ver); char *file_name, char *mnt_pt, char *fs_type, int ver);
static void darshan_log_print_posix_description(int ver); static void darshan_log_print_posix_description(int ver);
...@@ -160,7 +160,7 @@ exit: ...@@ -160,7 +160,7 @@ exit:
} }
} }
static int darshan_log_put_posix_file(darshan_fd fd, void* posix_buf, int ver) static int darshan_log_put_posix_file(darshan_fd fd, void* posix_buf)
{ {
struct darshan_posix_file *file = (struct darshan_posix_file *)posix_buf; struct darshan_posix_file *file = (struct darshan_posix_file *)posix_buf;
int ret; int ret;
......
...@@ -33,7 +33,7 @@ char *stdio_f_counter_names[] = { ...@@ -33,7 +33,7 @@ char *stdio_f_counter_names[] = {
/* prototypes for each of the STDIO module's logutil functions */ /* prototypes for each of the STDIO module's logutil functions */
static int darshan_log_get_stdio_record(darshan_fd fd, void** stdio_buf_p); static int darshan_log_get_stdio_record(darshan_fd fd, void** stdio_buf_p);
static int darshan_log_put_stdio_record(darshan_fd fd, void* stdio_buf, int ver); static int darshan_log_put_stdio_record(darshan_fd fd, void* stdio_buf);
static void darshan_log_print_stdio_record(void *file_rec, static void darshan_log_print_stdio_record(void *file_rec,
char *file_name, char *mnt_pt, char *fs_type, int ver); char *file_name, char *mnt_pt, char *fs_type, int ver);
static void darshan_log_print_stdio_description(int ver); static void darshan_log_print_stdio_description(int ver);
...@@ -111,7 +111,7 @@ static int darshan_log_get_stdio_record(darshan_fd fd, void** stdio_buf_p) ...@@ -111,7 +111,7 @@ static int darshan_log_get_stdio_record(darshan_fd fd, void** stdio_buf_p)
/* write the STDIO record stored in 'stdio_buf' to log file descriptor 'fd'. /* write the STDIO record stored in 'stdio_buf' to log file descriptor 'fd'.
* Return 0 on success, -1 on failure * Return 0 on success, -1 on failure
*/ */
static int darshan_log_put_stdio_record(darshan_fd fd, void* stdio_buf, int ver) static int darshan_log_put_stdio_record(darshan_fd fd, void* stdio_buf)
{ {
struct darshan_stdio_file *rec = (struct darshan_stdio_file *)stdio_buf; struct darshan_stdio_file *rec = (struct darshan_stdio_file *)stdio_buf;
int ret; int ret;
......
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