Bug 519574 - valgrind 3.27 "--fair-sched=yes" does not work

diff --git a/configure.ac b/configure.ac
index 39502a43ff41a87169bc078fe4109247b0248cea..049813c1e05a6ba16b7599fdfca1bbfbf3642ca4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5258,21 +5258,6 @@ AC_MSG_RESULT([no])
 ])
 CFLAGS="$save_CFLAGS"
 
-if test x$ac_have_usable_linux_futex_h = xyes \
-        -a x$ac_have_builtin_atomic_primary = xyes; then
-  ac_enable_linux_ticket_lock_primary=yes
-fi
-AM_CONDITIONAL([ENABLE_LINUX_TICKET_LOCK_PRIMARY],
-               [test x$ac_enable_linux_ticket_lock_primary = xyes])
-
-if test x$VGCONF_PLATFORM_SEC_CAPS != x \
-        -a x$ac_have_usable_linux_futex_h = xyes \
-        -a x$ac_have_builtin_atomic_secondary = xyes; then
-  ac_enable_linux_ticket_lock_secondary=yes
-fi
-AM_CONDITIONAL([ENABLE_LINUX_TICKET_LOCK_SECONDARY],
-               [test x$ac_enable_linux_ticket_lock_secondary = xyes])
-
 
 #----------------------------------------------------------------------------
 # Checks for typedefs, structures, and compiler characteristics.
@@ -5866,7 +5851,21 @@ fi
 AM_CONDITIONAL([HAVE_BUILTIN_ATOMIC64],
                [test x$ac_have_builtin_atomic64 = xyes])
 
-               
+if test x$ac_have_usable_linux_futex_h = xyes \
+        -a x$ac_have_builtin_atomic_primary = xyes; then
+  ac_enable_linux_ticket_lock_primary=yes
+fi
+AM_CONDITIONAL([ENABLE_LINUX_TICKET_LOCK_PRIMARY],
+               [test x$ac_enable_linux_ticket_lock_primary = xyes])
+
+if test x$VGCONF_PLATFORM_SEC_CAPS != x \
+        -a x$ac_have_usable_linux_futex_h = xyes \
+        -a x$ac_have_builtin_atomic_secondary = xyes; then
+  ac_enable_linux_ticket_lock_secondary=yes
+fi
+AM_CONDITIONAL([ENABLE_LINUX_TICKET_LOCK_SECONDARY],
+               [test x$ac_enable_linux_ticket_lock_secondary = xyes])
+
 AC_MSG_CHECKING([if platform has openat2 syscall])
 
 AC_LINK_IFELSE([AC_LANG_PROGRAM([[

diff --git a/helgrind/tests/Makefile.am b/helgrind/tests/Makefile.am
index 70381988a1022bc4eaef6f4d20e97c32fabb9409..bfdb3fff2fe20ca822ed2ed34a277d3bdb2ba168 100644 (file)
--- a/helgrind/tests/Makefile.am
+++ b/helgrind/tests/Makefile.am
@@ -18,6 +18,7 @@ EXTRA_DIST = \
        bug513598.vgtest \
        lock_destroy_report.vgtest lock_destroy_report.stderr.exp \
        annotate_hbefore.vgtest \
+       annotate_hbefore_fair_sched.vgtest \
        annotate_rwlock.vgtest annotate_rwlock.stderr.exp \
        annotate_smart_pointer.vgtest annotate_smart_pointer.stderr.exp \
        bug322621.vgtest bug322621.stderr.exp \

diff --git a/helgrind/tests/annotate_hbefore_fair_sched.vgtest b/helgrind/tests/annotate_hbefore_fair_sched.vgtest
new file mode 100644 (file)
index 0000000..9864513
--- /dev/null
+++ b/helgrind/tests/annotate_hbefore_fair_sched.vgtest
@@ -0,0 +1,3 @@
+prereq: ../../tests/os_test linux
+vgopts: -q --fair-sched=yes
+prog: annotate_hbefore