fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-28 14:30:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: improve "nm-device-logging.h" to support a self pointer of NMDevice type

Browse source 
"nm-device-logging.h" defines logging macros for a NMDevice instance.
It also expects a "self" variable in the call environment, and that
variable had to be in the type of NMDevice or the NMDevice subclass.

Extend the macro foo, so that @self can be either a NMDevice* pointer
or a NMDevice$SUBTYPE.

Of course, that would have always been possible, if we would simply cast
to "(NMDevice *)" where we need it. The trick is that the macro only
works if @self is one of the two expected types, and not some arbitrary
unrelated type.
This commit is contained in:
Thomas Haller 2020-11-06 18:22:11 +01:00
parent 7d5ec103df
commit cc35dc3bdf
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
29 changed files with 58 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/devices/adsl/nm-device-adsl.c
View file

@ -23,8 +23,8 @@
#include "nm-setting-adsl.h"
#include "nm-utils.h"
#define _NMLOG_DEVICE_TYPE NMDeviceAdsl
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceAdsl);
/*****************************************************************************/

2
src/devices/bluetooth/nm-device-bt.c
View file

@ -30,8 +30,8 @@
#include "devices/wwan/nm-modem-manager.h"
#include "devices/wwan/nm-modem.h"
#define _NMLOG_DEVICE_TYPE NMDeviceBt
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceBt);
/*****************************************************************************/

2
src/devices/nm-device-6lowpan.c
View file

@ -14,8 +14,8 @@
#include "nm-setting-6lowpan.h"
#include "nm-utils.h"
#define _NMLOG_DEVICE_TYPE NMDevice6Lowpan
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDevice6Lowpan);
/*****************************************************************************/

2
src/devices/nm-device-bond.c
View file

@ -17,8 +17,8 @@
#include "nm-core-internal.h"
#include "nm-ip4-config.h"
#define _NMLOG_DEVICE_TYPE NMDeviceBond
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceBond);
/*****************************************************************************/

2
src/devices/nm-device-bridge.c
View file

@ -15,8 +15,8 @@
#include "nm-device-factory.h"
#include "nm-core-internal.h"
#define _NMLOG_DEVICE_TYPE NMDeviceBridge
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceBridge);
/*****************************************************************************/

2
src/devices/nm-device-dummy.c
View file

@ -18,8 +18,8 @@
#include "nm-setting-dummy.h"
#include "nm-core-internal.h"
#define _NMLOG_DEVICE_TYPE NMDeviceDummy
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceDummy);
/*****************************************************************************/

2
src/devices/nm-device-ethernet.c
View file

@ -35,8 +35,8 @@
#include "NetworkManagerUtils.h"
#include "nm-udev-aux/nm-udev-utils.h"
#define _NMLOG_DEVICE_TYPE NMDeviceEthernet
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceEthernet);
/*****************************************************************************/

2
src/devices/nm-device-ip-tunnel.c
View file

@ -22,8 +22,8 @@
#include "nm-act-request.h"
#include "nm-ip4-config.h"
#define _NMLOG_DEVICE_TYPE NMDeviceIPTunnel
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceIPTunnel);
/*****************************************************************************/

58
src/devices/nm-device-logging.h
View file

