Merge pull request #1896 from jedwards4b/pio_buffer_size_limit_rename

Author: jedwards4b

src/clib/pio_darray.c

@@ -22,7 +22,7 @@
  */
 
 /** 10MB default limit. */
-PIO_Offset pio_buffer_size_limit = PIO_BUFFER_SIZE;
+PIO_Offset pio_pnetcdf_buffer_size_limit = PIO_BUFFER_SIZE;
 
 /** Global buffer pool pointer. */
 void *CN_bpool = NULL;
@@ -46,7 +46,7 @@ extern int event_num[2][NUM_EVENTS];
 /**
  * Set the PIO IO node data buffer size limit.
  *
- * The pio_buffer_size_limit will only apply to files opened after
+ * The pio_pnetcdf_buffer_size_limit will only apply to files opened after
  * the setting is changed.
  *
  * @param limit the size of the buffer on the IO nodes
@@ -56,11 +56,11 @@ extern int event_num[2][NUM_EVENTS];
 PIO_Offset
 PIOc_set_buffer_size_limit(PIO_Offset limit)
 {
-    PIO_Offset oldsize = pio_buffer_size_limit;
+    PIO_Offset oldsize = pio_pnetcdf_buffer_size_limit;
 
     /* If the user passed a valid size, use it. */
     if (limit > 0)
-        pio_buffer_size_limit = limit;
+        pio_pnetcdf_buffer_size_limit = limit;
 
     return oldsize;
 }

src/clib/pio_darray_int.c

@@ -20,7 +20,7 @@
 #endif
 
 /** 10MB default limit. */
-extern PIO_Offset pio_buffer_size_limit;
+extern PIO_Offset pio_pnetcdf_buffer_size_limit;
 
 /** Initial size of compute buffer. */
 long pio_cnbuffer_limit = 33554432;
@@ -1737,7 +1737,7 @@ flush_output_buffer(file_desc_t *file, bool force, PIO_Offset addsize)
     PLOG((2, "flush_output_buffer usage=%ld force=%d",usage, force));
     /* If the user forces it, or the buffer has exceeded the size
      * limit, then flush to disk. */
-    if (force || (usage >= pio_buffer_size_limit))
+    if (force || (usage >= pio_pnetcdf_buffer_size_limit))
     {
         int rcnt;
         int  maxreq;
@@ -2156,7 +2156,7 @@ compute_maxaggregate_bytes(iosystem_desc_t *ios, io_desc_t *iodesc)
 
     /* Determine the max bytes that can be held on IO task. */
     if (ios->ioproc && iodesc->maxiobuflen > 0)
-        maxbytesoniotask = pio_buffer_size_limit / iodesc->maxiobuflen;
+        maxbytesoniotask = pio_pnetcdf_buffer_size_limit / iodesc->maxiobuflen;
 
     /* Determine the max bytes that can be held on computation task. */
     if (ios->comp_rank >= 0 && iodesc->ndof > 0)

src/clib/pio_internal.h

@@ -131,7 +131,7 @@ void pio_log(int severity, const char *fmt, ...);
 extern "C" {
 #endif
 
-    extern PIO_Offset pio_buffer_size_limit;
+    extern PIO_Offset pio_pnetcdf_buffer_size_limit;
 
     /** Used to sort map points in the subset rearranger. */
     typedef struct mapsort

src/clib/pioc_support.c

@@ -2155,7 +2155,7 @@ PIOc_createfile_int(int iosysid, int *ncidp, int *iotype, const char *filename,
             PLOG((2, "Calling ncmpi_create mode = %d", mode));
             ierr = ncmpi_create(ios->io_comm, filename, mode, ios->info, &file->fh);
             if (!ierr)
-                ierr = ncmpi_buffer_attach(file->fh, pio_buffer_size_limit);
+                ierr = ncmpi_buffer_attach(file->fh, pio_pnetcdf_buffer_size_limit);
             break;
 #endif
         }
@@ -2763,8 +2763,8 @@ PIOc_openfile_retry(int iosysid, int *ncidp, int *iotype, const char *filename,
             {
                 if (ios->iomaster == MPI_ROOT)
                     PLOG((2, "%d Setting IO buffer %ld", __LINE__,
-                          pio_buffer_size_limit));
-                ierr = ncmpi_buffer_attach(file->fh, pio_buffer_size_limit);
+                          pio_pnetcdf_buffer_size_limit));
+                ierr = ncmpi_buffer_attach(file->fh, pio_pnetcdf_buffer_size_limit);
             }
             PLOG((2, "ncmpi_open(%s) : fd = %d", filename, file->fh));