examples: reduce indentation in build files

As with the lib and drivers directories, we can use "continue" keyword to
reduce the indentation level of the majority of the foreach block. At the
same time, we can also replace tab indentation with spaces.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
Bruce Richardson 2021-04-20 11:22:22 +01:00 committed by Thomas Monjalon
parent 23bd8128d6
commit cf59165dcb
54 changed files with 283 additions and 234 deletions

View File

@ -9,5 +9,5 @@
deps += 'bbdev'
allow_experimental_apis = true
sources = files(
'main.c'
'main.c',
)

View File

@ -9,5 +9,5 @@
deps += 'net_bond'
allow_experimental_apis = true
sources = files(
'main.c'
'main.c',
)

View File

@ -8,5 +8,7 @@
allow_experimental_apis = true
sources = files(
'commands.c', 'main.c', 'parse_obj_list.c'
'commands.c',
'main.c',
'parse_obj_list.c',
)

View File

@ -9,11 +9,11 @@
# require the power library
build = dpdk_conf.has('RTE_LIB_POWER')
if not build
subdir_done()
subdir_done()
endif
allow_experimental_apis = true
deps += ['distributor', 'power']
sources = files(
'main.c'
'main.c',
)

View File

@ -8,17 +8,19 @@
build = is_linux
if not build
subdir_done()
subdir_done()
endif
sources = files('lib/rte_ethtool.c',
'ethtool-app/ethapp.c',
'ethtool-app/main.c')
sources = files(
'lib/rte_ethtool.c',
'ethtool-app/ethapp.c',
'ethtool-app/main.c',
)
includes = include_directories('lib', 'ethtool-app')
deps += 'bus_pci'
if dpdk_conf.has('RTE_NET_IXGBE')
deps += 'net_ixgbe'
deps += 'net_ixgbe'
endif
allow_experimental_apis = true

View File

@ -9,7 +9,7 @@
allow_experimental_apis = true
deps += 'eventdev'
sources = files(
'main.c',
'pipeline_worker_generic.c',
'pipeline_worker_tx.c'
'main.c',
'pipeline_worker_generic.c',
'pipeline_worker_tx.c',
)

View File

@ -9,15 +9,15 @@
deps += ['cryptodev']
allow_experimental_apis = true
sources = files(
'fips_validation_aes.c',
'fips_validation.c',
'fips_validation_hmac.c',
'fips_validation_tdes.c',
'fips_validation_gcm.c',
'fips_validation_cmac.c',
'fips_validation_ccm.c',
'fips_validation_sha.c',
'fips_validation_xts.c',
'fips_dev_self_test.c',
'main.c'
'fips_validation_aes.c',
'fips_validation.c',
'fips_validation_hmac.c',
'fips_validation_tdes.c',
'fips_validation_gcm.c',
'fips_validation_cmac.c',
'fips_validation_ccm.c',
'fips_validation_sha.c',
'fips_validation_xts.c',
'fips_dev_self_test.c',
'main.c',
)

View File

@ -9,5 +9,5 @@
deps += 'flow_classify'
allow_experimental_apis = true
sources = files(
'flow_classify.c'
'flow_classify.c',
)

View File

@ -8,5 +8,5 @@
allow_experimental_apis = true
sources = files(
'main.c',
'main.c',
)

View File

@ -8,5 +8,5 @@
allow_experimental_apis = true
sources = files(
'main.c'
'main.c',
)

View File

@ -9,11 +9,11 @@
allow_experimental_apis = true
build = dpdk_conf.has('RTE_RAW_IOAT')
if not build
subdir_done()
subdir_done()
endif
deps += ['raw_ioat']
sources = files(
'ioatfwd.c'
'ioatfwd.c',
)

View File

@ -9,5 +9,5 @@
allow_experimental_apis = true
deps += ['ip_frag', 'lpm']
sources = files(
'main.c'
'main.c',
)

View File

