Merge r6523 (Inline a bunch of helper functions)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6527

diff --git a/auxprogs/libmpiwrap.c b/auxprogs/libmpiwrap.c
index f9a572f936d367ec9d7e1d32b319653df8378245..03172a55bed3f6ed019976dc3d70379127604a08 100644 (file)
--- a/auxprogs/libmpiwrap.c
+++ b/auxprogs/libmpiwrap.c
@@ -492,7 +492,7 @@ static long sizeof_long_double_image ( void )
 /*--- Unpicking datatypes                                  ---*/
 /*------------------------------------------------------------*/
 
-static 
+static __inline__
 void walk_type_array ( void(*f)(void*,long), char* base, 
                        MPI_Datatype ty, long count );
 
@@ -693,7 +693,7 @@ void walk_type ( void(*f)(void*,long), char* base, MPI_Datatype ty )
    into a different routine is so it can attempt to optimise the case
    where the array elements are contiguous and packed together without
    holes. */
-static 
+static __inline__
 void walk_type_array ( void(*f)(void*,long), char* base, 
                        MPI_Datatype elemTy, long count )
 {
@@ -748,12 +748,11 @@ void mpiwrap_walk_type_EXTERNALLY_VISIBLE
 
 /* ----------------
    Do corresponding checks on memory areas defined using a 
-   straightforward (start, length) description.  Not inlined
-   so as to make any resulting error tracebacks easier to read.
+   straightforward (start, length) description.
    ----------------
 */
 
-static
+static __inline__
 void check_mem_is_defined_untyped ( void* buffer, long nbytes )
 {
    if (nbytes > 0) {
@@ -761,7 +760,7 @@ void check_mem_is_defined_untyped ( void* buffer, long nbytes )
    }
 }
 
-static
+static __inline__
 void check_mem_is_addressable_untyped ( void* buffer, long nbytes )
 {
    if (nbytes > 0) {
@@ -769,7 +768,7 @@ void check_mem_is_addressable_untyped ( void* buffer, long nbytes )
    }
 }
 
-static
+static __inline__
 void make_mem_defined_if_addressable_untyped ( void* buffer, long nbytes )
 {
    if (nbytes > 0) {
@@ -777,7 +776,7 @@ void make_mem_defined_if_addressable_untyped ( void* buffer, long nbytes )
    }
 }
 
-static
+static __inline__
 void make_mem_defined_if_addressable_if_success_untyped ( int err, 
                                        void* buffer, long nbytes )
 {
@@ -796,7 +795,7 @@ void make_mem_defined_if_addressable_if_success_untyped ( int err,
 /* Check that the specified area is both addressible and contains
    initialised data, and cause V to complain if not. */
 
-static
+static __inline__
 void check_mem_is_defined ( char* buffer, long count, MPI_Datatype datatype )
 {
    walk_type_array( check_mem_is_defined_untyped, buffer, datatype, count );
@@ -807,7 +806,7 @@ void check_mem_is_defined ( char* buffer, long count, MPI_Datatype datatype )
    complain if not. Doesn't matter whether the data there is
    initialised or not. */
 
-static
+static __inline__
 void check_mem_is_addressable ( void *buffer, long count, MPI_Datatype datatype )
 {
    walk_type_array( check_mem_is_addressable_untyped, buffer, datatype, count );
@@ -817,14 +816,14 @@ void check_mem_is_addressable ( void *buffer, long count, MPI_Datatype datatype
 /* Set the specified area to 'defined for each byte which is
    addressible' state. */
 
-static
+static __inline__
 void make_mem_defined_if_addressable ( void *buffer, int count, MPI_Datatype datatype )
 {
    walk_type_array( make_mem_defined_if_addressable_untyped,
                     buffer, datatype, count );
 }
 
-static
+static __inline__
 void 
 make_mem_defined_if_addressable_if_success ( int err, void *buffer, int count, 
                                              MPI_Datatype datatype )
@@ -1167,7 +1166,7 @@ static void maybe_complete ( Bool         error_in_status,
 /* --- Isend --- */
 /* rd: (buf,count,datatype) */
 /* wr: *request */
-static
+static __inline__
 int generic_Isend(void *buf, int count, MPI_Datatype datatype, 
                              int dest, int tag, MPI_Comm comm, 
                              MPI_Request* request)