@ -8,36 +8,40 @@
#include "nm-device.h"
#define _LOG_DECLARE_SELF(t) \
_nm_unused static inline NMDevice *_nm_device_log_self_to_device(t *self) \
{ \
return (NMDevice *) self; \
}
#if !_NM_CC_SUPPORT_GENERIC
#define _NM_DEVICE_CAST(self) ((NMDevice *) (self))
#elif !defined(_NMLOG_DEVICE_TYPE)
#define _NM_DEVICE_CAST(self) _NM_ENSURE_TYPE(NMDevice *, self)
#else
#define _NM_DEVICE_CAST(self) \
_Generic((self), _NMLOG_DEVICE_TYPE * \
: ((NMDevice *) (self)), NMDevice * \
: ((NMDevice *) (self)))
#endif
#undef _NMLOG_ENABLED
#define _NMLOG_ENABLED(level, domain) (nm_logging_enabled((level), (domain)))
#define _NMLOG(level, domain, ...) \
G_STMT_START \
{ \
const NMLogLevel _level = (level); \
const NMLogDomain _domain = (domain); \
\
if (nm_logging_enabled(_level, _domain)) { \
typeof(*self) *const _self = (self); \
const char *const _ifname = \
_nm_device_get_iface(_nm_device_log_self_to_device(_self)); \
\
nm_log_obj(_level, \
_domain, \
_ifname, \
NULL, \
_self, \
"device", \
"%s%s%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \
NM_PRINT_FMT_QUOTED(_ifname, "(", _ifname, ")", "[null]") \
_NM_UTILS_MACRO_REST(__VA_ARGS__)); \
} \
} \
#define _NMLOG(level, domain, ...) \
G_STMT_START \
{ \
const NMLogLevel _level = (level); \
const NMLogDomain _domain = (domain); \
\
if (nm_logging_enabled(_level, _domain)) { \
typeof(*self) *const _self = (self); \
const char *const _ifname = _nm_device_get_iface(_NM_DEVICE_CAST(_self)); \
\
nm_log_obj(_level, \
_domain, \
_ifname, \
NULL, \
_self, \
"device", \
"%s%s%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \
NM_PRINT_FMT_QUOTED(_ifname, "(", _ifname, ")", "[null]") \
_NM_UTILS_MACRO_REST(__VA_ARGS__)); \
} \
} \
G_STMT_END
#endif /* __NETWORKMANAGER_DEVICE_LOGGING_H__ */

2
src/devices/nm-device-macsec.c
View file

@ -18,8 +18,8 @@
#include "supplicant/nm-supplicant-interface.h"
#include "supplicant/nm-supplicant-config.h"
#define _NMLOG_DEVICE_TYPE NMDeviceMacsec
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceMacsec);
/*****************************************************************************/

2
src/devices/nm-device-macvlan.c
View file

@ -21,8 +21,8 @@
#include "nm-ip4-config.h"
#include "nm-utils.h"
#define _NMLOG_DEVICE_TYPE NMDeviceMacvlan
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceMacvlan);
/*****************************************************************************/

2
src/devices/nm-device-ppp.c
View file

@ -18,8 +18,8 @@
#include "ppp/nm-ppp-manager-call.h"
#include "ppp/nm-ppp-status.h"
#define _NMLOG_DEVICE_TYPE NMDevicePpp
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDevicePpp);
/*****************************************************************************/

2
src/devices/nm-device-tun.c
View file

@ -19,8 +19,8 @@
#include "nm-setting-tun.h"
#include "nm-core-internal.h"
#define _NMLOG_DEVICE_TYPE NMDeviceTun
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceTun);
/*****************************************************************************/

2
src/devices/nm-device-veth.c
View file

@ -13,8 +13,8 @@
#include "platform/nm-platform.h"
#include "nm-device-factory.h"
#define _NMLOG_DEVICE_TYPE NMDeviceVeth
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceVeth);
/*****************************************************************************/

2
src/devices/nm-device-vlan.c
View file

@ -22,8 +22,8 @@
#include "nm-core-internal.h"
#include "platform/nmp-object.h"
#define _NMLOG_DEVICE_TYPE NMDeviceVlan
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceVlan);
/*****************************************************************************/

2
src/devices/nm-device-vrf.c
View file

@ -12,8 +12,8 @@
#include "platform/nm-platform.h"
#include "settings/nm-settings.h"
#define _NMLOG_DEVICE_TYPE NMDeviceVrf
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceVrf);
/*****************************************************************************/

2
src/devices/nm-device-vxlan.c
View file

@ -19,8 +19,8 @@
#include "nm-ip4-config.h"
#include "nm-core-internal.h"
#define _NMLOG_DEVICE_TYPE NMDeviceVxlan
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceVxlan);
/*****************************************************************************/