@ -8,24 +8,24 @@
build = cc.has_header('sys/epoll.h')
if not build
subdir_done()
subdir_done()
endif
deps += ['pipeline', 'bus_pci']
allow_experimental_apis = true
sources = files(
'action.c',
'cli.c',
'conn.c',
'kni.c',
'link.c',
'main.c',
'mempool.c',
'parser.c',
'pipeline.c',
'swq.c',
'tap.c',
'thread.c',
'tmgr.c',
'cryptodev.c'
'action.c',
'cli.c',
'conn.c',
'cryptodev.c',
'kni.c',
'link.c',
'main.c',
'mempool.c',
'parser.c',
'pipeline.c',
'swq.c',
'tap.c',
'thread.c',
'tmgr.c',
)

View File

@ -9,5 +9,5 @@
allow_experimental_apis = true
deps += ['lpm', 'ip_frag']
sources = files(
'main.c'
'main.c',
)

View File

@ -9,17 +9,17 @@
deps += ['security', 'lpm', 'acl', 'hash', 'ip_frag', 'ipsec', 'eventdev']
allow_experimental_apis = true
sources = files(
'esp.c',
'event_helper.c',
'flow.c',
'ipsec.c',
'ipsec_process.c',
'ipsec-secgw.c',
'ipsec_worker.c',
'parser.c',
'rt.c',
'sa.c',
'sad.c',
'sp4.c',
'sp6.c'
'esp.c',
'event_helper.c',
'flow.c',
'ipsec.c',
'ipsec_process.c',
'ipsec-secgw.c',
'ipsec_worker.c',
'parser.c',
'rt.c',
'sa.c',
'sad.c',
'sp4.c',
'sp6.c',
)

View File

@ -9,5 +9,5 @@
allow_experimental_apis = true
deps += 'hash'
sources = files(
'main.c'
'main.c',
)

View File

@ -9,11 +9,11 @@
# this app can be built if-and-only-if KNI library is buildable
build = dpdk_conf.has('RTE_LIB_KNI')
if not build
subdir_done()
subdir_done()
endif
deps += ['kni', 'bus_pci']
sources = files(
'main.c'
'main.c',
)
allow_experimental_apis = true

View File

@ -9,12 +9,13 @@
pqos = cc.find_library('pqos', required: false)
build = pqos.found()
if not build
subdir_done()
subdir_done()
endif
ext_deps += pqos
allow_experimental_apis = true
cflags += '-I/usr/local/include' # assume pqos lib installed in /usr/local
sources = files(
'cat.c', 'l2fwd-cat.c'
'cat.c',
'l2fwd-cat.c',
)

View File

@ -8,9 +8,9 @@
deps += 'cryptodev'
if dpdk_conf.has('RTE_CRYPTO_SCHEDULER')
deps += 'crypto_scheduler'
deps += 'crypto_scheduler'
endif
allow_experimental_apis = true
sources = files(
'main.c'
'main.c',
)

View File

@ -10,10 +10,10 @@
allow_experimental_apis = true
deps += 'eventdev'
sources = files(
'main.c',
'l2fwd_poll.c',
'l2fwd_common.c',
'l2fwd_event.c',
'l2fwd_event_internal_port.c',
'l2fwd_event_generic.c'
'main.c',
'l2fwd_common.c',
'l2fwd_event.c',
'l2fwd_event_generic.c',
'l2fwd_event_internal_port.c',
'l2fwd_poll.c',
)

View File

@ -9,5 +9,5 @@
allow_experimental_apis = true
deps += ['jobstats', 'timer']
sources = files(
'main.c'
'main.c',
)

View File

@ -9,12 +9,13 @@
allow_experimental_apis = true
librt = cc.find_library('rt', required: false)
if not librt.found()
build = false
subdir_done()
build = false
subdir_done()
endif
ext_deps += librt
deps += 'timer'
sources = files(
'main.c', 'shm.c'
'main.c',
'shm.c',
)

View File

@ -9,5 +9,5 @@
# Enable experimental API flag as l2fwd uses rte_ethdev_set_ptype API
allow_experimental_apis = true
sources = files(
'main.c'
'main.c',
)

View File

@ -9,5 +9,5 @@
allow_experimental_apis = true
deps += ['acl', 'lpm', 'hash']
sources = files(
'main.c'
'main.c',
)

View File

