glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify union bpf_attr field checks

Browse Source 
* configure.ac: Use AC_CHECK_MEMBERS instead of st_CHECK_UNION_BPF_ATTR
for union bpf_attr field checks as the former seems to be enough
for the case.
* m4/st_bpf.m4: Remove.
This commit is contained in:
Дмитрий Левин 2017-11-21 22:32:31 +00:00
parent 3a43ce3c07
commit 9df60f314d
2 changed files with 9 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@ -459,13 +459,15 @@ AC_CHECK_HEADERS([linux/input.h], [
])
AC_CHECK_HEADERS([linux/bpf.h], [
st_CHECK_UNION_BPF_ATTR([attach_flags])
st_CHECK_UNION_BPF_ATTR([bpf_fd])
st_CHECK_UNION_BPF_ATTR([flags])
st_CHECK_UNION_BPF_ATTR([next_id])
st_CHECK_UNION_BPF_ATTR([numa_node])
st_CHECK_UNION_BPF_ATTR([prog_flags])
AC_CHECK_MEMBERS([union bpf_attr.test.duration],,, [#include <linux/bpf.h>])
AC_CHECK_MEMBERS(m4_normalize([
union bpf_attr.attach_flags,
union bpf_attr.bpf_fd,
union bpf_attr.flags,
union bpf_attr.next_id,
union bpf_attr.numa_node,
union bpf_attr.prog_flags,
union bpf_attr.test.duration
]),,, [#include <linux/bpf.h>])
])
AC_CHECK_TYPES(m4_normalize([

50
m4/st_bpf.m4
View File

@ -1,50 +0,0 @@
#!/usr/bin/m4
#
# Copyright (c) 2015-2017 Dmitry V. Levin <ldv@altlinux.org>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# 3. The name of the author may not be used to endorse or promote products
# derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
AC_DEFUN([st_CHECK_UNION_BPF_ATTR],[
pushdef([ATTR_NAME], translit([$1], [a-z], [A-Z]))
pushdef([attr_text], [union bpf_attr.][$1])
pushdef([have_attr], [st_cv_member_union_bpf_attr_][$1])
AC_CACHE_CHECK([whether attr_text initialization works],
[have_attr],
[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([[#include <linux/bpf.h>]],
[union bpf_attr a = { .$1 = 0 };])],
[have_attr=yes],
[have_attr=no])])
if test $have_attr = yes; then
AC_DEFINE([HAVE_UNION_BPF_ATTR_]ATTR_NAME, [1],
[Define to 1 if attr_text initialization works])
fi
popdef([have_attr])
popdef([attr_text])
popdef([ATTR_NAME])
])