- fixed handling NULL value of pathname given to certain I/O calls (e.g. fopen, open, unlink)

- incremented version number

This commit was SVN r24575.

ompi/contrib/vt/vt/ChangeLog

@@ -1,3 +1,7 @@
+5.8.4openmpi
+	- fixed handling NULL value of pathname given to certain I/O calls
+	  (e.g. fopen, open, unlink)
+
 5.8.3openmpi
 	- fixed compile error on Red Hat 5.x which occurred if using GNU
 	  compiler with -D_FORTIFY_SOURCE=2

ompi/contrib/vt/vt/VERSION

@@ -1 +1 @@
-5.8.3openmpi
+5.8.4openmpi

ompi/contrib/vt/vt/doc/UserManual.html

@@ -62,7 +62,7 @@ body {font-family: sans-serif;}
 <P>
 
 <P>
-<B><BIG CLASS="XHUGE">VampirTrace 5.8.3 User Manual</BIG></B>
+<B><BIG CLASS="XHUGE">VampirTrace 5.8.4 User Manual</BIG></B>
 <BR>
 <BR>
 <BR>

ompi/contrib/vt/vt/vtlib/vt_iowrap.h

@@ -489,14 +489,19 @@ EXTERN int(*libc_fprintf)(FILE *, const char *, ...);
         vt_debug_msg( DBG_INIT, "Macro VT_IOWRAP_LEAVE_IOFUNC_OPEN(), Function " stringify(VT_IOWRAP_THISFUNCNAME) ); \
         if( was_recorded ) { \
                 uint32_t ioop = VT_IOWRAP_FUNCTYPE(VT_IOWRAP_THISFUNCNAME); \
+                uint32_t fid; \
                 if( ERROR_CONDITION ) { \
-                        uint32_t fid = vt_iofile_id( path ); \
+                        if( path && strlen(path) > 0 ) { \
+                                fid = vt_iofile_id(path); \
+                        } \
+                        else { \
+                                fid = invalid_fd_fid; \
+                        } \
                         vt_debug_msg(DBG_VT_CALL, "vt_ioend(" stringify(VT_IOWRAP_THISFUNCNAME) "), stamp %llu", (unsigned long long)time); \
                         vt_ioend( &time, fid, handleid, ioop | VT_IOFLAG_IOFAILED, 0 ); \
                 } \
                 else { \
                         vampir_file_t* file; \
-                        uint32_t fid; \
                         vt_iofile_open( path, FD ); \
                         file = get_vampir_file( FD ); \
                         fid = file->vampir_file_id; \
@@ -541,16 +546,21 @@ EXTERN int(*libc_fprintf)(FILE *, const char *, ...);
         vt_debug_msg( DBG_INIT, "Macro VT_IOWRAP_LEAVE_IOFUNC_PATH(), Function " stringify(VT_IOWRAP_THISFUNCNAME) ); \
         if( was_recorded ) { \
                 uint32_t ioop = VT_IOWRAP_FUNCTYPE(VT_IOWRAP_THISFUNCNAME); \
-                uint32_t fid = vt_iofile_id(PATH); \
-                if( fid ) { \
-                        if( ERROR_CONDITION ) { \
-                                vt_debug_msg(DBG_VT_CALL, "vt_ioend(" stringify(VT_IOWRAP_THISFUNCNAME) "), stamp %llu", (unsigned long long)time); \
-                                vt_ioend( &time, fid, handleid, ioop | VT_IOFLAG_IOFAILED, 0 ); \
+                uint32_t fid; \
+                if( ERROR_CONDITION ) { \
+                        if( PATH && strlen(PATH) > 0 ) { \
+                                fid = vt_iofile_id(PATH); \
                         } \
                         else { \
-                                vt_ioend( &time, fid, handleid, ioop, 0 ); \
+                                fid = invalid_fd_fid; \
                         } \
+                        ioop |= VT_IOFLAG_IOFAILED; \
                 } \
+                else { \
+                        fid = vt_iofile_id(PATH); \
+                } \
+                vt_debug_msg(DBG_VT_CALL, "vt_ioend(" stringify(VT_IOWRAP_THISFUNCNAME) "), stamp %llu", (unsigned long long)time); \
+                vt_ioend( &time, fid, handleid, ioop, 0 ); \
         } \
         vt_exit( &time ); \
         if( enable_memhooks ) VT_MEMHOOKS_ON(); \