@ -8,6 +8,6 @@
deps += ['graph', 'eal', 'lpm', 'ethdev', 'node' ]
sources = files(
'main.c'
'main.c',
)
allow_experimental_apis = true

View File

@ -14,5 +14,6 @@ endif
allow_experimental_apis = true
deps += ['power', 'timer', 'lpm', 'hash', 'metrics', 'telemetry']
sources = files(
'main.c', 'perf_core.c'
'main.c',
'perf_core.c',
)

View File

@ -9,6 +9,11 @@
allow_experimental_apis = true
deps += ['hash', 'lpm', 'fib', 'eventdev']
sources = files(
'l3fwd_em.c', 'l3fwd_lpm.c', 'l3fwd_fib.c', 'l3fwd_event.c',
'l3fwd_event_internal_port.c', 'l3fwd_event_generic.c', 'main.c'
'l3fwd_em.c',
'l3fwd_event.c',
'l3fwd_event_internal_port.c',
'l3fwd_event_generic.c',
'l3fwd_fib.c',
'l3fwd_lpm.c',
'main.c',
)

View File

@ -8,5 +8,5 @@
allow_experimental_apis = true
sources = files(
'main.c'
'main.c',
)

View File

@ -3,109 +3,130 @@
link_whole_libs = []
if get_option('default_library') == 'static'
link_whole_libs = dpdk_static_libraries + dpdk_drivers
link_whole_libs = dpdk_static_libraries + dpdk_drivers
endif
# list of all example apps. Keep 1-3 per line, in alphabetical order.
all_examples = [
'bbdev_app', 'bond',
'cmdline',
'distributor', 'ethtool',
'eventdev_pipeline',
'fips_validation', 'flow_classify',
'flow_filtering', 'helloworld',
'ioat',
'ip_fragmentation', 'ip_pipeline',
'ip_reassembly', 'ipsec-secgw',
'ipv4_multicast', 'kni',
'l2fwd', 'l2fwd-cat', 'l2fwd-event',
'l2fwd-crypto', 'l2fwd-jobstats',
'l2fwd-keepalive', 'l3fwd',
'l3fwd-acl', 'l3fwd-power', 'l3fwd-graph',
'link_status_interrupt',
'multi_process/client_server_mp/mp_client',
'multi_process/client_server_mp/mp_server',
'multi_process/hotplug_mp',
'multi_process/simple_mp',
'multi_process/symmetric_mp',
'ntb', 'packet_ordering',
'performance-thread/l3fwd-thread',
'performance-thread/pthread_shim',
'pipeline',
'ptpclient',
'qos_meter', 'qos_sched',
'rxtx_callbacks',
'server_node_efd/node',
'server_node_efd/server',
'service_cores',
'skeleton',
'timer', 'vdpa',
'vhost', 'vhost_crypto',
'vhost_blk', 'vm_power_manager',
'vm_power_manager/guest_cli',
'vmdq', 'vmdq_dcb',
'bbdev_app',
'bond',
'cmdline',
'distributor',
'ethtool',
'eventdev_pipeline',
'fips_validation',
'flow_classify',
'flow_filtering',
'helloworld',
'ioat',
'ip_fragmentation',
'ip_pipeline',
'ip_reassembly',
'ipsec-secgw',
'ipv4_multicast',
'kni',
'l2fwd',
'l2fwd-cat',
'l2fwd-crypto',
'l2fwd-event',
'l2fwd-jobstats',
'l2fwd-keepalive',
'l3fwd',
'l3fwd-acl',
'l3fwd-graph',
'l3fwd-power',
'link_status_interrupt',
'multi_process/client_server_mp/mp_client',
'multi_process/client_server_mp/mp_server',
'multi_process/hotplug_mp',
'multi_process/simple_mp',
'multi_process/symmetric_mp',
'ntb',
'packet_ordering',
'performance-thread/l3fwd-thread',
'performance-thread/pthread_shim',
'pipeline',
'ptpclient',
'qos_meter',
'qos_sched',
'rxtx_callbacks',
'server_node_efd/node',
'server_node_efd/server',
'service_cores',
'skeleton',
'timer',
'vdpa',
'vhost',
'vhost_blk',
'vhost_crypto',
'vm_power_manager',
'vm_power_manager/guest_cli',
'vmdq',
'vmdq_dcb',
]
# on install, skip copying all meson.build files
ex_file_excludes = ['meson.build']
foreach ex:all_examples
ex_file_excludes += [ex + '/meson.build']
ex_file_excludes += [ex + '/meson.build']
endforeach
if get_option('examples') == ''
subdir_done()
subdir_done()
endif
if get_option('examples').to_lower() == 'all'
examples = all_examples
allow_skips = true # don't flag an error if we can't build an app
examples = all_examples
allow_skips = true # don't flag an error if we can't build an app
else
examples = get_option('examples').split(',')
allow_skips = false # error out if we can't build a requested app
examples = get_option('examples').split(',')
allow_skips = false # error out if we can't build a requested app
endif
default_cflags = machine_args
if cc.has_argument('-Wno-format-truncation')
default_cflags += '-Wno-format-truncation'
default_cflags += '-Wno-format-truncation'
endif
default_ldflags = dpdk_extra_ldflags
if get_option('default_library') == 'static' and not is_windows
default_ldflags += ['-Wl,--export-dynamic']
default_ldflags += ['-Wl,--export-dynamic']
endif
foreach example: examples
name = example.split('/')[-1]
build = true
sources = []
allow_experimental_apis = false
cflags = default_cflags
ldflags = default_ldflags
name = example.split('/')[-1]
build = true
sources = []
allow_experimental_apis = false
cflags = default_cflags
ldflags = default_ldflags
ext_deps = []
includes = [include_directories(example)]
deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline']
subdir(example)
ext_deps = []
includes = [include_directories(example)]
deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline']
subdir(example)
if build
dep_objs = ext_deps
foreach d:deps
var_name = get_option('default_library') + '_rte_' + d
if not is_variable(var_name)
error('Missing dependency "@0@" for example "@1@"'.format(d, name))
endif
dep_objs += [get_variable(var_name)]
endforeach
if allow_experimental_apis
cflags += '-DALLOW_EXPERIMENTAL_API'
endif
executable('dpdk-' + name, sources,
include_directories: includes,
link_whole: link_whole_libs,
link_args: ldflags,
c_args: cflags,
dependencies: dep_objs)
elif not allow_skips
error('Cannot build requested example "' + name + '"')
else
message('Skipping example "' + name + '"')
endif
if not build
if not allow_skips
error('Cannot build requested example "' + name + '"')
endif
message('Skipping example "' + name + '"')
continue
endif
dep_objs = ext_deps
foreach d:deps
var_name = get_option('default_library') + '_rte_' + d
if not is_variable(var_name)
error('Missing dependency "@0@" for example "@1@"'.format(d, name))
endif
dep_objs += [get_variable(var_name)]
endforeach
if allow_experimental_apis
cflags += '-DALLOW_EXPERIMENTAL_API'
endif
executable('dpdk-' + name, sources,
include_directories: includes,
link_whole: link_whole_libs,
link_args: ldflags,
c_args: cflags,
dependencies: dep_objs)
endforeach

