added VC_BE_VALGRIND_FRIENDLY support
[util-vserver.git] / util-vserver / lib / getctx.c
index 20b687c..c47bf28 100644 (file)
@@ -19,9 +19,6 @@
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
-#include "compat.h"
-#include "vserver.h"
-#include "vserver-internal.h"
 
 #ifdef VC_ENABLE_API_COMPAT
 #  include "getctx-compat.hc"
 #  include "getctx-legacy.hc"
 #endif
 
+#include "vserver.h"
+#include "vserver-internal.h"
+#include "internal.h"
+
 #include <sys/types.h>
 
-ctx_t
+xid_t
 vc_X_getctx(pid_t pid)
 {
-  CALL_VC(CALL_VC_COMPAT(vc_X_getctx, pid),
-         CALL_VC_LEGACY(vc_X_getctx, pid));
+#ifndef NDEBUG
+  if (!getenv("VC_BE_VALGRIND_FRIENDLY"))
+#endif
+    CALL_VC(CALL_VC_COMPAT(vc_X_getctx, pid),
+           CALL_VC_LEGACY(vc_X_getctx, pid));
+#ifndef NDEBUG
+  else
+    return vc_X_getctx_legacy(pid);
+#endif
 }