- removed hard-coded directory paths in vt_dyninst.c

- temporary disabled wrapper for 'fcntl' in vt_iowrap.c, due to curious behaviour on some platforms (e.g. segfault)

This commit was SVN r22659.

ompi/contrib/vt/vt/vtlib/vt_dyninst.c

@@ -27,6 +27,8 @@
 #include "vt_thrd.h"
 #include "vt_trc.h"
 
+#include "util/installdirs.h"
+
 static int dyn_init = 1;       /* is initialization needed? */
 
 /*
@@ -232,7 +234,7 @@ void VT_Dyn_attach()
        */
       signal(SIGUSR1, SIG_DFL);
       signal(SIGUSR2, SIG_DFL);
-       
+
       /* Try to get path of mutatee
        */
       vt_pform_init();
@@ -253,27 +255,14 @@ void VT_Dyn_attach()
 	shlibs_arg[strlen(shlibs_arg)-1] = '\0';
       }
 
-#ifdef BINDIR
-      if(access(BINDIR "/vtdyn", X_OK) == 0)
-      {
-        sprintf(cmd, "%s/vtdyn %s %s %s %s %s -p %i %s", BINDIR,
-		(vt_env_verbose() >= 2) ? "-v" : "",
-		blist ? "-b" : "", blist ? blist : "",
-		shlibs_arg ? "-s" : "", shlibs_arg ? shlibs_arg : "",
-		mutatee_pid,
-		mutatee_path ? mutatee_path : "");
-      }
-      else
-#endif
-      {
-	sprintf(cmd, "vtdyn %s %s %s %s %s -p %i %s",
-		(vt_env_verbose() >= 2) ? "-v" : "",
-		blist ? "-b" : "", blist ? blist : "",
-		shlibs_arg ? "-s" : "", shlibs_arg ? shlibs_arg : "",
-		mutatee_pid,
-		mutatee_path ? mutatee_path : "");
-      }
-      
+      sprintf(cmd, "%s/vtdyn %s %s %s %s %s -p %i %s",
+	      vt_installdirs_get(VT_INSTALLDIR_BINDIR),
+	      (vt_env_verbose() >= 2) ? "-v" : "",
+	      blist ? "-b" : "", blist ? blist : "",
+	      shlibs_arg ? "-s" : "", shlibs_arg ? shlibs_arg : "",
+	      mutatee_pid,
+	      mutatee_path ? mutatee_path : "");
+
       if ( shlibs_arg )
 	free(shlibs_arg);
 

ompi/contrib/vt/vt/vtlib/vt_iowrap.c

@@ -1613,6 +1613,9 @@ int lockf(int fd, int function, off_t size)
 #endif /* HAVE_LOCKF */
 
 
+/* MaJu: Temporary disabled the following wrapper function, due to a curious
+   behaviour on some platforms */
+#if 0
 int fcntl(int fd, int cmd, ...)
 {
 #define VT_IOWRAP_THISFUNCNAME fcntl
@@ -1691,3 +1694,5 @@ int fcntl(int fd, int cmd, ...)
         return ret;
 #undef VT_IOWRAP_THISFUNCNAME
 }
+#endif
+