forked from luck/tmp_suning_uos_patched
16cab3226f
This reverts commit 60758d6668.
Now that libsubcmd makes sure that OPT_UINTEGER options will not
return negative values, we can revert this patch while addressing
the problem it solved:
# perf bench futex hash -t -4
# Running 'futex/hash' benchmark:
Error: switch `t' expects an unsigned numerical value
Usage: perf bench futex hash <options>
-t, --threads <n> Specify amount of threads
# perf bench futex hash -t-4
# Running 'futex/hash' benchmark:
Error: switch `t' expects an unsigned numerical value
Usage: perf bench futex hash <options>
-t, --threads <n> Specify amount of threads
#
IMO it is more reasonable to flat out refuse to process a negative
number than to silently turn it into an absolute value.
This also helps in silencing clang's complaint about asking for an
absolute value of an unsigned integer:
bench/futex-hash.c:133:10: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value]
nsecs = futexbench_sanitize_numeric(nsecs);
^
bench/futex.h:104:42: note: expanded from macro 'futexbench_sanitize_numeric'
#define futexbench_sanitize_numeric(__n) abs((__n))
^
bench/futex-hash.c:133:10: note: remove the call to 'abs' since unsigned values cannot be negative
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Davidlohr Bueso <dbueso@suse.de>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-2kl68v22or31vw643m2exz8x@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
103 lines
2.9 KiB
C
103 lines
2.9 KiB
C
/*
|
|
* Glibc independent futex library for testing kernel functionality.
|
|
* Shamelessly stolen from Darren Hart <dvhltc@us.ibm.com>
|
|
* http://git.kernel.org/cgit/linux/kernel/git/dvhart/futextest.git/
|
|
*/
|
|
|
|
#ifndef _FUTEX_H
|
|
#define _FUTEX_H
|
|
|
|
#include <unistd.h>
|
|
#include <sys/syscall.h>
|
|
#include <sys/types.h>
|
|
#include <linux/futex.h>
|
|
|
|
/**
|
|
* futex() - SYS_futex syscall wrapper
|
|
* @uaddr: address of first futex
|
|
* @op: futex op code
|
|
* @val: typically expected value of uaddr, but varies by op
|
|
* @timeout: typically an absolute struct timespec (except where noted
|
|
* otherwise). Overloaded by some ops
|
|
* @uaddr2: address of second futex for some ops\
|
|
* @val3: varies by op
|
|
* @opflags: flags to be bitwise OR'd with op, such as FUTEX_PRIVATE_FLAG
|
|
*
|
|
* futex() is used by all the following futex op wrappers. It can also be
|
|
* used for misuse and abuse testing. Generally, the specific op wrappers
|
|
* should be used instead. It is a macro instead of an static inline function as
|
|
* some of the types over overloaded (timeout is used for nr_requeue for
|
|
* example).
|
|
*
|
|
* These argument descriptions are the defaults for all
|
|
* like-named arguments in the following wrappers except where noted below.
|
|
*/
|
|
#define futex(uaddr, op, val, timeout, uaddr2, val3, opflags) \
|
|
syscall(SYS_futex, uaddr, op | opflags, val, timeout, uaddr2, val3)
|
|
|
|
/**
|
|
* futex_wait() - block on uaddr with optional timeout
|
|
* @timeout: relative timeout
|
|
*/
|
|
static inline int
|
|
futex_wait(u_int32_t *uaddr, u_int32_t val, struct timespec *timeout, int opflags)
|
|
{
|
|
return futex(uaddr, FUTEX_WAIT, val, timeout, NULL, 0, opflags);
|
|
}
|
|
|
|
/**
|
|
* futex_wake() - wake one or more tasks blocked on uaddr
|
|
* @nr_wake: wake up to this many tasks
|
|
*/
|
|
static inline int
|
|
futex_wake(u_int32_t *uaddr, int nr_wake, int opflags)
|
|
{
|
|
return futex(uaddr, FUTEX_WAKE, nr_wake, NULL, NULL, 0, opflags);
|
|
}
|
|
|
|
/**
|
|
* futex_lock_pi() - block on uaddr as a PI mutex
|
|
*/
|
|
static inline int
|
|
futex_lock_pi(u_int32_t *uaddr, struct timespec *timeout, int opflags)
|
|
{
|
|
return futex(uaddr, FUTEX_LOCK_PI, 0, timeout, NULL, 0, opflags);
|
|
}
|
|
|
|
/**
|
|
* futex_unlock_pi() - release uaddr as a PI mutex, waking the top waiter
|
|
*/
|
|
static inline int
|
|
futex_unlock_pi(u_int32_t *uaddr, int opflags)
|
|
{
|
|
return futex(uaddr, FUTEX_UNLOCK_PI, 0, NULL, NULL, 0, opflags);
|
|
}
|
|
|
|
/**
|
|
* futex_cmp_requeue() - requeue tasks from uaddr to uaddr2
|
|
* @nr_wake: wake up to this many tasks
|
|
* @nr_requeue: requeue up to this many tasks
|
|
*/
|
|
static inline int
|
|
futex_cmp_requeue(u_int32_t *uaddr, u_int32_t val, u_int32_t *uaddr2, int nr_wake,
|
|
int nr_requeue, int opflags)
|
|
{
|
|
return futex(uaddr, FUTEX_CMP_REQUEUE, nr_wake, nr_requeue, uaddr2,
|
|
val, opflags);
|
|
}
|
|
|
|
#ifndef HAVE_PTHREAD_ATTR_SETAFFINITY_NP
|
|
#include <pthread.h>
|
|
static inline int pthread_attr_setaffinity_np(pthread_attr_t *attr,
|
|
size_t cpusetsize,
|
|
cpu_set_t *cpuset)
|
|
{
|
|
attr = attr;
|
|
cpusetsize = cpusetsize;
|
|
cpuset = cpuset;
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
#endif /* _FUTEX_H */
|