Merge pull request #161 from Parallel-NetCDF/ibuf_size

wkliao · web-flow · commit 84f958fd9def · 2024-11-29T16:15:36.000-06:00
Bug fix: set hint nc_ibuf_size based on user's info
diff --git a/src/drivers/ncmpio/ncmpio_util.c b/src/drivers/ncmpio/ncmpio_util.c
@@ -136,7 +136,6 @@ void ncmpio_set_pnetcdf_hints(NC *ncp,
     }
     MPI_Info_set(info_used, "nc_in_place_swap", value);
 
-    ncp->ibuf_size = PNC_DEFAULT_IBUF_SIZE;
     if (user_info != MPI_INFO_NULL) {
 	/* temporal buffer size used to pack noncontiguous aggregated user
          * buffers when calling ncmpi_wait/wait_all, Default 16 MiB
@@ -147,7 +146,7 @@ void ncmpio_set_pnetcdf_hints(NC *ncp,
             MPI_Offset ibuf_size;
             errno = 0;  /* errno must set to zero before calling strtoll */
             ibuf_size = strtoll(value, NULL, 10);
-            if (errno == 0 && ncp->ibuf_size > 0) ncp->ibuf_size = ibuf_size;
+            if (errno == 0 && ibuf_size > 0) ncp->ibuf_size = ibuf_size;
         }
     }
     sprintf(value, "%lld", ncp->ibuf_size);

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,6 @@ void ncmpio_set_pnetcdf_hints(NC *ncp,`
`136`	`136`	`}`
`137`	`137`	`MPI_Info_set(info_used, "nc_in_place_swap", value);`
`138`	`138`
`139`		`- ncp->ibuf_size = PNC_DEFAULT_IBUF_SIZE;`
`140`	`139`	`if (user_info != MPI_INFO_NULL) {`
`141`	`140`	`/* temporal buffer size used to pack noncontiguous aggregated user`
`142`	`141`	`* buffers when calling ncmpi_wait/wait_all, Default 16 MiB`
`@@ -147,7 +146,7 @@ void ncmpio_set_pnetcdf_hints(NC *ncp,`
`147`	`146`	`MPI_Offset ibuf_size;`
`148`	`147`	`errno = 0; /* errno must set to zero before calling strtoll */`
`149`	`148`	`ibuf_size = strtoll(value, NULL, 10);`
`150`		`- if (errno == 0 && ncp->ibuf_size > 0) ncp->ibuf_size = ibuf_size;`
	`149`	`+ if (errno == 0 && ibuf_size > 0) ncp->ibuf_size = ibuf_size;`
`151`	`150`	`}`
`152`	`151`	`}`
`153`	`152`	`sprintf(value, "%lld", ncp->ibuf_size);`