2
src/devices/nm-device-wireguard.c
View file

@ -22,8 +22,8 @@
#include "nm-act-request.h"
#include "dns/nm-dns-manager.h"
#define _NMLOG_DEVICE_TYPE NMDeviceWireGuard
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceWireGuard);
/*****************************************************************************/

2
src/devices/nm-device-wpan.c
View file

@ -20,8 +20,8 @@
#include "nm-setting-wpan.h"
#include "nm-core-internal.h"
#define _NMLOG_DEVICE_TYPE NMDeviceWpan
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceWpan);
/*****************************************************************************/

1
src/devices/nm-device.c
View file

@ -74,7 +74,6 @@
#include "nm-device-wireguard.h"
#include "nm-device-logging.h"
_LOG_DECLARE_SELF(NMDevice);
/*****************************************************************************/

2
src/devices/ovs/nm-device-ovs-bridge.c
View file

@ -14,8 +14,8 @@
#include "nm-setting-connection.h"
#include "nm-setting-ovs-bridge.h"
#define _NMLOG_DEVICE_TYPE NMDeviceOvsBridge
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceOvsBridge);
/*****************************************************************************/

2
src/devices/ovs/nm-device-ovs-interface.c
View file

@ -14,8 +14,8 @@
#include "nm-setting-ovs-interface.h"
#include "nm-setting-ovs-port.h"
#define _NMLOG_DEVICE_TYPE NMDeviceOvsInterface
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceOvsInterface);
/*****************************************************************************/

2
src/devices/ovs/nm-device-ovs-port.c
View file

@ -15,8 +15,8 @@
#include "nm-setting-ovs-port.h"
#include "nm-setting-ovs-port.h"
#define _NMLOG_DEVICE_TYPE NMDeviceOvsPort
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceOvsPort);
/*****************************************************************************/

2
src/devices/team/nm-device-team.c
View file

@ -25,8 +25,8 @@
#include "nm-ip4-config.h"
#include "nm-std-aux/nm-dbus-compat.h"
#define _NMLOG_DEVICE_TYPE NMDeviceTeam
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceTeam);
/*****************************************************************************/

2
src/devices/wifi/nm-device-iwd.c
View file

@ -28,8 +28,8 @@
#include "settings/nm-settings.h"
#include "supplicant/nm-supplicant-types.h"
#define _NMLOG_DEVICE_TYPE NMDeviceIwd
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceIwd);
/*****************************************************************************/

2
src/devices/wifi/nm-device-olpc-mesh.c
View file

@ -30,8 +30,8 @@
#include "nm-manager.h"
#include "platform/nm-platform.h"
#define _NMLOG_DEVICE_TYPE NMDeviceOlpcMesh
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceOlpcMesh);
/*****************************************************************************/

2
src/devices/wifi/nm-device-wifi-p2p.c
View file

@ -27,8 +27,8 @@
#include "platform/nmp-object.h"
#include "settings/nm-settings.h"
#define _NMLOG_DEVICE_TYPE NMDeviceWifiP2P
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceWifiP2P);
/*****************************************************************************/

2
src/devices/wifi/nm-device-wifi.c
View file

@ -41,8 +41,8 @@
#include "nm-core-internal.h"
#include "nm-config.h"
#define _NMLOG_DEVICE_TYPE NMDeviceWifi
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceWifi);
#define SCAN_INTERVAL_SEC_MIN 3
#define SCAN_INTERVAL_SEC_STEP 20

2
src/devices/wwan/nm-device-modem.c
View file

@ -16,8 +16,8 @@
#include "NetworkManagerUtils.h"
#include "nm-core-internal.h"
#define _NMLOG_DEVICE_TYPE NMDeviceModem
#include "devices/nm-device-logging.h"
_LOG_DECLARE_SELF(NMDeviceModem);
/*****************************************************************************/