[svn-r8544] Purpose:

    Code optimization

Description:
    Expand the use of macros to inline trivial function pointer lookup and
calls to reduce the overall number of functions invoked during normal operation
of the library.

Platforms tested:
    Solaris 2.7 (arabica)
    FreeBSD 4.9 (sleipnir) w/parallel
    Too minor to require h5committest

1 files changed, 31 insertions, 9 deletions

diff --git a/src/H5S.c b/src/H5S.c
index c183be7..ebde0a1 100644
--- a/src/H5S.c
+++ b/src/H5S.c
@@ -450,7 +450,7 @@ H5S_close(H5S_t *ds)
     assert(ds);
 
     /* Release selection (this should come before the extent release) */
-    H5S_select_release(ds);
+    H5S_SELECT_RELEASE(ds);
 
     /* Release extent */
     H5S_extent_release(&ds->extent);
@@ -912,7 +912,7 @@ H5Sget_simple_extent_ndims(hid_t space_id)
     if (NULL == (ds = H5I_object_verify(space_id, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a data space");
 
-    ret_value = H5S_get_simple_extent_ndims(ds);
+    ret_value = H5S_GET_SIMPLE_EXTENT_NDIMS(ds);
 
 done:
     FUNC_LEAVE_API(ret_value);
@@ -932,6 +932,10 @@ done:
  * Programmer:	Robb Matzke
  *		Thursday, December 11, 1997
  *
+ * Note:        This routine participates in the "Inlining C function pointers"
+ *              pattern, don't call it directly, use the appropriate macro
+ *              defined in H5Sprivate.h.
+ *
  * Modifications:
  *
  *-------------------------------------------------------------------------
@@ -949,9 +953,6 @@ H5S_get_simple_extent_ndims(const H5S_t *ds)
     switch (ds->extent.type) {
         case H5S_NULL:
         case H5S_SCALAR:
-            ret_value = 0;
-            break;
-
         case H5S_SIMPLE:
             ret_value = ds->extent.u.simple.rank;
             break;
@@ -1382,9 +1383,6 @@ H5S_set_extent_simple (H5S_t *space, unsigned rank, const hsize_t *dims,
     assert(rank<=H5S_MAX_RANK);
     assert(0==rank || dims);
 
-    /* Set offset to zeros */
-    HDmemset(space->select.offset,0,sizeof(hssize_t)*rank);
-
     /* shift out of the previous state to a "simple" dataspace.  */
     if(H5S_extent_release(&space->extent)<0)
         HGOTO_ERROR (H5E_RESOURCE, H5E_CANTFREE, FAIL, "failed to release previous dataspace extent");
@@ -1416,6 +1414,16 @@ H5S_set_extent_simple (H5S_t *space, unsigned rank, const hsize_t *dims,
         } /* end if */
     }
 
+    /* Selection related cleanup */
+
+    /* Set offset to zeros */
+    HDmemset(space->select.offset,0,sizeof(hssize_t)*rank);
+
+    /* If the selection is 'all', update the number of elements selected */
+    if(H5S_GET_SELECT_TYPE(space)==H5S_SEL_ALL)
+        if(H5S_select_all(space, FALSE)<0)
+            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection");
+
 done:
     FUNC_LEAVE_NOAPI(ret_value);
 }
@@ -1636,6 +1644,11 @@ H5S_extend (H5S_t *space, const hsize_t *size)
             nelem*=space->extent.u.simple.size[u];
         }
         space->extent.nelem = nelem;
+
+        /* If the selection is 'all', update the number of elements selected */
+        if(H5S_GET_SELECT_TYPE(space)==H5S_SEL_ALL)
+            if(H5S_select_all(space, FALSE)<0)
+                HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection");
     }
 
 done:
@@ -1773,6 +1786,10 @@ done:
  * Programmer:	Quincey Koziol
  *		Thursday, September 28, 2000
  *
+ * Note:        This routine participates in the "Inlining C function pointers"
+ *              pattern, don't call it directly, use the appropriate macro
+ *              defined in H5Sprivate.h.
+ *
  * Modifications:
  *
  *-------------------------------------------------------------------------
@@ -1824,7 +1841,7 @@ H5Sget_simple_extent_type(hid_t sid)
     if (NULL == (space = H5I_object_verify(sid, H5I_DATASPACE)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, H5S_NO_CLASS, "not a dataspace");
 
-    ret_value=H5S_get_simple_extent_type(space);
+    ret_value=H5S_GET_SIMPLE_EXTENT_TYPE(space);
     
 done:
     FUNC_LEAVE_API(ret_value);
@@ -1992,6 +2009,11 @@ H5S_set_extent_real( H5S_t *space, const hsize_t *size )
     } /* end for */
     space->extent.nelem = nelem;
 
+    /* If the selection is 'all', update the number of elements selected */
+    if(H5S_GET_SELECT_TYPE(space)==H5S_SEL_ALL)
+        if(H5S_select_all(space, FALSE)<0)
+            HGOTO_ERROR(H5E_DATASPACE, H5E_CANTDELETE, FAIL, "can't change selection");
+
 done:
     FUNC_LEAVE_NOAPI(ret_value);
 } /* end H5S_set_extent_real() */