Skip to content

Commit

Permalink
fix compiler warnings in src/ on 64bit linux
Browse files Browse the repository at this point in the history
  • Loading branch information
@pnorbert
pnorbert committed Jan 27, 2016
1 parent 880d2c8 commit 8e7f834
Show file tree
Hide file tree
Showing 9 changed files with 56 additions and 55 deletions.
4 changes: 2 additions & 2 deletions utils/bp2bp/bp2bp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1072,10 +1072,10 @@ int print_data(void *data, int item, enum ADIOS_DATATYPES adiosvartype)
break;

case adios_unsigned_long:
printf ("%" PRIu64, ((unsigned long long *) data)[item]);
printf ("%" PRIu64, ((uint64_t *) data)[item]);
break;
case adios_long:
printf ("%" PRId64, ((signed long long *) data)[item]);
printf ("%" PRId64, ((int64_t *) data)[item]);
break;

case adios_real:
Expand Down
4 changes: 2 additions & 2 deletions utils/bpdiff/bpdiff.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,14 +428,14 @@ int compare_data(char * variable_name, void *data1, void *data2, int item, enum
case adios_unsigned_long:
if(((unsigned long long*) data1)[item] != ((unsigned long long*) data2)[item])//not identical
{
print("%s : %" PRIu64 " in %s | %" PRIu64 " in %s\n", variable_name, ((unsigned long long*) data1)[item], infilename1, ((unsigned long long*) data2)[item], infilename2);
print("%s : %llu in %s | %llu in %s\n", variable_name, ((unsigned long long*) data1)[item], infilename1, ((unsigned long long*) data2)[item], infilename2);
ret++;
}
break;
case adios_long:
if(((unsigned long long*) data1)[item] != ((unsigned long long*) data2)[item])//not identical
{
print("%s : %" PRId64 " in %s | %" PRId64 " in %s\n", variable_name, ((signed long long*) data1)[item], infilename1, ((signed long long*) data2)[item], infilename2);
print("%s : %lld in %s | %lld in %s\n", variable_name, ((signed long long*) data1)[item], infilename1, ((signed long long*) data2)[item], infilename2);
ret++;
}
break;
Expand Down
36 changes: 24 additions & 12 deletions utils/bpls/bpls.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -758,6 +758,17 @@ int doList_group (ADIOS_FILE *fp)
fprintf(outf,"empty\n"); \
}

#define PRINT_ARRAY64(str, ndim, dims, loopvar) \
fprintf(outf,"%s",str); \
if (ndim > 0) { \
fprintf(outf,"{%" PRId64, dims[0]); \
for (loopvar=1; loopvar < ndim; loopvar++) { \
fprintf(outf,", %" PRId64, dims[loopvar]); \
} \
fprintf(outf,"}\n"); \
} else { \
fprintf(outf,"empty\n"); \
}

void printMeshes (ADIOS_FILE *fp)
{
Expand Down Expand Up @@ -785,13 +796,14 @@ void printMeshes (ADIOS_FILE *fp)
adios_complete_meshinfo (fp, meshfp, mi);
}
fprintf(outf, " type: ");

