mirror of
https://git.proxmox.com/git/mirror_lxc
synced 2025-08-17 23:59:33 +00:00
macro: add new macro header
This allows us to use a bunch of macros in our static build for init.lxc.static
without having to link against all of utils.{c,h}.
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
This commit is contained in:
Christian Brauner
parent
09ef5d954f
commit
279c45eed3
@ -16,6 +16,7 @@ noinst_HEADERS = attach.h \
|
|||||||
log.h \
|
log.h \
|
||||||
lxc.h \
|
lxc.h \
|
||||||
lxclock.h \
|
lxclock.h \
|
||||||
|
macro.h \
|
||||||
monitor.h \
|
monitor.h \
|
||||||
namespace.h \
|
namespace.h \
|
||||||
start.h \
|
start.h \
|
||||||
@ -99,6 +100,7 @@ liblxc_la_SOURCES = af_unix.c af_unix.h \
|
|||||||
lxccontainer.c lxccontainer.h \
|
lxccontainer.c lxccontainer.h \
|
||||||
lxclock.c lxclock.h \
|
lxclock.c lxclock.h \
|
||||||
lxcseccomp.h \
|
lxcseccomp.h \
|
||||||
|
macro.h \
|
||||||
mainloop.c mainloop.h \
|
mainloop.c mainloop.h \
|
||||||
namespace.c namespace.h \
|
namespace.c namespace.h \
|
||||||
nl.c nl.h \
|
nl.c nl.h \
|
||||||
@ -342,6 +344,7 @@ init_lxc_static_SOURCES = cmd/lxc_init.c \
|
|||||||
error.c error.h \
|
error.c error.h \
|
||||||
initutils.c initutils.h \
|
initutils.c initutils.h \
|
||||||
log.c log.h \
|
log.c log.h \
|
||||||
|
macro.h \
|
||||||
namespace.c namespace.h \
|
namespace.c namespace.h \
|
||||||
parse.c parse.h
|
parse.c parse.h
|
||||||
|
|
||||||
|
|||||||
139
src/lxc/macro.h
Normal file
139
src/lxc/macro.h
Normal file
@ -0,0 +1,139 @@
|
|||||||
|
/* liblxcapi
|
||||||
|
*
|
||||||
|
* Copyright © 2018 Christian Brauner <christian.brauner@ubuntu.com>.
|
||||||
|
* Copyright © 2018 Canonical Ltd.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License version 2, as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License along
|
||||||
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef __LXC_MACRO_H
|
||||||
|
#define __LXC_MACRO_H
|
||||||
|
|
||||||
|
/* Define __S_ISTYPE if missing from the C library. */
|
||||||
|
#ifndef __S_ISTYPE
|
||||||
|
#define __S_ISTYPE(mode, mask) (((mode)&S_IFMT) == (mask))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if HAVE_LIBCAP
|
||||||
|
#ifndef CAP_SETFCAP
|
||||||
|
#define CAP_SETFCAP 31
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef CAP_MAC_OVERRIDE
|
||||||
|
#define CAP_MAC_OVERRIDE 32
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef CAP_MAC_ADMIN
|
||||||
|
#define CAP_MAC_ADMIN 33
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef PR_CAPBSET_DROP
|
||||||
|
#define PR_CAPBSET_DROP 24
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef LO_FLAGS_AUTOCLEAR
|
||||||
|
#define LO_FLAGS_AUTOCLEAR 4
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef CAP_SETUID
|
||||||
|
#define CAP_SETUID 7
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef CAP_SETGID
|
||||||
|
#define CAP_SETGID 6
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* needed for cgroup automount checks, regardless of whether we
|
||||||
|
* have included linux/capability.h or not */
|
||||||
|
#ifndef CAP_SYS_ADMIN
|
||||||
|
#define CAP_SYS_ADMIN 21
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef CGROUP_SUPER_MAGIC
|
||||||
|
#define CGROUP_SUPER_MAGIC 0x27e0eb
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef CGROUP2_SUPER_MAGIC
|
||||||
|
#define CGROUP2_SUPER_MAGIC 0x63677270
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Useful macros */
|
||||||
|
/* Maximum number for 64 bit integer is a string with 21 digits: 2^64 - 1 = 21 */
|
||||||
|
#define LXC_NUMSTRLEN64 21
|
||||||
|
#define LXC_LINELEN 4096
|
||||||
|
#define LXC_IDMAPLEN 4096
|
||||||
|
#define LXC_MAX_BUFFER 4096
|
||||||
|
/* /proc/ = 6
|
||||||
|
* +
|
||||||
|
* <pid-as-str> = LXC_NUMSTRLEN64
|
||||||
|
* +
|
||||||
|
* /fd/ = 4
|
||||||
|
* +
|
||||||
|
* <fd-as-str> = LXC_NUMSTRLEN64
|
||||||
|
* +
|
||||||
|
* \0 = 1
|
||||||
|
*/
|
||||||
|
#define LXC_PROC_PID_FD_LEN (6 + LXC_NUMSTRLEN64 + 4 + LXC_NUMSTRLEN64 + 1)
|
||||||
|
|
||||||
|
/* loop devices */
|
||||||
|
#ifndef LO_FLAGS_AUTOCLEAR
|
||||||
|
#define LO_FLAGS_AUTOCLEAR 4
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef LOOP_CTL_GET_FREE
|
||||||
|
#define LOOP_CTL_GET_FREE 0x4C82
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* memfd_create() */
|
||||||
|
#ifndef MFD_CLOEXEC
|
||||||
|
#define MFD_CLOEXEC 0x0001U
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef MFD_ALLOW_SEALING
|
||||||
|
#define MFD_ALLOW_SEALING 0x0002U
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/**
|
||||||
|
* BUILD_BUG_ON - break compile if a condition is true.
|
||||||
|
* @condition: the condition which the compiler should know is false.
|
||||||
|
*
|
||||||
|
* If you have some code which relies on certain constants being equal, or
|
||||||
|
* other compile-time-evaluated condition, you should use BUILD_BUG_ON to
|
||||||
|
* detect if someone changes it.
|
||||||
|
*
|
||||||
|
* The implementation uses gcc's reluctance to create a negative array, but
|
||||||
|
* gcc (as of 4.4) only emits that error for obvious cases (eg. not arguments
|
||||||
|
* to inline functions). So as a fallback we use the optimizer; if it can't
|
||||||
|
* prove the condition is false, it will cause a link error on the undefined
|
||||||
|
* "__build_bug_on_failed". This error message can be harder to track down
|
||||||
|
* though, hence the two different methods.
|
||||||
|
*/
|
||||||
|
#ifndef __OPTIMIZE__
|
||||||
|
#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
|
||||||
|
#else
|
||||||
|
extern int __build_bug_on_failed;
|
||||||
|
#define BUILD_BUG_ON(condition) \
|
||||||
|
do { \
|
||||||
|
((void)sizeof(char[1 - 2*!!(condition)])); \
|
||||||
|
if (condition) __build_bug_on_failed = 1; \
|
||||||
|
} while(0)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define lxc_iterate_parts(__iterator, __splitme, __separators) \
|
||||||
|
for (char *__p = NULL, *__it = strtok_r(__splitme, __separators, &__p); \
|
||||||
|
(__iterator = __it); \
|
||||||
|
__iterator = __it = strtok_r(NULL, __separators, &__p))
|
||||||
|
|
||||||
|
#endif /* __LXC_MACRO_H */
|
||||||
117
src/lxc/utils.h
117
src/lxc/utils.h
@ -45,73 +45,7 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "initutils.h"
|
#include "initutils.h"
|
||||||
|
#include "macro.h"
|
||||||
/* Define __S_ISTYPE if missing from the C library. */
|
|
||||||
#ifndef __S_ISTYPE
|
|
||||||
#define __S_ISTYPE(mode, mask) (((mode)&S_IFMT) == (mask))
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if HAVE_LIBCAP
|
|
||||||
#ifndef CAP_SETFCAP
|
|
||||||
#define CAP_SETFCAP 31
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef CAP_MAC_OVERRIDE
|
|
||||||
#define CAP_MAC_OVERRIDE 32
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef CAP_MAC_ADMIN
|
|
||||||
#define CAP_MAC_ADMIN 33
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef PR_CAPBSET_DROP
|
|
||||||
#define PR_CAPBSET_DROP 24
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef LO_FLAGS_AUTOCLEAR
|
|
||||||
#define LO_FLAGS_AUTOCLEAR 4
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef CAP_SETUID
|
|
||||||
#define CAP_SETUID 7
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef CAP_SETGID
|
|
||||||
#define CAP_SETGID 6
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* needed for cgroup automount checks, regardless of whether we
|
|
||||||
* have included linux/capability.h or not */
|
|
||||||
#ifndef CAP_SYS_ADMIN
|
|
||||||
#define CAP_SYS_ADMIN 21
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef CGROUP_SUPER_MAGIC
|
|
||||||
#define CGROUP_SUPER_MAGIC 0x27e0eb
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef CGROUP2_SUPER_MAGIC
|
|
||||||
#define CGROUP2_SUPER_MAGIC 0x63677270
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Useful macros */
|
|
||||||
/* Maximum number for 64 bit integer is a string with 21 digits: 2^64 - 1 = 21 */
|
|
||||||
#define LXC_NUMSTRLEN64 21
|
|
||||||
#define LXC_LINELEN 4096
|
|
||||||
#define LXC_IDMAPLEN 4096
|
|
||||||
#define LXC_MAX_BUFFER 4096
|
|
||||||
/* /proc/ = 6
|
|
||||||
* +
|
|
||||||
* <pid-as-str> = LXC_NUMSTRLEN64
|
|
||||||
* +
|
|
||||||
* /fd/ = 4
|
|
||||||
* +
|
|
||||||
* <fd-as-str> = LXC_NUMSTRLEN64
|
|
||||||
* +
|
|
||||||
* \0 = 1
|
|
||||||
*/
|
|
||||||
#define LXC_PROC_PID_FD_LEN (6 + LXC_NUMSTRLEN64 + 4 + LXC_NUMSTRLEN64 + 1)
|
|
||||||
|
|
||||||
/* returns 1 on success, 0 if there were any failures */
|
/* returns 1 on success, 0 if there were any failures */
|
||||||
extern int lxc_rmdir_onedev(const char *path, const char *exclude);
|
extern int lxc_rmdir_onedev(const char *path, const char *exclude);
|
||||||
@ -265,24 +199,6 @@ static inline int signalfd(int fd, const sigset_t *mask, int flags)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* loop devices */
|
|
||||||
#ifndef LO_FLAGS_AUTOCLEAR
|
|
||||||
#define LO_FLAGS_AUTOCLEAR 4
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef LOOP_CTL_GET_FREE
|
|
||||||
#define LOOP_CTL_GET_FREE 0x4C82
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* memfd_create() */
|
|
||||||
#ifndef MFD_CLOEXEC
|
|
||||||
#define MFD_CLOEXEC 0x0001U
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef MFD_ALLOW_SEALING
|
|
||||||
#define MFD_ALLOW_SEALING 0x0002U
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef HAVE_MEMFD_CREATE
|
#ifndef HAVE_MEMFD_CREATE
|
||||||
static inline int memfd_create(const char *name, unsigned int flags) {
|
static inline int memfd_create(const char *name, unsigned int flags) {
|
||||||
#ifndef __NR_memfd_create
|
#ifndef __NR_memfd_create
|
||||||
@ -359,32 +275,6 @@ extern struct lxc_popen_FILE *lxc_popen(const char *command);
|
|||||||
*/
|
*/
|
||||||
extern int lxc_pclose(struct lxc_popen_FILE *fp);
|
extern int lxc_pclose(struct lxc_popen_FILE *fp);
|
||||||
|
|
||||||
/**
|
|
||||||
* BUILD_BUG_ON - break compile if a condition is true.
|
|
||||||
* @condition: the condition which the compiler should know is false.
|
|
||||||
*
|
|
||||||
* If you have some code which relies on certain constants being equal, or
|
|
||||||
* other compile-time-evaluated condition, you should use BUILD_BUG_ON to
|
|
||||||
* detect if someone changes it.
|
|
||||||
*
|
|
||||||
* The implementation uses gcc's reluctance to create a negative array, but
|
|
||||||
* gcc (as of 4.4) only emits that error for obvious cases (eg. not arguments
|
|
||||||
* to inline functions). So as a fallback we use the optimizer; if it can't
|
|
||||||
* prove the condition is false, it will cause a link error on the undefined
|
|
||||||
* "__build_bug_on_failed". This error message can be harder to track down
|
|
||||||
* though, hence the two different methods.
|
|
||||||
*/
|
|
||||||
#ifndef __OPTIMIZE__
|
|
||||||
#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
|
|
||||||
#else
|
|
||||||
extern int __build_bug_on_failed;
|
|
||||||
#define BUILD_BUG_ON(condition) \
|
|
||||||
do { \
|
|
||||||
((void)sizeof(char[1 - 2*!!(condition)])); \
|
|
||||||
if (condition) __build_bug_on_failed = 1; \
|
|
||||||
} while(0)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* wait on a child we forked
|
* wait on a child we forked
|
||||||
*/
|
*/
|
||||||
@ -620,9 +510,4 @@ extern int lxc_set_death_signal(int signal);
|
|||||||
extern int fd_cloexec(int fd, bool cloexec);
|
extern int fd_cloexec(int fd, bool cloexec);
|
||||||
extern int recursive_destroy(char *dirname);
|
extern int recursive_destroy(char *dirname);
|
||||||
|
|
||||||
#define lxc_iterate_parts(__iterator, __splitme, __separators) \
|
|
||||||
for (char *__p = NULL, *__it = strtok_r(__splitme, __separators, &__p); \
|
|
||||||
(__iterator = __it); \
|
|
||||||
__iterator = __it = strtok_r(NULL, __separators, &__p))
|
|
||||||
|
|
||||||
#endif /* __LXC_UTILS_H */
|
#endif /* __LXC_UTILS_H */
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user