more inq functions working with async

E3SM-Project · May 9, 2016 · 90c689f · 90c689f
1 parent aee5878
commit 90c689f
Show file tree

Hide file tree

Showing 4 changed files with 219 additions and 492 deletions.
diff --git a/src/clib/pio_internal.h b/src/clib/pio_internal.h
@@ -166,10 +166,8 @@ enum PIO_MSG{
   PIO_MSG_INQ_ATT,
   PIO_MSG_INQ_FORMAT,
   PIO_MSG_INQ_VARID,
-  PIO_MSG_INQ_VARNATTS,
   PIO_MSG_DEF_VAR,
   PIO_MSG_INQ_VAR,
-  PIO_MSG_INQ_VARNAME,
   PIO_MSG_PUT_ATT_DOUBLE,
   PIO_MSG_PUT_ATT_INT,
   PIO_MSG_RENAME_ATT,
@@ -193,11 +191,9 @@ enum PIO_MSG{
   PIO_MSG_PUT_ATT_SCHAR,
   PIO_MSG_PUT_ATT_FLOAT,
   PIO_MSG_RENAME_DIM,
-  PIO_MSG_INQ_VARNDIMS,
   PIO_MSG_GET_ATT_LONG,
   PIO_MSG_INQ_DIM,
   PIO_MSG_INQ_DIMID,
-  PIO_MSG_INQ_VARDIMID,
   PIO_MSG_PUT_ATT_USHORT,
   PIO_MSG_GET_ATT_FLOAT,
   PIO_MSG_SYNC,
@@ -206,7 +202,6 @@ enum PIO_MSG{
   PIO_MSG_GET_ATT_SCHAR,
   PIO_MSG_INQ_ATTID,
   PIO_MSG_DEF_DIM,
-  PIO_MSG_INQ_VARTYPE,
   PIO_MSG_GET_ATT_INT,
   PIO_MSG_GET_ATT_DOUBLE,
   PIO_MSG_PUT_ATT_UCHAR,

diff --git a/src/clib/pio_msg.c b/src/clib/pio_msg.c
@@ -373,56 +373,53 @@ int att_handler(iosystem_desc_t *ios, int msg)
  * @param msg the message sent my the comp root task. 
  * @return PIO_NOERR for success, error code otherwise. 
 */
-int inq_var_handler(iosystem_desc_t *ios, int msg)
+int inq_var_handler(iosystem_desc_t *ios)
 {
     int ncid;
     int varid;
     int mpierr;
+    char name_present, xtype_present, ndims_present, dimids_present, natts_present;
+    char name[NC_MAX_NAME + 1], *namep;
+    nc_type xtype, *xtypep = NULL;
+    int *ndimsp = NULL, *dimidsp = NULL, *nattsp = NULL;    
+    int ndims, dimids[NC_MAX_DIMS], natts;    
     int ret;
 
     int my_rank;
-    MPI_Comm_rank(MPI_COMM_WORLD, &my_rank);    
+    MPI_Comm_rank(MPI_COMM_WORLD, &my_rank);
+    printf("%d inq_var_handler\n", my_rank);
 
     /* Get the parameters for this function that the the comp master
      * task is broadcasting. */
     if ((mpierr = MPI_Bcast(&ncid, 1, MPI_INT, 0, ios->intercomm)))
 	return PIO_EIO;
     if ((mpierr = MPI_Bcast(&varid, 1, MPI_INT, 0, ios->intercomm)))
 	return PIO_EIO;
-    printf("%d inq_var_handler ncid = %d varid = %d\n", my_rank, ncid, varid);
+    if ((mpierr = MPI_Bcast(&name_present, 1, MPI_CHAR, 0, ios->intercomm)))
+	return PIO_EIO;
+    if ((mpierr = MPI_Bcast(&xtype_present, 1, MPI_CHAR, 0, ios->intercomm)))
+	return PIO_EIO;
+    if ((mpierr = MPI_Bcast(&ndims_present, 1, MPI_CHAR, 0, ios->intercomm)))
+	return PIO_EIO;
+    if ((mpierr = MPI_Bcast(&dimids_present, 1, MPI_CHAR, 0, ios->intercomm)))
+	return PIO_EIO;
+    if ((mpierr = MPI_Bcast(&natts_present, 1, MPI_CHAR, 0, ios->intercomm)))
+	return PIO_EIO;
+    printf("%d inq_var_handler ncid = %d varid = %d name_present = %d xtype_present = %d ndims_present = %d "
+	   "dimids_present = %d natts_present = %d\n",
+	   my_rank, ncid, varid, name_present, xtype_present, ndims_present, dimids_present, natts_present);
 
-    /* Call the inq_var function. */
-    char name[NC_MAX_NAME + 1], *namep;
-    nc_type xtype, *xtypep = NULL;
-    int *ndimsp = NULL, *dimidsp = NULL, *nattsp = NULL;    
-    int ndims, dimids[NC_MAX_DIMS], natts;    
-    switch (msg)
-    {
-    case PIO_MSG_INQ_VAR:
+    /* Set the non-NULL pointers. */
+    if (name_present)
 	namep = name;
+    if (xtype_present)
 	xtypep = &xtype;
+    if (ndims_present)
 	ndimsp = &ndims;
+    if (dimids_present)
 	dimidsp = dimids;
+    if (natts_present)
 	nattsp = &natts;
-	break;
-    case PIO_MSG_INQ_VARNATTS:
-	nattsp = &natts;
-	break;
-    case PIO_MSG_INQ_VARNAME:
-	namep = name;
-	break;
-    case PIO_MSG_INQ_VARNDIMS:
-	ndimsp = &ndims;
-	break;
-    case PIO_MSG_INQ_VARDIMID:
-	dimidsp = dimids;
-	break;
-    case PIO_MSG_INQ_VARTYPE:
-	xtypep = &xtype;
-	break;
-    default:
-	return PIO_EINVAL;
-    }
 
     /* Call the inq function to get the values. */
     if ((ret = PIOc_inq_var(ncid, varid, namep, xtypep, ndimsp, dimidsp, nattsp)))
@@ -931,12 +928,7 @@ int pio_msg_handler(int io_rank, int component_count, iosystem_desc_t *iosys)
 	    inq_dimid_handler(my_iosys);
 	    break;
 	case PIO_MSG_INQ_VAR:
-	case PIO_MSG_INQ_VARNATTS:
-	case PIO_MSG_INQ_VARNAME:
-	case PIO_MSG_INQ_VARNDIMS:
-	case PIO_MSG_INQ_VARDIMID:
-	case PIO_MSG_INQ_VARTYPE:
-	    inq_var_handler(my_iosys, msg);
+	    inq_var_handler(my_iosys);
 	    break;
 	case PIO_MSG_GET_ATT_INT:
 	case PIO_MSG_PUT_ATT_INT: