Bug fixes after testing

darshan-runtime/lib/darshan-bgq.c

@@ -76,7 +76,7 @@ static void capture(struct darshan_bgq_record *rec)
 
     rec->counters[BGQ_CSJOBID] = Kernel_GetJobID();
     rec->counters[BGQ_RANKSPERNODE] = Kernel_ProcessCount();
-    rec->counters[BGQ_INODES] = MPIX_IO_node();
+    rec->counters[BGQ_INODES] = MPIX_IO_node_id();
 
     r = Kernel_GetPersonality(&person, sizeof(person));
     if (r == 0)
@@ -193,8 +193,8 @@ static void bgq_begin_shutdown()
 
 static int cmpr(const void *p1, const void *p2)
 {
-    const int *a = (int*) p1;
-    const int *b = (int*) p2;
+    const uint64_t *a = (uint64_t*) p1;
+    const uint64_t *b = (uint64_t*) p2;
     return ((*a == *b) ?  0 : ((*a < *b) ? -1 : 1));
 }
 
@@ -230,10 +230,10 @@ static void bgq_get_output_data(
 
         DARSHAN_MPI_CALL(MPI_Gather)(&bgq_runtime->record.counters[BGQ_INODES],
                                      1,
-                                     MPI_INT,
+                                     MPI_LONG_LONG_INT,
                                      ion_ids,
                                      1,
-                                     MPI_INT,
+                                     MPI_LONG_LONG_INT,
                                      0,
                                      mod_comm);
         if (my_rank == 0)

darshan-util/darshan-bgq-logutils.c

@@ -56,9 +56,9 @@ static int darshan_log_get_bgq_file(void** psx_buf_p, int* bytes_left,
         /* swap bytes if necessary */
         DARSHAN_BSWAP64(&file->f_id);
         DARSHAN_BSWAP64(&file->rank);
-        for(i=0; i<POSIX_NUM_INDICES; i++)
+        for(i=0; i<BGQ_NUM_INDICES; i++)
             DARSHAN_BSWAP64(&file->counters[i]);
-        for(i=0; i<POSIX_F_NUM_INDICES; i++)
+        for(i=0; i<BGQ_F_NUM_INDICES; i++)
             DARSHAN_BSWAP64(&file->fcounters[i]);
     }
 
@@ -78,16 +78,16 @@ static void darshan_log_print_bgq_file(void *file_rec, char *file_name,
     struct darshan_bgq_record *bgq_file_rec =
         (struct darshan_bgq_record *)file_rec;
 
-    for(i=0; i<POSIX_NUM_INDICES; i++)
+    for(i=0; i<BGQ_NUM_INDICES; i++)
     {
-        DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_POSIX_MOD],
+        DARSHAN_COUNTER_PRINT(darshan_module_names[DARSHAN_BGQ_MOD],
             bgq_file_rec->rank, bgq_file_rec->f_id, bgq_counter_names[i],
             bgq_file_rec->counters[i], file_name, mnt_pt, fs_type);
     }
 
-    for(i=0; i<POSIX_F_NUM_INDICES; i++)
+    for(i=0; i<BGQ_F_NUM_INDICES; i++)
     {
-        DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_POSIX_MOD],
+        DARSHAN_F_COUNTER_PRINT(darshan_module_names[DARSHAN_BGQ_MOD],
             bgq_file_rec->rank, bgq_file_rec->f_id, bgq_f_counter_names[i],
             bgq_file_rec->fcounters[i], file_name, mnt_pt, fs_type);
     }