View File

@ -10,5 +10,5 @@ includes += include_directories('../shared')
allow_experimental_apis = true
sources = files(
'client.c'
'client.c'
)

View File

@ -10,5 +10,5 @@ includes += include_directories('../shared')
allow_experimental_apis = true
sources = files(
'args.c', 'init.c', 'main.c'
'args.c', 'init.c', 'main.c'
)

View File

@ -8,5 +8,5 @@
allow_experimental_apis = true
sources = files(
'commands.c', 'main.c'
'commands.c', 'main.c'
)

View File

@ -8,5 +8,5 @@
allow_experimental_apis = true
sources = files(
'mp_commands.c', 'main.c'
'mp_commands.c', 'main.c'
)

View File

@ -8,5 +8,5 @@
allow_experimental_apis = true
sources = files(
'main.c'
'main.c'
)

View File

@ -8,15 +8,15 @@
allow_experimental_apis = true
if not is_linux
build = false
subdir_done()
build = false
subdir_done()
endif
deps += 'rawdev'
cflags += ['-D_FILE_OFFSET_BITS=64']
sources = files(
'ntb_fwd.c'
'ntb_fwd.c',
)
if dpdk_conf.has('RTE_RAW_NTB')
deps += 'raw_ntb'
deps += 'raw_ntb'
endif

