Purpose: Add new C++ wrappers

Description:
    Because H5Pset_file_space and H5Pget_file_space are deprecated, changed
    to make wrappers for the new functions instead:
        H5Ps/get_file_space_strategy
        H5Ps/get_file_space_page_size

    New wrappers in FileCreatPropList:

        // Sets the strategy and the threshold value that the library will
        // will employ in managing file space.
        void setFileSpaceStrategy(H5F_fspace_strategy_t strategy, hbool_t persist, hsize_t threshold) const;

        // Returns the strategy that the library uses in managing file space.
        void getFileSpaceStrategy(H5F_fspace_strategy_t& strategy, hbool_t& persist, hsize_t& threshold) const;

        // Sets the file space page size for paged aggregation.
        void setFileSpacePagesize(hsize_t fsp_psize) const;

        // Returns the threshold value that the library uses in tracking free
        // space sections.
        hsize_t getFileSpacePagesize() const;

Platforms tested:
    Linux/32 2.6 (jam)
    Linux/64 (platypus)
    Darwin (osx1010test)

3 files changed, 43 insertions, 31 deletions

diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp
index 6701f6e..c506906 100644
--- a/c++/src/H5Attribute.cpp
+++ b/c++/src/H5Attribute.cpp
@@ -1,7 +1,7 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
  * Copyright by the Board of Trustees of the University of Illinois.         *
