eeded2044a
Let's try to enforce the convention where most drivers use a pmd. logtype with their class reflected in it, and libraries use a lib. logtype. Introduce two new macros: - RTE_LOG_REGISTER_DEFAULT can be used when a single logtype is used in a component. It is associated to the default name provided by the build system, - RTE_LOG_REGISTER_SUFFIX can be used when multiple logtypes are used, and then the passed name is appended to the default name, RTE_LOG_REGISTER is left untouched for existing external users and for components that do not comply with the convention. There is a new Meson variable log_prefix to adapt the default name for baseband (pmd.bb.), bus (no pmd.) and mempool (no pmd.) classes. Note: achieved with below commands + reverted change on net/bonding + edits on crypto/virtio, compress/mlx5, regex/mlx5 $ git grep -l RTE_LOG_REGISTER drivers/ | while read file; do pattern=${file##drivers/}; class=${pattern%%/*}; pattern=${pattern#$class/}; drv=${pattern%%/*}; case "$class" in baseband) pattern=pmd.bb.$drv;; bus) pattern=bus.$drv;; mempool) pattern=mempool.$drv;; *) pattern=pmd.$class.$drv;; esac sed -i -e 's/RTE_LOG_REGISTER(\(.*\), '$pattern',/RTE_LOG_REGISTER_DEFAULT(\1,/' $file; sed -i -e 's/RTE_LOG_REGISTER(\(.*\), '$pattern'\.\(.*\),/RTE_LOG_REGISTER_SUFFIX(\1, \2,/' $file; done $ git grep -l RTE_LOG_REGISTER lib/ | while read file; do pattern=${file##lib/}; pattern=lib.${pattern%%/*}; sed -i -e 's/RTE_LOG_REGISTER(\(.*\), '$pattern',/RTE_LOG_REGISTER_DEFAULT(\1,/' $file; sed -i -e 's/RTE_LOG_REGISTER(\(.*\), '$pattern'\.\(.*\),/RTE_LOG_REGISTER_SUFFIX(\1, \2,/' $file; done Signed-off-by: David Marchand <david.marchand@redhat.com> Signed-off-by: Thomas Monjalon <thomas@monjalon.net> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
268 lines
7.8 KiB
Meson
268 lines
7.8 KiB
Meson
# SPDX-License-Identifier: BSD-3-Clause
|
|
# Copyright(c) 2017-2019 Intel Corporation
|
|
|
|
|
|
# process all libraries equally, as far as possible
|
|
# "core" libs first, then others alphebetically as far as possible
|
|
# NOTE: for speed of meson runs, the dependencies in the subdirectories
|
|
# sometimes skip deps that would be implied by others, e.g. if mempool is
|
|
# given as a dep, no need to mention ring. This is especially true for the
|
|
# core libs which are widely reused, so their deps are kept to a minimum.
|
|
libraries = [
|
|
'kvargs', # eal depends on kvargs
|
|
'telemetry', # basic info querying
|
|
'eal', # everything depends on eal
|
|
'ring',
|
|
'rcu', # rcu depends on ring
|
|
'mempool',
|
|
'mbuf',
|
|
'net',
|
|
'meter',
|
|
'ethdev',
|
|
'pci', # core
|
|
'cmdline',
|
|
'metrics', # bitrate/latency stats depends on this
|
|
'hash', # efd depends on this
|
|
'timer', # eventdev depends on this
|
|
'acl',
|
|
'bbdev',
|
|
'bitratestats',
|
|
'cfgfile',
|
|
'compressdev',
|
|
'cryptodev',
|
|
'distributor',
|
|
'efd',
|
|
'eventdev',
|
|
'gro',
|
|
'gso',
|
|
'ip_frag',
|
|
'jobstats',
|
|
'kni',
|
|
'latencystats',
|
|
'lpm',
|
|
'member',
|
|
'power',
|
|
'pdump',
|
|
'rawdev',
|
|
'regexdev',
|
|
'rib',
|
|
'reorder',
|
|
'sched',
|
|
'security',
|
|
'stack',
|
|
'vhost',
|
|
'ipsec', # ipsec lib depends on net, crypto and security
|
|
'fib', #fib lib depends on rib
|
|
'port', # pkt framework libs which use other libs from above
|
|
'table',
|
|
'pipeline',
|
|
'flow_classify', # flow_classify lib depends on pkt framework table lib
|
|
'bpf',
|
|
'graph',
|
|
'node',
|
|
]
|
|
|
|
if is_windows
|
|
libraries = [
|
|
'kvargs',
|
|
'telemetry',
|
|
'eal',
|
|
'ring',
|
|
'rcu',
|
|
'mempool',
|
|
'mbuf',
|
|
'net',
|
|
'meter',
|
|
'ethdev',
|
|
'pci',
|
|
'cmdline',
|
|
'hash',
|
|
'cfgfile',
|
|
] # only supported libraries for windows
|
|
endif
|
|
|
|
optional_libs = [
|
|
'kni',
|
|
'power',
|
|
'vhost',
|
|
]
|
|
|
|
disabled_libs = []
|
|
opt_disabled_libs = run_command(list_dir_globs, get_option('disable_libs'),
|
|
check: true).stdout().split()
|
|
foreach l:opt_disabled_libs
|
|
if not optional_libs.contains(l)
|
|
warning('Cannot disable mandatory library "@0@"'.format(l))
|
|
continue
|
|
endif
|
|
disabled_libs += l
|
|
endforeach
|
|
|
|
|
|
default_cflags = machine_args
|
|
default_cflags += ['-DALLOW_EXPERIMENTAL_API']
|
|
default_cflags += ['-DALLOW_INTERNAL_API']
|
|
|
|
if cc.has_argument('-Wno-format-truncation')
|
|
default_cflags += '-Wno-format-truncation'
|
|
endif
|
|
|
|
enabled_libs = [] # used to print summary at the end
|
|
|
|
foreach l:libraries
|
|
build = true
|
|
reason = '<unknown reason>' # set if build == false to explain why
|
|
name = l
|
|
use_function_versioning = false
|
|
sources = []
|
|
headers = []
|
|
indirect_headers = [] # public headers not directly included by apps
|
|
driver_sdk_headers = [] # public headers included by drivers
|
|
includes = []
|
|
cflags = default_cflags
|
|
objs = [] # other object files to link against, used e.g. for
|
|
# instruction-set optimized versions of code
|
|
|
|
# use "deps" for internal DPDK dependencies, and "ext_deps" for
|
|
# external package/library requirements
|
|
ext_deps = []
|
|
deps = []
|
|
# eal is standard dependency once built
|
|
if dpdk_conf.has('RTE_LIB_EAL')
|
|
deps += ['eal']
|
|
endif
|
|
|
|
if disabled_libs.contains(l)
|
|
build = false
|
|
reason = 'explicitly disabled via build config'
|
|
else
|
|
subdir(l)
|
|
endif
|
|
if name != l
|
|
warning('Library name, "@0@", and directory name, "@1@", do not match'.format(name, l))
|
|
endif
|
|
|
|
if not build
|
|
dpdk_libs_disabled += name
|
|
set_variable(name.underscorify() + '_disable_reason', reason)
|
|
continue
|
|
endif
|
|
|
|
shared_deps = ext_deps
|
|
static_deps = ext_deps
|
|
foreach d:deps
|
|
if not is_variable('shared_rte_' + d)
|
|
error('Missing internal dependency "@0@" for @1@ [@2@]'
|
|
.format(d, name, 'lib/' + l))
|
|
endif
|
|
shared_deps += [get_variable('shared_rte_' + d)]
|
|
static_deps += [get_variable('static_rte_' + d)]
|
|
endforeach
|
|
|
|
enabled_libs += name
|
|
dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1)
|
|
install_headers(headers)
|
|
install_headers(indirect_headers)
|
|
if get_option('enable_driver_sdk')
|
|
install_headers(driver_sdk_headers)
|
|
endif
|
|
dpdk_chkinc_headers += headers
|
|
|
|
libname = 'rte_' + name
|
|
includes += include_directories(l)
|
|
|
|
if developer_mode and is_windows and use_function_versioning
|
|
message('@0@: Function versioning is not supported by Windows.'.format(name))
|
|
endif
|
|
|
|
if use_function_versioning
|
|
cflags += '-DRTE_USE_FUNCTION_VERSIONING'
|
|
endif
|
|
cflags += '-DRTE_LOG_DEFAULT_LOGTYPE=lib.' + l
|
|
|
|
# first build static lib
|
|
static_lib = static_library(libname,
|
|
sources,
|
|
objects: objs,
|
|
c_args: cflags,
|
|
dependencies: static_deps,
|
|
include_directories: includes,
|
|
install: true)
|
|
static_dep = declare_dependency(
|
|
include_directories: includes,
|
|
dependencies: static_deps)
|
|
|
|
if not use_function_versioning or is_windows
|
|
# use pre-build objects to build shared lib
|
|
sources = []
|
|
objs += static_lib.extract_all_objects(recursive: false)
|
|
else
|
|
# for compat we need to rebuild with
|
|
# RTE_BUILD_SHARED_LIB defined
|
|
cflags += '-DRTE_BUILD_SHARED_LIB'
|
|
endif
|
|
version_map = '@0@/@1@/version.map'.format(
|
|
meson.current_source_dir(), l)
|
|
implib = 'librte_' + l + '.dll.a'
|
|
|
|
def_file = custom_target(libname + '_def',
|
|
command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
|
|
input: version_map,
|
|
output: '@0@_exports.def'.format(libname))
|
|
|
|
mingw_map = custom_target(libname + '_mingw',
|
|
command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
|
|
input: version_map,
|
|
output: '@0@_mingw.map'.format(libname))
|
|
|
|
if is_ms_linker
|
|
lk_args = ['-Wl,/def:' + def_file.full_path()]
|
|
if meson.version().version_compare('<0.54.0')
|
|
lk_args += ['-Wl,/implib:lib\\' + implib]
|
|
endif
|
|
else
|
|
if is_windows
|
|
lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
|
|
else
|
|
lk_args = ['-Wl,--version-script=' + version_map]
|
|
endif
|
|
endif
|
|
|
|
lk_deps = [version_map, def_file, mingw_map]
|
|
if developer_mode and not is_windows
|
|
# on unix systems check the output of the
|
|
# check-symbols.sh script, using it as a
|
|
# dependency of the .so build
|
|
lk_deps += custom_target(name + '.sym_chk',
|
|
command: [check_symbols,
|
|
version_map, '@INPUT@'],
|
|
capture: true,
|
|
input: static_lib,
|
|
output: name + '.sym_chk')
|
|
endif
|
|
|
|
shared_lib = shared_library(libname,
|
|
sources,
|
|
objects: objs,
|
|
c_args: cflags,
|
|
dependencies: shared_deps,
|
|
include_directories: includes,
|
|
link_args: lk_args,
|
|
link_depends: lk_deps,
|
|
version: abi_version,
|
|
soversion: so_version,
|
|
install: true)
|
|
shared_dep = declare_dependency(link_with: shared_lib,
|
|
include_directories: includes,
|
|
dependencies: shared_deps)
|
|
|
|
dpdk_libraries = [shared_lib] + dpdk_libraries
|
|
dpdk_static_libraries = [static_lib] + dpdk_static_libraries
|
|
|
|
set_variable('shared_rte_' + name, shared_dep)
|
|
set_variable('static_rte_' + name, static_dep)
|
|
if developer_mode
|
|
message('lib/@0@: Defining dependency "@1@"'.format(l, name))
|
|
endif
|
|
endforeach
|