View File

@ -9,5 +9,5 @@
allow_experimental_apis = true
deps += 'reorder'
sources = files(
'main.c'
'main.c',
)

View File

@ -8,7 +8,7 @@
build = dpdk_conf.has('RTE_ARCH_X86_64')
if not build
subdir_done()
subdir_done()
endif
deps += ['timer', 'lpm']
@ -16,17 +16,17 @@ allow_experimental_apis = true
# get the performance thread (pt) architecture subdir
if dpdk_conf.has('RTE_ARCH_ARM64')
pt_arch_dir = '../common/arch/arm64'
pt_arch_dir = '../common/arch/arm64'
else
pt_arch_dir = '../common/arch/x86'
pt_arch_dir = '../common/arch/x86'
endif
sources += files('main.c',
'../common/lthread.c',
'../common/lthread_cond.c',
'../common/lthread_diag.c',
'../common/lthread_mutex.c',
'../common/lthread_sched.c',
'../common/lthread_tls.c',
pt_arch_dir + '/ctx.c')
'../common/lthread.c',
'../common/lthread_cond.c',
'../common/lthread_diag.c',
'../common/lthread_mutex.c',
'../common/lthread_sched.c',
'../common/lthread_tls.c',
pt_arch_dir + '/ctx.c')
includes += include_directories('../common', pt_arch_dir)

View File

@ -8,7 +8,7 @@
build = dpdk_conf.has('RTE_ARCH_X86_64') or dpdk_conf.has('RTE_ARCH_ARM64')
if not build
subdir_done()
subdir_done()
endif
deps += ['timer']
@ -16,18 +16,18 @@ allow_experimental_apis = true
# get the performance thread (pt) architecture subdir
if dpdk_conf.has('RTE_ARCH_ARM64')
pt_arch_dir = '../common/arch/arm64'
pt_arch_dir = '../common/arch/arm64'
else
pt_arch_dir = '../common/arch/x86'
pt_arch_dir = '../common/arch/x86'
endif
sources += files('main.c',
'pthread_shim.c',
'../common/lthread.c',
'../common/lthread_cond.c',
'../common/lthread_diag.c',
'../common/lthread_mutex.c',
'../common/lthread_sched.c',
'../common/lthread_tls.c',
pt_arch_dir + '/ctx.c')
'pthread_shim.c',
'../common/lthread.c',
'../common/lthread_cond.c',
'../common/lthread_diag.c',
'../common/lthread_mutex.c',
'../common/lthread_sched.c',
'../common/lthread_tls.c',
pt_arch_dir + '/ctx.c')
includes += include_directories('../common', pt_arch_dir)

View File

@ -8,15 +8,15 @@
build = cc.has_header('sys/epoll.h')
if not build
subdir_done()
subdir_done()
endif
deps += ['pipeline', 'bus_pci']
allow_experimental_apis = true
sources = files(
'cli.c',
'conn.c',
'main.c',
'obj.c',
'thread.c',
'cli.c',
'conn.c',
'main.c',
'obj.c',
'thread.c',
)

View File

@ -8,5 +8,5 @@
allow_experimental_apis = true
sources = files(
'ptpclient.c'
'ptpclient.c',
)

View File

@ -9,5 +9,6 @@
allow_experimental_apis = true
deps += 'meter'
sources = files(
'main.c', 'rte_policer.c'
'main.c',
'rte_policer.c',
)

View File

@ -9,6 +9,11 @@
allow_experimental_apis = true
deps += ['sched', 'cfgfile']
sources = files(
'app_thread.c', 'args.c', 'cfg_file.c', 'cmdline.c',
'init.c', 'main.c', 'stats.c'
'app_thread.c',
'args.c',
'cfg_file.c',
'cmdline.c',
'init.c',
'main.c',
'stats.c',
)

View File

@ -10,5 +10,5 @@
allow_experimental_apis = true
sources = files(
'main.c'
'main.c',
)

View File

