Skip to content

Commit

Permalink
fix compiler warnings in utils/ on OSX
Browse files Browse the repository at this point in the history
  • Loading branch information
@pnorbert
pnorbert committed Jan 27, 2016
1 parent 20214d9 commit 880d2c8
Show file tree
Hide file tree
Showing 18 changed files with 321 additions and 289 deletions.
1 change: 1 addition & 0 deletions src/core/transforms/adios_transforms_hooks_read.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

// Initialize the transform system for adios read-only libraries
void adios_transform_read_init();
int adios_transform_is_implemented (enum ADIOS_TRANSFORM_TYPE transform_type);

int adios_transform_generate_read_subrequests(adios_transform_read_request *reqgroup, adios_transform_pg_read_request *pg_reqgroup);

Expand Down
15 changes: 9 additions & 6 deletions utils/bp2ascii/bp2ascii.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,14 @@ int main (int argc, char ** argv)
struct adios_var_header_struct_v1 var_header;
struct adios_var_payload_struct_v1 var_payload;
uint64_t offset, var_len;
printf("characteristics count: %llu\n", element_counts);
printf("characteristics count: %" PRIu64 "\n", element_counts);

for (i = 0; i < element_counts; i++)
{
offset = vars_root->characteristics[i].offset;
b->read_pg_offset = pg_root->offset_in_file;

printf("offset: %llu read_pg_offset=%llu\n", offset, b->read_pg_offset);
printf("offset: %" PRIu64 " read_pg_offset=%" PRIu64 "\n", offset, b->read_pg_offset);
if (pg_root->next)
{
b->read_pg_size = pg_root->next->offset_in_file
Expand All @@ -145,8 +145,8 @@ int main (int argc, char ** argv)

read (b->f,b->buff+8, var_len);

printf("var length: %llu offset: %llu\n",var_len, offset);
printf ("payload_size %llux\n", var_header.payload_size);
printf("var length: %" PRIu64 " offset: %" PRIu64 "\n",var_len, offset);
printf ("payload_size %" PRIu64 "x\n", var_header.payload_size);

adios_parse_var_data_header_v1 (b, &var_header);
print_var_header (&var_header);
Expand Down Expand Up @@ -204,6 +204,9 @@ int main (int argc, char ** argv)
case adios_string:
fprintf(outf, "%s ", (char *)var_payload.payload);
break;
case adios_string_array:
fprintf(outf, "%s ", *(char **)var_payload.payload);
break;
case adios_complex:
for (j=0; j<(var_header.payload_size)/8;j++)
fprintf(outf, "%f + %fi", *((float *)var_payload.payload+2*j),*((float *)var_payload.payload+j*2+1));
Expand All @@ -228,7 +231,7 @@ void print_process_group_header (uint64_t num
{
struct adios_method_info_struct_v1 * m;

printf ("Process Group: %llu\n", num);
printf ("Process Group: %" PRIu64 "\n", num);
printf ("\tGroup Name: %s\n", pg_header->name);
printf ("\tHost Language Fortran?: %c\n"
,(pg_header->host_language_fortran == adios_flag_yes ? 'Y' : 'N')
Expand Down Expand Up @@ -257,7 +260,7 @@ void print_process_group_index (
printf ("\tProcess ID: %d\n", pg_root->process_id);
printf ("\tTime Name: %s\n", pg_root->time_index_name);
printf ("\tTime: %d\n", pg_root->time_index);
printf ("\tOffset in File: %llu\n", pg_root->offset_in_file);
printf ("\tOffset in File: %" PRIu64 "\n", pg_root->offset_in_file);

pg_root = pg_root->next;
}
Expand Down
31 changes: 18 additions & 13 deletions utils/bp2bp/bp2bp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <stdio.h>
#include <stdint.h>
#include <unistd.h>
#include <inttypes.h>
#include <string.h>
#include <sys/stat.h>
#include <sys/types.h>
Expand Down Expand Up @@ -228,10 +229,10 @@ int main (int argc, char ** argv) {
calcC(chunk_size, v, c);
strcpy(lbounds,"");
for(j=0; j<v->ndim; j++){
sprintf(tstring, "%lld,", c[j]);
sprintf(tstring, "%" PRId64 ",", c[j]);
strcat(lbounds, tstring);
}
printf("rank=%d, name=%s, chunk_size1=%lld c[]=%s\n",rank,g->var_namelist[i],chunk_size,lbounds);
printf("rank=%d, name=%s, chunk_size1=%" PRId64 " c[]=%s\n",rank,g->var_namelist[i],chunk_size,lbounds);


chunk_size = 1;
Expand Down Expand Up @@ -319,9 +320,9 @@ int main (int argc, char ** argv) {
strcpy(lbounds,"");
strcpy(offs,"");
for(j=0; j<v->ndim; j++){
sprintf(tstring, "%lld,", ts[j]);
sprintf(tstring, "%" PRId64 ",", ts[j]);
strcat(offs, tstring);
sprintf(tstring, "%lld,", uc[j]);
sprintf(tstring, "%" PRId64 ",", uc[j]);
strcat(lbounds, tstring);
}

Expand Down Expand Up @@ -382,7 +383,7 @@ int main (int argc, char ** argv) {
// Now we have everything declared... now we need to write them out!!!!!!
if (WRITEME==1) {
// open up the file for writing....
if (DEBUG) printf("rank=%d, opening file = %s, with group %s, size=%lld\n",rank,argv[2],f->group_namelist[gidx],adios_groupsize);
if (DEBUG) printf("rank=%d, opening file = %s, with group %s, size=%" PRId64 "\n",rank,argv[2],f->group_namelist[gidx],adios_groupsize);

if(TIMING==100)
start_time[0] = MPI_Wtime();
Expand All @@ -401,8 +402,8 @@ int main (int argc, char ** argv) {
sb2[0] = adios_totalsize;
MPI_Reduce(sb2,rb2,1,MPI_UNSIGNED_LONG_LONG,MPI_SUM,0, comm);
if(rank==0){
printf("total adios_totalsize = %lld\n", *rb2);
printf("total adios_groupsize = %lld\n", *rb);
printf("total adios_totalsize = %" PRId64 "\n", *rb2);
printf("total adios_groupsize = %" PRId64 "\n", *rb);
}
free(sb); free(rb); free(sb2); free(rb2);

Expand Down Expand Up @@ -493,7 +494,7 @@ int main (int argc, char ** argv) {
}

if (DEBUG)
printf ("ADIOS WRITE: rank=%d, name=%s datasize=%lld\n",rank,g->var_namelist[i],bytes_read);
printf ("ADIOS WRITE: rank=%d, name=%s datasize=%" PRId64 "\n",rank,g->var_namelist[i],bytes_read);


if (TIMING==100) {
Expand All @@ -503,10 +504,10 @@ int main (int argc, char ** argv) {
printf("rank=%d, write ts=",rank);
int k;
for(k=0; k<v->ndim; k++)
printf("%lld,", ts[k]);
printf("%" PRId64 ",", ts[k]);
printf(" uc=");
for(k=0; k<v->ndim; k++)
printf("%lld,", uc[k]);
printf("%" PRId64 ",", uc[k]);
printf("\n");
}

Expand Down Expand Up @@ -619,7 +620,7 @@ int main (int argc, char ** argv) {
sb[5] = sb[3]+sb[4];
sb[6] = total_time[5]; //total

double * rb;
double * rb = NULL;

if(rank==0)
rb = (double *)malloc(size*7*sizeof(double));
Expand Down Expand Up @@ -1051,6 +1052,10 @@ int print_data(void *data, int item, enum ADIOS_DATATYPES adiosvartype)
case adios_string:
printf ("\"%s\"", ((char *) data)+item);
break;
case adios_string_array:
// we expect one elemet of the array here
printf("\"%s\"", *((char **)data+item));
break;

case adios_unsigned_short:
printf ("%hu", ((unsigned short *) data)[item]);
Expand All @@ -1067,10 +1072,10 @@ int print_data(void *data, int item, enum ADIOS_DATATYPES adiosvartype)
break;

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

case adios_real:
Expand Down
14 changes: 7 additions & 7 deletions utils/bp2h5/bp2h5.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -261,11 +261,11 @@ const char * value_to_string (enum ADIOS_DATATYPES type, void * data, int idx)
break;

case adios_long:
sprintf (s, "%lld", ((int64_t *) data)[idx]);
sprintf (s, "%" PRId64, ((int64_t *) data)[idx]);
break;

case adios_unsigned_long:
sprintf (s, "%llu", ((uint64_t *) data)[idx]);
sprintf (s, "%" PRIu64, ((uint64_t *) data)[idx]);
break;

case adios_real:
Expand Down Expand Up @@ -375,15 +375,15 @@ int readVar(ADIOS_GROUP *gp, ADIOS_VARINFO *vi, const char * name)
else
ct = icount[j];
if (verbose>2)
printf(" j=%d, st=%llu ct=%llu\n", j, st, ct);
printf(" j=%d, st=%" PRIu64 " ct=%" PRIu64 "\n", j, st, ct);
start_t[j] = st;
count_t[j] = ct;
nelems *= ct;
if (verbose>1)
printf(" s[%d]=%llu, c[%d]=%llu, n=%llu\n", j, start_t[j], j, count_t[j], nelems);
printf(" s[%d]=%" PRIu64 ", c[%d]=%" PRIu64 ", n=%" PRIu64 "\n", j, start_t[j], j, count_t[j], nelems);
}
if (verbose>1) {
printf(" total size of data to read = %llu\n", nelems*elemsize);
printf(" total size of data to read = %" PRIu64 "\n", nelems*elemsize);
}
maxreadn = MAX_BUFFERSIZE/elemsize;
if (nelems < maxreadn)
Expand Down Expand Up @@ -419,7 +419,7 @@ int readVar(ADIOS_GROUP *gp, ADIOS_VARINFO *vi, const char * name)
sum = sum * (uint64_t) count_t[i];
actualreadn = actualreadn * readn[i];
}
if (verbose>1) printf(" read %d elements at once, %lld in total (nelems=%lld)\n", actualreadn, sum, nelems);
if (verbose>1) printf(" read %d elements at once, %" PRId64 " in total (nelems=%" PRId64 ")\n", actualreadn, sum, nelems);


// init s and c
Expand Down Expand Up @@ -489,7 +489,7 @@ int readVar(ADIOS_GROUP *gp, ADIOS_VARINFO *vi, const char * name)
H5Dclose(dataset);
//H5Tclose(h5_type_id);

if (verbose>2) printf(" read %lld bytes\n", bytes_read);
if (verbose>2) printf(" read %" PRId64 " bytes\n", bytes_read);

// print slice

Expand Down
16 changes: 8 additions & 8 deletions utils/bp2h5/hw-utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ int hw_makeh5 (char * fnamein, char * fnameout)
var_payload.payload = 0;
}
/*
printf("var id=%d name=%s rank=%d offset=%llu\n",
printf("var id=%d name=%s rank=%d offset=%" PRIu64 "\n",
var_header.id,
var_header.name,
var_dims[var_dims_count-1].rank,
Expand All @@ -333,7 +333,7 @@ int hw_makeh5 (char * fnamein, char * fnameout)
var_dims [var_dims_count].rank = var_dims [j].rank;
var_dims [var_dims_count].offset = var_dims [j].offset;
/*
printf("attribute: %s vid= %llu rank: %llu\n",attribute.name,
printf("attribute: %s vid= %" PRIu64 " rank: %" PRIu64 "\n",attribute.name,
attribute.id,var_dims[var_dims_count].rank);
*/
j = var_dims_count;
Expand Down Expand Up @@ -413,7 +413,7 @@ int hw_makeh5 (char * fnamein, char * fnameout)
while (d) {
if (d->dimension.var_id != 0) {
for (i = 0; i < var_dims_count; i++) {
//printf("%s: %d %llu \n",var_header.name,
//printf("%s: %d %" PRIu64 " \n",var_header.name,
//i,var_dims [i].rank);
if (var_dims [i].id == d->dimension.var_id){
*dims_t = var_dims [i].rank;
Expand Down Expand Up @@ -557,12 +557,12 @@ int hw_makeh5 (char * fnamein, char * fnameout)
}
else {
for (j = vars_header.count; j <var_dims_count; j++) {
//printf("id=%d rank=%d %llu\n",attribute.var_id,attribute.var_id,var_dims[j].offset);
//printf("id=%d rank=%d %" PRIu64 "\n",attribute.var_id,attribute.var_id,var_dims[j].offset);
if (attribute.id== var_dims[j].id) {
if (var_dims[j].rank> 0) {
//printf("\tattribute %s -> id (%d): %d\n",
// attribute.name,attribute.var_id, var_dims[j].rank);
//printf("\tattribute %s -> id (%d):value (%llu)\n"
//printf("\tattribute %s -> id (%d):value (%" PRIu64 ")\n"
// ,attribute.name
// ,attribute.id
// ,var_dims[j].rank);
Expand Down Expand Up @@ -1599,11 +1599,11 @@ const char * value_to_string (enum ADIOS_DATATYPES type, void * data)
break;

case adios_long:
sprintf (s, "%lld", *(((int64_t *) data)));
sprintf (s, "%" PRId64, *(((int64_t *) data)));
break;

case adios_unsigned_long:
sprintf (s, "%llu", *(((uint64_t *) data)));
sprintf (s, "%" PRIu64, *(((uint64_t *) data)));
break;

case adios_real:
Expand Down Expand Up @@ -1644,7 +1644,7 @@ void print_process_group_header (uint64_t num
int i;
struct adios_method_info_struct_v1 * m;

printf ("Process Group: %llu\n", num);
printf ("Process Group: %" PRIu64 "\n", num);
printf ("\tGroup Name: %s\n", pg_header->name);
printf ("\tHost Language Fortran?: %c\n"
,(pg_header->host_language_fortran == adios_flag_yes ? 'Y' : 'N')
Expand Down
2 changes: 1 addition & 1 deletion utils/bp2ncd/bp2ncd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,7 +455,7 @@ int ncd_dataset (int ncid
count_dims[rank] = dims->dimension.rank;
start_dims[rank] =0;
ERR(retval);
fprintf(stderr, "\t local[%d]: %llu\n",rank,dims->dimension.rank);
fprintf(stderr, "\t local[%d]: %" PRIu64 "\n",rank,dims->dimension.rank);
}
}
if (dims)
Expand Down
Loading

0 comments on commit 880d2c8

Please sign in to comment.