Changes to VT:

- fixed compiler warnings when compiling for 32-bit
	- MPI wrapper generator scripts:
		- removed non-posix call to length(array)
		- exit scripts if any statement returns a non-true return value (set -e)

This commit was SVN r28524.

ompi/contrib/vt/vt/ChangeLog

@@ -1,5 +1,7 @@
 5.14.4openmpi
 	- fixed build issues due to API changes in MPI-3
+        - removed non-posix call to length(array) in AWK script for generating
+	  the C MPI wrapper functions
 	- fixed potential buffer overflow when reading the filter file
 	- enabled access to CUPTI counters for CUDA tracing via CUPTI
 	- enabled GPU memory usage tracing independent of the CUDA API

ompi/contrib/vt/vt/config/mpigen/mk_c_wrapper.sh.in

@@ -1,9 +1,14 @@
 ##
 # @configure_input@
 #
-# make wrapper.c
+# make vtlib/vt_mpiwrap.gen.c
 ##
 
+# exit the script if any statement returns a non-true return value
+set -e
+
+
+
 export SRCDIR=@top_vt_srcdir@/config/mpigen
 
 have_mpi2_thread=@VT_MPIGEN_HAVE_MPI2_THREAD@
@@ -136,10 +141,10 @@ cat <<End-of-File >$tmp.awk
   
   if (NF > 2) {
     for (i=3; i<=NF; i++) {
-      split(\$i,typeandpara," ")
+      n=split(\$i,typeandpara," ")
       j=1
       if (i > 3) printf ", "
-      if (length(typeandpara) == 3) printf "%s ",typeandpara[j++]
+      if (n == 3) printf "%s ",typeandpara[j++]
       type[i-2]=typeandpara[j++]
       para[i-2]=typeandpara[j]
       printf "%s %s",type[i-2],para[i-2]

ompi/contrib/vt/vt/config/mpigen/mk_fortran_wrapper.sh.in

@@ -1,9 +1,14 @@
 ##
 # @configure_input@
 #
-# make fortran_wrapper.c
+# make vtlib/vt_fmpiwrap.gen.c
 ##
 
+# exit the script if any statement returns a non-true return value
+set -e
+
+
+
 export SRCDIR=@top_vt_srcdir@/config/mpigen
 
 export COMM_CONVERT=@VT_MPIGEN_HAVE_FC_CONV_COMM@

ompi/contrib/vt/vt/config/mpigen/mk_registry.sh.in

@@ -1,9 +1,14 @@
 ##
 # @configure_input@
 #
-# make vt_mpireg.[c|h]
+# make vtlib/vt_mpireg.gen.[c|h]
 ##
 
+# exit the script if any statement returns a non-true return value
+set -e
+
+
+
 export SRCDIR=@top_vt_srcdir@/config/mpigen
 
 have_mpi2_thread=@VT_MPIGEN_HAVE_MPI2_THREAD@

ompi/contrib/vt/vt/configure.ac

@@ -170,6 +170,7 @@ AC_CHECK_SIZEOF(void*, 8)
 AC_CHECK_SIZEOF(int, 4)
 AC_CHECK_SIZEOF(long, 8)
 AC_CHECK_SIZEOF(mode_t, 4)
+AC_CHECK_SIZEOF(size_t, 8)
 SIZEOF_LONG=$ac_cv_sizeof_long
 AC_SUBST(SIZEOF_LONG)
 

ompi/contrib/vt/vt/vtlib/vt_defs.h

@@ -13,6 +13,8 @@
 #ifndef _VT_DEFS_H
 #define _VT_DEFS_H
 
+#include "config.h"
+
 /* macro for one-step declaration and definition of functions */
 #define VT_DECLDEF(function)  \
 function; /* declaration */   \
@@ -25,8 +27,13 @@ function  /* definition */
  */
 
 #define VT_MIN_BUFSIZE               0x19000     /* 100KB */
-#define VT_MAX_BUFSIZE               0x280000000 /* 10GB */
-#define VT_MAX_THREAD_BUFSIZE        0x40000000  /* 1GB */
+#if SIZEOF_SIZE_T == 8
+# define VT_MAX_BUFSIZE              0x280000000 /* 10GB */
+# define VT_MAX_THREAD_BUFSIZE       0x40000000  /* 1GB */
+#else /* SIZEOF_SIZE_T */
+# define VT_MAX_BUFSIZE              0x40000000  /* 1GB */
+# define VT_MAX_THREAD_BUFSIZE       0x6400000   /* 100MB */
+#endif /* SIZEOF_SIZE_T */
 #define VT_DEFAULT_BUFSIZE           0x2000000   /* 32MB */
 
 typedef unsigned char* buffer_t;