switch (mi->type) {
case ADIOS_MESH_UNIFORM:
fprintf(outf, "uniform\n");
PRINT_ARRAY(" dimensions: ",
PRINT_ARRAY64(" dimensions: ",
mi->uniform->num_dimensions,
mi->uniform->dimensions,
j, lld)
j)
if (mi->uniform->origins) {
PRINT_ARRAY(" origins: ",
mi->uniform->num_dimensions,
Expand All @@ -814,10 +826,10 @@ void printMeshes (ADIOS_FILE *fp)

case ADIOS_MESH_RECTILINEAR:
fprintf(outf, "rectilinear\n");
PRINT_ARRAY(" dimensions: ",
PRINT_ARRAY64(" dimensions: ",
mi->rectilinear->num_dimensions,
mi->rectilinear->dimensions,
j, lld)
j)
if (mi->rectilinear->use_single_var) {
fprintf(outf, " coordinates: single-var: \"%s\"\n",
mi->rectilinear->coordinates[0]);
Expand All @@ -833,10 +845,10 @@ void printMeshes (ADIOS_FILE *fp)

case ADIOS_MESH_STRUCTURED:
fprintf(outf, "structured\n");
PRINT_ARRAY(" dimensions: ",
PRINT_ARRAY64(" dimensions: ",
mi->structured->num_dimensions,
mi->structured->dimensions,
j, lld);
j);
if (mi->structured->use_single_var) {
fprintf(outf, " points: single-var: \"%s\"\n",
mi->structured->points[0]);
Expand Down Expand Up @@ -1573,19 +1585,19 @@ int print_data_characteristics(void * min, void * max, double * avg, double * st
break;

case adios_unsigned_long:
if (min) fprintf(outf,(f ? format : "%10" PRIu64 " "), (* (unsigned long long *) min));
if (min) fprintf(outf,(f ? format : "%10llu "), (* (unsigned long long *) min));
else fprintf(outf, " null ");
if (max) fprintf(outf,(f ? format : "%10" PRIu64 " "), (* (unsigned long long *) max));
if (max) fprintf(outf,(f ? format : "%10llu "), (* (unsigned long long *) max));
else fprintf(outf, " null ");
if (avg) fprintf(outf, "%10.2f ", * avg);
else fprintf(outf, " null ");
if (std_dev) fprintf(outf, "%10.2f ", * std_dev);
else fprintf(outf, " null ");
break;
case adios_long:
if (min) fprintf(outf,(f ? format : "%10" PRId64 " "), (* (long long *) min));
if (min) fprintf(outf,(f ? format : "%10lld "), (* (long long *) min));
else fprintf(outf, " null ");
if (max) fprintf(outf,(f ? format : "%10" PRId64 " "), (* (long long *) max));
if (max) fprintf(outf,(f ? format : "%10lld "), (* (long long *) max));
else fprintf(outf, " null ");
if (avg) fprintf(outf, "%10.2f ", * avg);
else fprintf(outf, " null ");
Expand Down Expand Up @@ -1674,10 +1686,10 @@ int print_data(void *data, int item, enum ADIOS_DATATYPES adiosvartype, bool all
break;

case adios_unsigned_long:
fprintf(outf,(f ? format : "%" PRIu64), ((unsigned long long *) data)[item]);
fprintf(outf,(f ? format : "%llu"), ((unsigned long long *) data)[item]);
break;
case adios_long:
fprintf(outf,(f ? format : "%" PRId64), ((signed long long *) data)[item]);
fprintf(outf,(f ? format : "%lld"), ((signed long long *) data)[item]);
break;

case adios_real:
Expand Down
2 changes: 1 addition & 1 deletion utils/bpmeta/bpmeta.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ int write_index (struct adios_index_struct_v1 * index, char * fname)
else if (bytes_written != (ssize_t) buffer_offset)
{
fprintf (stderr, "Failed to write metadata of %" PRId64 " bytes to file %s. "
"Only wrote %" PRId64 " bytes\n", buffer_offset, fname, (long long)bytes_written);
"Only wrote %lld bytes\n", buffer_offset, fname, (long long)bytes_written);
}
close(f);
return 0;
Expand Down
4 changes: 2 additions & 2 deletions utils/bprecover/bprecover.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ void store_scalar_dimensions (
var_header->path, var_header->name);
break;
}
dim_value [var_header->id] = *(unsigned int *) var_payload->payload;
dim_value [var_header->id] = d;


} else {
Expand Down Expand Up @@ -422,7 +422,7 @@ void write_index (int fd, uint64_t file_offset, struct adios_index_struct_v1 *
lseek (fd, file_offset, SEEK_SET);
ssize_t s = write (fd, buffer, buffer_offset);
if (s != buffer_offset) {
printf ("ERROR: Only wrote %" PRIu64 " bytes of index data instead of the attempted %" PRIu64 " bytes\n",
printf ("ERROR: Only wrote %llu bytes of index data instead of the attempted %" PRIu64 " bytes\n",
(unsigned long long)s, buffer_offset);
} else {
printf ("Wrote index to file offset %" PRIu64 ". Size is %" PRIu64 " bytes\n", file_offset, buffer_offset);
Expand Down
22 changes: 11 additions & 11 deletions utils/bpsplit/bpappend.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ int copy_file( const char *filein, const char *fileout) {
while (bytes_read > 0) {
bytes_written = write( outf, (void *) buf, bytes_read);
if (bytes_written != bytes_read) {
fprintf(stderr, "Error: could not write %" PRId64 " bytes to output file %s at offset 0: %s\n",
fprintf(stderr, "Error: could not write %lld bytes to output file %s at offset 0: %s\n",
(long long)bytes_read, fileout, strerror(errno));
close(inf);
close(outf);
Expand All @@ -290,7 +290,7 @@ int copy_file( const char *filein, const char *fileout) {
close(outf);
return 2;
}
if (verbose>1) printf(" copied %" PRIu64 " (0x%llx) bytes of data into %s\n", bytes_copied, bytes_copied, fileout);
if (verbose>1) printf(" copied %" PRIu64 " (0x%" PRIx64 ") bytes of data into %s\n", bytes_copied, bytes_copied, fileout);

close(inf);
close(outf);
Expand Down Expand Up @@ -395,14 +395,14 @@ int recover(int f) {
// write old index into a buffer
adios_write_index_v1 (&buffer, &buffer_size, &buffer_offset, index_start,
idx);
if (verbose>1) fprintf(stderr, " original index size %" PRIu64 " 0x%llx\n", buffer_offset, buffer_offset);
if (verbose>1) fprintf(stderr, " original index size %" PRIu64 " 0x%" PRIx64 "\n", buffer_offset, buffer_offset);
adios_write_version_v1 (&buffer, &buffer_size, &buffer_offset);

adios_clear_index_v1 (idx);
adios_free_index_v1 (idx);

// write index buffer out
if (verbose>1) fprintf(stderr, " write %" PRIu64 " 0x%llx bytes of indexes...\n", buffer_offset, buffer_offset);
if (verbose>1) fprintf(stderr, " write %" PRIu64 " 0x%" PRIx64 " bytes of indexes...\n", buffer_offset, buffer_offset);
bytes_written = write (f, buffer, buffer_offset);
free(buffer);
if (bytes_written == -1) {
Expand Down Expand Up @@ -452,11 +452,11 @@ int append_in_to_out( const char *fileout, const char *filein) {
off_t pos;
lseek64 (in_bp->f, 0, SEEK_SET);
if (verbose>1)
printf(" seek in output to end of group data, %" PRIu64 " (0x%llx) \n",
printf(" seek in output to end of group data, %" PRIu64 " (0x%" PRIx64 ") \n",
out_bp->pg_index_offset, out_bp->pg_index_offset);
pos = lseek64 (f, out_bp->pg_index_offset, SEEK_SET); // seek behind groups, overwrite old index
if (pos != out_bp->pg_index_offset) {
fprintf(stderr, "Error: cannot seek to offset %" PRIu64 " (0x%llx) in file %s: %s\n",
fprintf(stderr, "Error: cannot seek to offset %" PRIu64 " (0x%" PRIx64 ") in file %s: %s\n",
out_bp->pg_index_offset, out_bp->pg_index_offset, filein, strerror(errno));
close(f);
return 2;
Expand All @@ -483,7 +483,7 @@ int append_in_to_out( const char *fileout, const char *filein) {

bytes_written = write( f, (void *) buf, bytes_read);
if (bytes_written != bytes_read) {
fprintf(stderr, "Error: could not write %" PRId64 " bytes to output file %s at offset %" PRIu64 ": %s\n",
fprintf(stderr, "Error: could not write %lld bytes to output file %s at offset %" PRIu64 ": %s\n",
(long long)bytes_read, fileout, out_bp->pg_index_offset+bytes_copied, strerror(errno));
recover(f);
close(f);
Expand All @@ -492,7 +492,7 @@ int append_in_to_out( const char *fileout, const char *filein) {

bytes_copied += bytes_written;
}
if (verbose>1) printf(" written %" PRIu64 " (0x%llx) bytes of data into %s\n", bytes_copied, bytes_copied, fileout);
if (verbose>1) printf(" written %" PRIu64 " (0x%" PRIx64 ") bytes of data into %s\n", bytes_copied, bytes_copied, fileout);

// Append input indexes into the output indexes
char * buffer = 0;
Expand All @@ -505,18 +505,18 @@ int append_in_to_out( const char *fileout, const char *filein) {
idx->vars_root = out_vars_root;
idx->attrs_root = out_attrs_root;

if (verbose>1) printf(" index starts at %" PRIu64 " (0x%llx)\n", index_start, index_start);
if (verbose>1) printf(" index starts at %" PRIu64 " (0x%" PRIx64 ")\n", index_start, index_start);

// merge in old indicies
adios_merge_index_v1 (idx,
in_pg_root, in_vars_root, in_attrs_root, 0);
adios_write_index_v1 (&buffer, &buffer_size, &buffer_offset, index_start,
idx);
if (verbose>1) printf(" index size %" PRIu64 " 0x%llx\n", buffer_offset, buffer_offset);
if (verbose>1) printf(" index size %" PRIu64 " 0x%" PRIx64 "\n", buffer_offset, buffer_offset);
adios_write_version_v1 (&buffer, &buffer_size, &buffer_offset);

// write index buffer out
if (verbose>1) printf(" write %" PRIu64 " 0x%llx bytes of indexes into %s\n", buffer_offset, buffer_offset, fileout);
if (verbose>1) printf(" write %" PRIu64 " 0x%" PRIx64 " bytes of indexes into %s\n", buffer_offset, buffer_offset, fileout);
bytes_written = write (f, buffer, buffer_offset);

if (verbose>1) printf(" written %zu 0x%zx bytes of indexes into %s\n", bytes_written, bytes_written, fileout);
Expand Down
8 changes: 4 additions & 4 deletions utils/bpsplit/bpsplit.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -569,26 +569,26 @@ int write_out( const char *fileout, const char *filein) {

bytes_written = write( f, (void *) buf, bytes_read);
if (bytes_written != bytes_read) {
fprintf(stderr, "Error: could not write %" PRId64 " bytes to output file %s at offset %" PRIu64 ": %s\n",
fprintf(stderr, "Error: could not write %lld bytes to output file %s at offset %" PRIu64 ": %s\n",
(long long)bytes_read, fileout, out_offset_start+bytes_copied, strerror(errno));
close(f);
return 4;
}

bytes_copied += bytes_written;
}
if (verbose>1) printf(" written %" PRIu64 " %llx bytes of data into %s\n", bytes_copied, bytes_copied, fileout);
if (verbose>1) printf(" written %" PRIu64 " %" PRIx64 " bytes of data into %s\n", bytes_copied, bytes_copied, fileout);

// write indexes and version into a buffer
char * buffer = NULL;
uint64_t buffer_size = 0;
uint64_t buffer_offset = 0;
adios_write_index_v1 (&buffer, &buffer_size, &buffer_offset, bytes_copied, idx);
if (verbose>1) printf(" index size %" PRIu64 " 0x%llx\n", buffer_offset, buffer_offset);
if (verbose>1) printf(" index size %" PRIu64 " 0x%" PRIx64 "\n", buffer_offset, buffer_offset);
adios_write_version_v1 (&buffer, &buffer_size, &buffer_offset);

// write buffer out
if (verbose>1) printf(" write %" PRIu64 " 0x%llx bytes of indexes into %s\n", buffer_offset, buffer_offset, fileout);
if (verbose>1) printf(" write %" PRIu64 " 0x%" PRIx64 " bytes of indexes into %s\n", buffer_offset, buffer_offset, fileout);
bytes_written = write (f, buffer, buffer_offset);

if (verbose>1) printf(" written %zu 0x%zx bytes of indexes into %s\n", bytes_written, bytes_written, fileout);
Expand Down
4 changes: 2 additions & 2 deletions utils/list_methods/list_methods.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -407,10 +407,10 @@ int print_data(void *data, int item, enum ADIOS_DATATYPES adiosvartype)
break;

case adios_unsigned_long:
printf ("%" PRIu64, ((unsigned long long *) data)[item]);
printf ("%" PRIu64, ((uint64_t *) data)[item]);
break;
case adios_long:
printf ("%" PRId64, ((signed long long *) data)[item]);
printf ("%" PRId64, ((int64_t *) data)[item]);
break;

case adios_real:
Expand Down
27 changes: 8 additions & 19 deletions utils/skeldump/skeldump.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ int main( int argc, char *argv[] ) {
////prgname = strdup(argv[0]);

/* other variables */
int c, last_c='_';
int c;
/* Process the arguments */
while ((c = getopt_long(argc, argv, optstring, options, NULL)) != -1) {
switch (c) {
Expand Down Expand Up @@ -291,7 +291,6 @@ int main( int argc, char *argv[] ) {
printf("Processing default: %c\n", c);
break;
} /* end switch */
last_c = c;
} /* end while */

/* Check if we have a file defined */
Expand Down Expand Up @@ -469,7 +468,6 @@ int doList_group (ADIOS_FILE *fp)
ADIOS_VARINFO **vis;
enum ADIOS_DATATYPES vartype;
int i, j, n; // loop vars
int status;
int attrsize; // info about one attribute
bool matches;
int len, maxlen, maxtypelen;
Expand Down Expand Up @@ -618,7 +616,7 @@ int doList_group (ADIOS_FILE *fp)
}

if (longopt || plot) {
status = adios_inq_var_stat (fp, vi, timestep && timed, 0);
adios_inq_var_stat (fp, vi, timestep && timed, 0);
}

if (plot && vi->statistics && vi->statistics->histogram) {
Expand Down Expand Up @@ -1455,19 +1453,19 @@ int print_data_characteristics(void * min, void * max, double * avg, double * st
break;

case adios_unsigned_long:
if (min) fprintf(outf,(f ? format : "%10" PRIu64 " "), (* (unsigned long long *) min));
if (min) fprintf(outf,(f ? format : "%10llu "), (* (unsigned long long *) min));
else fprintf(outf, " null ");
if (max) fprintf(outf,(f ? format : "%10" PRIu64 " "), (* (unsigned long long *) max));
if (max) fprintf(outf,(f ? format : "%10llu "), (* (unsigned long long *) max));
else fprintf(outf, " null ");
if (avg) fprintf(outf, "%10.2f ", * avg);
else fprintf(outf, " null ");
if (std_dev) fprintf(outf, "%10.2f ", * std_dev);
else fprintf(outf, " null ");
break;
case adios_long:
if (min) fprintf(outf,(f ? format : "%10" PRId64 " "), (* (long long *) min));
if (min) fprintf(outf,(f ? format : "%10lld "), (* (long long *) min));
else fprintf(outf, " null ");
if (max) fprintf(outf,(f ? format : "%10" PRId64 " "), (* (long long *) max));
if (max) fprintf(outf,(f ? format : "%10lld "), (* (long long *) max));
else fprintf(outf, " null ");
if (avg) fprintf(outf, "%10.2f ", * avg);
else fprintf(outf, " null ");
Expand Down Expand Up @@ -1555,10 +1553,10 @@ int print_data(void *data, int item, enum ADIOS_DATATYPES adiosvartype, bool all
break;

case adios_unsigned_long:
fprintf(outf,(f ? format : "%" PRIu64 " "), ((unsigned long long *) data)[item]);
fprintf(outf,(f ? format : "%llu "), ((unsigned long long *) data)[item]);
break;
case adios_long:
fprintf(outf,(f ? format : "%" PRId64 " "), ((signed long long *) data)[item]);
fprintf(outf,(f ? format : "%lld "), ((signed long long *) data)[item]);
break;

case adios_real:
Expand Down Expand Up @@ -1686,20 +1684,11 @@ int print_decomp(ADIOS_VARINFO *vi)
else
{
// arrays
int ndigits_nblocks;
int ndigits_dims[32];
for (k=0; k < vi->ndim; k++) {
// get digit lengths for each dimension
ndigits_dims[k] = ndigits (vi->dims[k]-1);
}

for (i=0; i < /*vi->nsteps*/1; i++) { // For now, just look at the first step xx
fprintf(outf, " decomposition: [");
fprintf(outf,"\n");
ndigits_nblocks = ndigits (vi->nblocks[i]-1);
for (j=0; j < vi->nblocks[i]; j++) {
fprintf(outf," [");
//fprintf(outf," block %*d: [", ndigits_nblocks, j);
for (k=0; k < vi->ndim; k++) {
fprintf(outf, "[%" PRId64 ",%" PRId64 "]",
vi->blockinfo[j].start[k],
Expand Down

0 comments on commit 8e7f834

Please sign in to comment.