update pnetcdf_var_runtime to use varid_hash

* `ncid_hash` name was confusing, so just add a new runtime
  structure for variables that defines a `varid_hash` instead.

Author: Shane Snyder

darshan-runtime/lib/darshan-pnetcdf-api.m4

@@ -234,7 +234,7 @@ int DARSHAN_DECL(APINAME($1,$2,$3,$4))(int ncid, int varid, ArgKind($2)BufArgs($
     if (ret == NC_NOERR) {
         PNETCDF_VAR_PRE_RECORD();
         struct pnetcdf_var_record_ref *rec_ref;
-        rec_ref = darshan_lookup_record_ref(pnetcdf_var_runtime->ncid_hash, &varid, sizeof(int));
+        rec_ref = darshan_lookup_record_ref(pnetcdf_var_runtime->varid_hash, &varid, sizeof(int));
         if (rec_ref) {
             struct darshan_common_val_counter *cvc;
             int64_t common_access_vals[PNETCDF_VAR_MAX_NDIMS+PNETCDF_VAR_MAX_NDIMS+1] = {0};
@@ -277,7 +277,7 @@ int DARSHAN_DECL(APINAME($1,n,$2,$3))(int ncid, int varid, int num, MPI_Offset*
     if (ret == NC_NOERR) {
         PNETCDF_VAR_PRE_RECORD();
         struct pnetcdf_var_record_ref *rec_ref;
-        rec_ref = darshan_lookup_record_ref(pnetcdf_var_runtime->ncid_hash, &varid, sizeof(int));
+        rec_ref = darshan_lookup_record_ref(pnetcdf_var_runtime->varid_hash, &varid, sizeof(int));
         if (rec_ref) {
             struct darshan_common_val_counter *cvc;
             int64_t common_access_vals[PNETCDF_VAR_MAX_NDIMS+PNETCDF_VAR_MAX_NDIMS+1] = {0};
@@ -319,7 +319,7 @@ int DARSHAN_DECL(ncmpi_$1_vard$2)(int ncid, int varid, MPI_Datatype filetype, if
     if (ret == NC_NOERR) {
         PNETCDF_VAR_PRE_RECORD();
         struct pnetcdf_var_record_ref *rec_ref;
-        rec_ref = darshan_lookup_record_ref(pnetcdf_var_runtime->ncid_hash, &varid, sizeof(int));
+        rec_ref = darshan_lookup_record_ref(pnetcdf_var_runtime->varid_hash, &varid, sizeof(int));
         if (rec_ref) {
             struct darshan_common_val_counter *cvc;
             int64_t common_access_vals[PNETCDF_VAR_MAX_NDIMS+PNETCDF_VAR_MAX_NDIMS+1] = {0};
@@ -360,7 +360,7 @@ int DARSHAN_DECL(APINAME($1,$2,$3))(int ncid, int varid, ArgKind($2)BufArgs($1,$
     if (ret == NC_NOERR) {
         PNETCDF_VAR_PRE_RECORD();
         struct pnetcdf_var_record_ref *rec_ref;
-        rec_ref = darshan_lookup_record_ref(pnetcdf_var_runtime->ncid_hash, &varid, sizeof(int));
+        rec_ref = darshan_lookup_record_ref(pnetcdf_var_runtime->varid_hash, &varid, sizeof(int));
         if (rec_ref) {
             struct darshan_common_val_counter *cvc;
             int64_t common_access_vals[PNETCDF_VAR_MAX_NDIMS+PNETCDF_VAR_MAX_NDIMS+1] = {0};
@@ -404,7 +404,7 @@ int DARSHAN_DECL(APINAME($1,n,$2))(int ncid, int varid, int num, MPI_Offset* con
     if (ret == NC_NOERR) {
         PNETCDF_VAR_PRE_RECORD();
         struct pnetcdf_var_record_ref *rec_ref;
-        rec_ref = darshan_lookup_record_ref(pnetcdf_var_runtime->ncid_hash, &varid, sizeof(int));
+        rec_ref = darshan_lookup_record_ref(pnetcdf_var_runtime->varid_hash, &varid, sizeof(int));
         if (rec_ref) {
             struct darshan_common_val_counter *cvc;
             int64_t common_access_vals[PNETCDF_VAR_MAX_NDIMS+PNETCDF_VAR_MAX_NDIMS+1] = {0};
@@ -781,7 +781,7 @@ define(`PNETCDF_VAR_RECORD_OPEN',`
         else type_size = 8;
         rec_ref->var_rec->counters[PNETCDF_VAR_DATATYPE_SIZE] = type_size;
         rec_ref->var_rec->file_rec_id = file_rec_id;
-        darshan_add_record_ref(&(pnetcdf_var_runtime->ncid_hash), $6, sizeof(int), rec_ref);
+        darshan_add_record_ref(&(pnetcdf_var_runtime->varid_hash), $6, sizeof(int), rec_ref);
     } while (0);
 ')dnl
 

darshan-runtime/lib/darshan-pnetcdf.c

@@ -50,15 +50,24 @@ struct pnetcdf_var_record_ref
     int unlimdimid;
 };
 
-/* struct to encapsulate runtime state for the PnetCDF module */
-struct pnetcdf_runtime
+/* struct to encapsulate runtime state for the PnetCDF file module */
+struct pnetcdf_file_runtime
 {
     void *rec_id_hash;
     void *ncid_hash;
     int rec_count;
     int frozen; /* flag to indicate that the counters should no longer be modified */
 };
 
+/* struct to encapsulate runtime state for the PnetCDF var module */
+struct pnetcdf_var_runtime
+{
+    void *rec_id_hash;
+    void *varid_hash;
+    int rec_count;
+    int frozen; /* flag to indicate that the counters should no longer be modified */
+};
+
 static void pnetcdf_file_runtime_initialize(void);
 static void pnetcdf_var_runtime_initialize(void);
 static struct pnetcdf_file_record_ref *pnetcdf_file_track_new_record(
@@ -87,9 +96,9 @@ static void pnetcdf_var_output(
 static void pnetcdf_file_cleanup(void);
 static void pnetcdf_var_cleanup(void);
 
-static struct pnetcdf_runtime *pnetcdf_file_runtime = NULL;
+static struct pnetcdf_file_runtime *pnetcdf_file_runtime = NULL;
 static int pnetcdf_file_runtime_init_attempted = 0;
-static struct pnetcdf_runtime *pnetcdf_var_runtime = NULL;
+static struct pnetcdf_var_runtime *pnetcdf_var_runtime = NULL;
 static int pnetcdf_var_runtime_init_attempted = 0;
 
 static pthread_mutex_t pnetcdf_runtime_mutex = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
@@ -180,7 +189,7 @@ static void pnetcdf_file_runtime_initialize()
     if(ret < 0)
         return;
 
-    pnetcdf_file_runtime = (struct pnetcdf_runtime*) calloc(1, sizeof(struct pnetcdf_runtime));
+    pnetcdf_file_runtime = (struct pnetcdf_file_runtime*) calloc(1, sizeof(struct pnetcdf_file_runtime));
     if(!pnetcdf_file_runtime)
     {
         darshan_core_unregister_module(DARSHAN_PNETCDF_FILE_MOD);
@@ -218,7 +227,7 @@ static void pnetcdf_var_runtime_initialize()
     if(ret < 0)
         return;
 
-    pnetcdf_var_runtime = (struct pnetcdf_runtime*) calloc(1, sizeof(struct pnetcdf_runtime));
+    pnetcdf_var_runtime = (struct pnetcdf_var_runtime*) calloc(1, sizeof(struct pnetcdf_var_runtime));
     if(!pnetcdf_var_runtime)
     {
         darshan_core_unregister_module(DARSHAN_PNETCDF_VAR_MOD);
@@ -927,7 +936,7 @@ static void pnetcdf_var_cleanup(void)
         &pnetcdf_var_finalize_records, NULL);
 
     /* cleanup internal structures used for instrumenting */
-    darshan_clear_record_refs(&(pnetcdf_var_runtime->ncid_hash), 0);
+    darshan_clear_record_refs(&(pnetcdf_var_runtime->varid_hash), 0);
     darshan_clear_record_refs(&(pnetcdf_var_runtime->rec_id_hash), 1);
 
     free(pnetcdf_var_runtime);