@ -8,5 +8,5 @@
allow_experimental_apis = true
sources = files(
'main.c'
'main.c',
)

View File

@ -8,5 +8,5 @@
allow_experimental_apis = true
sources = files(
'basicfwd.c'
'basicfwd.c',
)

View File

@ -9,5 +9,5 @@
allow_experimental_apis = true
deps += 'timer'
sources = files(
'main.c'
'main.c',
)

View File

@ -7,12 +7,12 @@
# DPDK instance, use 'make'
if not is_linux
build = false
subdir_done()
build = false
subdir_done()
endif
deps += 'vhost'
allow_experimental_apis = true
sources = files(
'main.c'
'main.c',
)

View File

@ -7,17 +7,18 @@
# DPDK instance, use 'make'
if not is_linux
build = false
subdir_done()
build = false
subdir_done()
endif
deps += 'vhost'
allow_experimental_apis = true
sources = files(
'main.c', 'virtio_net.c'
'main.c',
'virtio_net.c',
)
if dpdk_conf.has('RTE_RAW_IOAT')
deps += 'raw_ioat'
sources += files('ioat.c')
deps += 'raw_ioat'
sources += files('ioat.c')
endif

View File

@ -7,17 +7,19 @@
# DPDK instance, use 'make'
if not is_linux
build = false
subdir_done()
build = false
subdir_done()
endif
if not cc.has_header('linux/virtio_blk.h')
build = false
subdir_done()
build = false
subdir_done()
endif
deps += 'vhost'
allow_experimental_apis = true
sources = files(
'blk.c', 'vhost_blk.c', 'vhost_blk_compat.c'
'blk.c',
'vhost_blk.c',
'vhost_blk_compat.c',
)

View File

@ -8,11 +8,11 @@
build = dpdk_conf.has('RTE_LIB_VHOST')
if not build
subdir_done()
subdir_done()
endif
allow_experimental_apis = true
deps += ['vhost', 'cryptodev']
sources = files(
'main.c'
'main.c',
)

View File

@ -14,7 +14,9 @@ endif
deps += ['power']
sources = files(
'main.c', 'parse.c', 'vm_power_cli_guest.c'
'main.c',
'parse.c',
'vm_power_cli_guest.c',
)
allow_experimental_apis = true

View File

@ -7,34 +7,39 @@
# DPDK instance, use 'make'
if not dpdk_conf.has('RTE_LIB_POWER')
build = false
subdir_done()
build = false
subdir_done()
endif
deps += ['power']
if dpdk_conf.has('RTE_NET_BNXT')
deps += ['net_bnxt']
deps += ['net_bnxt']
endif
if dpdk_conf.has('RTE_NET_I40E')
deps += ['net_i40e']
deps += ['net_i40e']
endif
if dpdk_conf.has('RTE_NET_IXGBE')
deps += ['net_ixgbe']
deps += ['net_ixgbe']
endif
allow_experimental_apis = true
sources = files(
'channel_manager.c', 'channel_monitor.c', 'main.c', 'parse.c', 'power_manager.c', 'vm_power_cli.c'
'channel_manager.c',
'channel_monitor.c',
'main.c',
'parse.c',
'power_manager.c',
'vm_power_cli.c',
)
# If we're on X86, pull in the x86 code for the branch monitor algo.
if dpdk_conf.has('RTE_ARCH_X86_64')
sources += files('oob_monitor_x86.c')
sources += files('oob_monitor_x86.c')
else
sources += files('oob_monitor_nop.c')
sources += files('oob_monitor_nop.c')
endif
opt_dep = cc.find_library('virt', required : false)
@ -43,6 +48,6 @@ ext_deps += opt_dep
opt_dep = dependency('jansson', required : false, method: 'pkg-config')
if opt_dep.found()
ext_deps += opt_dep
cflags += '-DUSE_JANSSON'
ext_deps += opt_dep
cflags += '-DUSE_JANSSON'
endif

View File

@ -8,5 +8,5 @@
allow_experimental_apis = true
sources = files(
'main.c'
'main.c',
)

View File

@ -8,5 +8,5 @@
allow_experimental_apis = true
sources = files(
'main.c'
'main.c',
)