-/* All rights reserved.                                                      *
+ * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
diff --git a/c++/src/H5FcreatProp.cpp b/c++/src/H5FcreatProp.cpp
index c490f26..893db64 100644
--- a/c++/src/H5FcreatProp.cpp
+++ b/c++/src/H5FcreatProp.cpp
@@ -295,7 +295,7 @@ unsigned FileCreatPropList::getIstorek() const
 }
 
 //--------------------------------------------------------------------------
-// Function:    FileCreatPropList::setFileSpace
+// Function:    FileCreatPropList::setFileSpaceStrategy
 ///\brief       Sets the strategy and the threshold value that the library
 ///             will employ in managing file space.
 ///\param       strategy - IN: Strategy for file space management
@@ -307,62 +307,71 @@ unsigned FileCreatPropList::getIstorek() const
 ///             changed and the existing strategy will be retained.
 ///             If the given threshold value is zero, the property will not be
 ///             changed and the existing threshold will be retained.
-///             Valid values of \a libver_low are as follows:
-///             \li \c H5F_FILE_SPACE_ALL   (Default)
-///             \li \c H5F_FILE_SPACE_ALL_PERSIST
-///             \li \c H5F_FILE_SPACE_AGGR_VFD
-///             \li \c H5F_FILE_SPACE_VFD
 ///             For information, please see the C layer Reference Manual at:
 /// https://support.hdfgroup.org/HDF5/doc/RM/RM_H5P.html#Property-SetFileSpace
 // Programmer   Binh-Minh Ribler - Feb, 2017
 //--------------------------------------------------------------------------
-void FileCreatPropList::setFileSpace(H5F_file_space_type_t strategy, hsize_t threshold) const
+void FileCreatPropList::setFileSpaceStrategy(H5F_fspace_strategy_t strategy, hbool_t persist, hsize_t threshold) const
 {
-    herr_t ret_value = H5Pset_file_space(id, strategy, threshold);
+    herr_t ret_value = H5Pset_file_space_strategy(id, strategy, persist, threshold);
     if (ret_value < 0)
     {
-        throw PropListIException("FileCreatPropList::setFileSpace",
-            "H5Pset_file_space failed");
+        throw PropListIException("FileCreatPropList::setFileSpaceStrategy",
+            "H5Pset_file_space_strategy failed");
     }
 }
 
 //--------------------------------------------------------------------------
 // Function:    FileCreatPropList::getFileSpaceStrategy
-///\brief       Returns the strategy that the library uses in managing file space.
-///\return      The strategy value
+///\brief       Retrieves the strategy, persist, and threshold that the library
+///             uses in managing file space.
 ///\exception   H5::PropListIException
 // Programmer   Binh-Minh Ribler - Feb, 2017
 //--------------------------------------------------------------------------
-H5F_file_space_type_t FileCreatPropList::getFileSpaceStrategy() const
+void FileCreatPropList::getFileSpaceStrategy(H5F_fspace_strategy_t& strategy, hbool_t& persist, hsize_t& threshold) const
 {
-    H5F_file_space_type_t strategy = H5F_FILE_SPACE_ALL;
-    herr_t ret_value = H5Pget_file_space(id, &strategy, NULL);
+    herr_t ret_value = H5Pget_file_space_strategy(id, &strategy, &persist, &threshold);
     if (ret_value < 0)
     {
         throw PropListIException("FileCreatPropList::getFileSpaceStrategy",
-            "H5Pget_file_space for strategy failed");
+            "H5Pget_file_space_strategy failed");
     }
-    return(strategy);
 }
 
 //--------------------------------------------------------------------------
-// Function:    FileCreatPropList::getFileSpaceThreshold
-///\brief       Returns the threshold value that the library uses in tracking
-///             free space sections.
-///\return      The threshold value
+// Function:    FileCreatPropList::setFileSpacePagesize
+///\brief       Sets the file space page size for paged aggregation.
 ///\exception   H5::PropListIException
 // Programmer   Binh-Minh Ribler - Feb, 2017
 //--------------------------------------------------------------------------
-hsize_t FileCreatPropList::getFileSpaceThreshold() const
+void FileCreatPropList::setFileSpacePagesize(hsize_t fsp_psize) const
 {
-    hsize_t threshold = 0;
-    herr_t ret_value = H5Pget_file_space(id, NULL, &threshold);
+    herr_t ret_value = H5Pset_file_space_page_size(id, fsp_psize);
     if (ret_value < 0)
     {
-        throw PropListIException("FileCreatPropList::getFileSpaceThreshold",
-            "H5Pget_file_space for threshold failed");
+        throw PropListIException("FileCreatPropList::setFileSpacePagesize",
+            "H5Pset_file_space_page_size failed");
     }
-    return(threshold);
+}
+
+//--------------------------------------------------------------------------
+// Function:    FileCreatPropList::getFileSpacePagesize
+///\brief       Returns the file space page size for aggregating small
+///             metadata or raw data.
+///\return      File space page size
+///\exception   H5::PropListIException
+// Programmer   Binh-Minh Ribler - Feb, 2017
+//--------------------------------------------------------------------------
+hsize_t FileCreatPropList::getFileSpacePagesize() const
+{
+    hsize_t fsp_psize = 0;
+    herr_t ret_value = H5Pget_file_space_page_size(id, &fsp_psize);
+    if (ret_value < 0)
+    {
+        throw PropListIException("FileCreatPropList::getFileSpacePagesize",
+            "H5Pget_file_space_page_size failed");
+    }
+    return(fsp_psize);
 }
 
 //--------------------------------------------------------------------------
diff --git a/c++/src/H5FcreatProp.h b/c++/src/H5FcreatProp.h
index 7b594a3..6beac02 100644
--- a/c++/src/H5FcreatProp.h
+++ b/c++/src/H5FcreatProp.h
@@ -67,14 +67,17 @@ class H5_DLLCPP FileCreatPropList : public PropList {
 
         // Sets the strategy and the threshold value that the library will
         // will employ in managing file space.
-        void setFileSpace(H5F_file_space_type_t strategy, hsize_t threshold) const;
+        void setFileSpaceStrategy(H5F_fspace_strategy_t strategy, hbool_t persist, hsize_t threshold) const;
 
         // Returns the strategy that the library uses in managing file space.
-        H5F_file_space_type_t getFileSpaceStrategy() const;
+        void getFileSpaceStrategy(H5F_fspace_strategy_t& strategy, hbool_t& persist, hsize_t& threshold) const;
+
+        // Sets the file space page size for paged aggregation.
+        void setFileSpacePagesize(hsize_t fsp_psize) const;
 
         // Returns the threshold value that the library uses in tracking free
         // space sections.
-        hsize_t getFileSpaceThreshold() const;
+        hsize_t getFileSpacePagesize() const;
 
         ///\brief Returns this class name.
         virtual H5std_string fromClass() const { return("FileCreatPropList"); }