proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-14 20:42:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4020 from brauner/2021-10-28.fixes

Browse Source 
build & mainloop: fixes
This commit is contained in:
Stéphane Graber 2021-10-28 14:01:46 -04:00 committed by GitHub
commit 7f71fbfd76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
meson.build
View File

@ -59,6 +59,7 @@ logpath = get_option('log-path')
lxcpathprefix = get_option('config-path')
rootfsmount = get_option('rootfs-mount-dir')
runtimepath = join_paths(prefixdir, get_option('runtime-path'))
wants_io_uring = get_option('io-uring-event-loop')
conf.set_quoted('BINDIR', bindir)
conf.set_quoted('DATADIR', datadir)
@ -279,6 +280,11 @@ foreach ident : [
conf.set10('HAVE_' + ident[0].to_upper(), have)
endforeach
if wants_io_uring == true
liburing = dependency('liburing')
conf.set10('HAVE_LIBURING', liburing.found())
endif
sh = find_program('sh')
git = find_program('git', required : false)
time_epoch = run_command(sh, '-c', 'echo "$SOURCE_DATE_EPOCH"').stdout().strip()
@ -383,6 +389,17 @@ subdir('src/include')
subdir('src/lxc/tools/include')
subdir('src/lxc')
liblxc_dependencies = [threads,
libseccomp,
libcap,
libopenssl,
libselinux,
libapparmor]
if wants_io_uring == true
liblxc_dependencies += [liburing]
endif
liblxc = shared_library(
'lxc',
version : liblxc_version,
@ -390,22 +407,12 @@ liblxc = shared_library(
link_args : ['-DPIC'],
c_args : ['-DPIC'],
link_whole : [liblxc_static],
dependencies : [threads,
libseccomp,
libcap,
libopenssl,
libselinux,
libapparmor],
dependencies: liblxc_dependencies,
install : true)
liblxc_dep = declare_dependency(
link_with: liblxc,
dependencies : [threads,
libseccomp,
libcap,
libopenssl,
libselinux,
libapparmor])
dependencies: liblxc_dependencies)
dummy_config_data = configuration_data()
dummy_config_data.set_quoted('DUMMY_VARIABLE', '1')
@ -541,7 +548,9 @@ foreach tuple : [
['SECCOMP'],
['SELinux'],
['libcap'],
['static libcap'],
['openssl'],
['liburing'],
]
if tuple.length() >= 2

3
meson_options.txt
View File

@ -36,3 +36,6 @@ option('user-network-conf', type : 'string', value : 'lxc/lxc-usernet',
option('user-network-db', type : 'string', value : 'lxc/nics',
description : 'user network database')
option('io-uring-event-loop', type : 'boolean', value: 'false',
description : 'enable io-uring based event loop')

6
src/lxc/mainloop.c
View File

@ -515,8 +515,10 @@ void lxc_mainloop_close(struct lxc_async_descr *descr)
if (descr->type == LXC_MAINLOOP_IO_URING) {
#if HAVE_LIBURING
io_uring_queue_exit(descr->ring);
munmap(descr->ring, sizeof(struct io_uring));
if (descr->ring) {
io_uring_queue_exit(descr->ring);
munmap(descr->ring, sizeof(struct io_uring));
}
#else
ERROR("Unsupported io_uring mainloop");
#endif

3
src/lxc/start.c
View File

@ -629,7 +629,8 @@ int lxc_poll(const char *name, struct lxc_handler *handler)
TRACE("Mainloop is ready");
ret = lxc_mainloop(&descr, -1);
close_prot_errno_disarm(descr.epfd);
if (descr.type == LXC_MAINLOOP_EPOLL)
close_prot_errno_disarm(descr.epfd);
if (ret < 0 || !handler->init_died)
goto out_mainloop_console;