2019-09-10 09:19:01 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0+
|
2014-07-31 17:32:10 +00:00
|
|
|
/*
|
2019-10-01 07:20:35 +00:00
|
|
|
* Copyright (C) 2010 - 2015 Red Hat, Inc.
|
2014-07-31 17:32:10 +00:00
|
|
|
*/
|
|
|
|
|
2016-02-19 13:57:48 +00:00
|
|
|
#include "nm-default.h"
|
2014-11-13 15:07:02 +00:00
|
|
|
|
2018-05-06 06:51:26 +00:00
|
|
|
#include <sys/wait.h>
|
2014-07-31 17:32:10 +00:00
|
|
|
|
|
|
|
#include "NetworkManager.h"
|
2019-04-15 07:23:31 +00:00
|
|
|
#include "nm-std-aux/nm-dbus-compat.h"
|
2014-07-31 17:32:10 +00:00
|
|
|
|
2015-12-20 20:59:13 +00:00
|
|
|
#include "nm-test-libnm-utils.h"
|
2014-07-31 17:32:10 +00:00
|
|
|
|
2018-05-30 08:23:17 +00:00
|
|
|
#define NMTSTC_NM_SERVICE NM_BUILD_SRCDIR"/tools/test-networkmanager-service.py"
|
|
|
|
|
2015-12-23 13:07:36 +00:00
|
|
|
/*****************************************************************************/
|
|
|
|
|
2014-07-31 17:32:10 +00:00
|
|
|
static gboolean
|
|
|
|
name_exists (GDBusConnection *c, const char *name)
|
|
|
|
{
|
|
|
|
GVariant *reply;
|
|
|
|
gboolean exists = FALSE;
|
|
|
|
|
|
|
|
reply = g_dbus_connection_call_sync (c,
|
|
|
|
DBUS_SERVICE_DBUS,
|
|
|
|
DBUS_PATH_DBUS,
|
|
|
|
DBUS_INTERFACE_DBUS,
|
|
|
|
"GetNameOwner",
|
|
|
|
g_variant_new ("(s)", name),
|
|
|
|
NULL,
|
|
|
|
G_DBUS_CALL_FLAGS_NO_AUTO_START,
|
|
|
|
-1,
|
|
|
|
NULL,
|
|
|
|
NULL);
|
|
|
|
if (reply != NULL) {
|
|
|
|
exists = TRUE;
|
|
|
|
g_variant_unref (reply);
|
|
|
|
}
|
|
|
|
|
|
|
|
return exists;
|
|
|
|
}
|
|
|
|
|
2018-05-06 06:51:26 +00:00
|
|
|
typedef struct {
|
|
|
|
GMainLoop *mainloop;
|
|
|
|
GDBusConnection *bus;
|
|
|
|
int exit_code;
|
|
|
|
bool exited:1;
|
|
|
|
bool name_found:1;
|
|
|
|
} ServiceInitWaitData;
|
|
|
|
|
|
|
|
static gboolean
|
|
|
|
_service_init_wait_probe_name (gpointer user_data)
|
|
|
|
{
|
|
|
|
ServiceInitWaitData *data = user_data;
|
|
|
|
|
|
|
|
if (!name_exists (data->bus, "org.freedesktop.NetworkManager"))
|
|
|
|
return G_SOURCE_CONTINUE;
|
|
|
|
|
|
|
|
data->name_found = TRUE;
|
|
|
|
g_main_loop_quit (data->mainloop);
|
|
|
|
return G_SOURCE_REMOVE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
_service_init_wait_child_wait (GPid pid,
|
all: don't use gchar/gshort/gint/glong but C types
We commonly don't use the glib typedefs for char/short/int/long,
but their C types directly.
$ git grep '\<g\(char\|short\|int\|long\|float\|double\)\>' | wc -l
587
$ git grep '\<\(char\|short\|int\|long\|float\|double\)\>' | wc -l
21114
One could argue that using the glib typedefs is preferable in
public API (of our glib based libnm library) or where it clearly
is related to glib, like during
g_object_set (obj, PROPERTY, (gint) value, NULL);
However, that argument does not seem strong, because in practice we don't
follow that argument today, and seldomly use the glib typedefs.
Also, the style guide for this would be hard to formalize, because
"using them where clearly related to a glib" is a very loose suggestion.
Also note that glib typedefs will always just be typedefs of the
underlying C types. There is no danger of glib changing the meaning
of these typedefs (because that would be a major API break of glib).
A simple style guide is instead: don't use these typedefs.
No manual actions, I only ran the bash script:
FILES=($(git ls-files '*.[hc]'))
sed -i \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>\( [^ ]\)/\1\2/g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\> /\1 /g' \
-e 's/\<g\(char\|short\|int\|long\|float\|double\)\>/\1/g' \
"${FILES[@]}"
2018-07-11 05:40:19 +00:00
|
|
|
int status,
|
2018-05-06 06:51:26 +00:00
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
ServiceInitWaitData *data = user_data;
|
|
|
|
|
|
|
|
data->exited = TRUE;
|
|
|
|
data->exit_code = status;
|
|
|
|
g_main_loop_quit (data->mainloop);
|
|
|
|
}
|
|
|
|
|
|
|
|
NMTstcServiceInfo *
|
|
|
|
nmtstc_service_available (NMTstcServiceInfo *info)
|
|
|
|
{
|
|
|
|
gs_free char *m = NULL;
|
|
|
|
|
|
|
|
if (info)
|
|
|
|
return info;
|
|
|
|
|
|
|
|
/* This happens, when test-networkmanager-service.py exits with 77 status
|
|
|
|
* code. */
|
2018-05-30 08:23:17 +00:00
|
|
|
m = g_strdup_printf ("missing dependency for running NetworkManager stub service %s", NMTSTC_NM_SERVICE);
|
2018-05-06 06:51:26 +00:00
|
|
|
g_test_skip (m);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2015-12-21 09:22:33 +00:00
|
|
|
NMTstcServiceInfo *
|
|
|
|
nmtstc_service_init (void)
|
2014-07-31 17:32:10 +00:00
|
|
|
{
|
2015-12-21 09:22:33 +00:00
|
|
|
NMTstcServiceInfo *info;
|
2018-05-30 08:23:17 +00:00
|
|
|
const char *args[] = { TEST_NM_PYTHON, NMTSTC_NM_SERVICE, NULL };
|
2014-07-31 17:32:10 +00:00
|
|
|
GError *error = NULL;
|
|
|
|
|
|
|
|
info = g_malloc0 (sizeof (*info));
|
|
|
|
|
|
|
|
info->bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error);
|
|
|
|
g_assert_no_error (error);
|
|
|
|
|
2014-07-31 18:00:22 +00:00
|
|
|
/* Spawn the test service. info->keepalive_fd will be a pipe to the service's
|
|
|
|
* stdin; if it closes, the service will exit immediately. We use this to
|
|
|
|
* make sure the service exits if the test program crashes.
|
|
|
|
*/
|
2016-12-14 17:18:37 +00:00
|
|
|
g_spawn_async_with_pipes (NULL, (char **) args, NULL,
|
2018-05-06 06:51:26 +00:00
|
|
|
G_SPAWN_SEARCH_PATH
|
|
|
|
| G_SPAWN_DO_NOT_REAP_CHILD,
|
2016-12-14 17:18:37 +00:00
|
|
|
NULL, NULL,
|
2014-07-31 18:00:22 +00:00
|
|
|
&info->pid, &info->keepalive_fd, NULL, NULL, &error);
|
2014-07-31 17:32:10 +00:00
|
|
|
g_assert_no_error (error);
|
|
|
|
|
2018-05-06 06:51:26 +00:00
|
|
|
{
|
|
|
|
nm_auto_unref_gsource GSource *timeout_source = NULL;
|
|
|
|
nm_auto_unref_gsource GSource *child_source = NULL;
|
|
|
|
GMainContext *context = g_main_context_new ();
|
|
|
|
ServiceInitWaitData data = {
|
|
|
|
.bus = info->bus,
|
|
|
|
.mainloop = g_main_loop_new (context, FALSE),
|
|
|
|
};
|
|
|
|
gboolean had_timeout;
|
|
|
|
|
|
|
|
timeout_source = g_timeout_source_new (50);
|
|
|
|
g_source_set_callback (timeout_source, _service_init_wait_probe_name, &data, NULL);
|
|
|
|
g_source_attach (timeout_source, context);
|
|
|
|
|
|
|
|
child_source = g_child_watch_source_new (info->pid);
|
2020-01-01 08:49:33 +00:00
|
|
|
g_source_set_callback (child_source, G_SOURCE_FUNC (_service_init_wait_child_wait), &data, NULL);
|
2018-05-06 06:51:26 +00:00
|
|
|
g_source_attach (child_source, context);
|
|
|
|
|
2018-07-05 01:53:35 +00:00
|
|
|
had_timeout = !nmtst_main_loop_run (data.mainloop, 30000);
|
2018-05-06 06:51:26 +00:00
|
|
|
|
|
|
|
g_source_destroy (timeout_source);
|
|
|
|
g_source_destroy (child_source);
|
|
|
|
g_main_loop_unref (data.mainloop);
|
|
|
|
g_main_context_unref (context);
|
|
|
|
|
|
|
|
if (had_timeout)
|
2018-05-30 08:23:17 +00:00
|
|
|
g_error ("test service %s did not start in time", NMTSTC_NM_SERVICE);
|
2018-05-06 06:51:26 +00:00
|
|
|
if (!data.name_found) {
|
|
|
|
g_assert (data.exited);
|
|
|
|
info->pid = NM_PID_T_INVAL;
|
|
|
|
nmtstc_service_cleanup (info);
|
|
|
|
|
|
|
|
if ( WIFEXITED (data.exit_code)
|
|
|
|
&& WEXITSTATUS (data.exit_code) == 77) {
|
|
|
|
/* If the stub service exited with status 77 it means that it decided
|
|
|
|
* that it cannot conduct the tests and the test should be (gracefully)
|
|
|
|
* skip. The likely reason for that, is that libnm is not available
|
|
|
|
* via pygobject. */
|
|
|
|
return NULL;
|
|
|
|
}
|
2018-05-30 08:23:17 +00:00
|
|
|
g_error ("test service %s exited with error code %d", NMTSTC_NM_SERVICE, data.exit_code);
|
2018-05-06 06:51:26 +00:00
|
|
|
}
|
2014-07-31 17:32:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Grab a proxy to our fake NM service to trigger tests */
|
|
|
|
info->proxy = g_dbus_proxy_new_sync (info->bus,
|
|
|
|
G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES |
|
|
|
|
G_DBUS_PROXY_FLAGS_DO_NOT_CONNECT_SIGNALS |
|
|
|
|
G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START,
|
|
|
|
NULL,
|
|
|
|
NM_DBUS_SERVICE,
|
|
|
|
NM_DBUS_PATH,
|
|
|
|
"org.freedesktop.NetworkManager.LibnmGlibTest",
|
|
|
|
NULL, &error);
|
|
|
|
g_assert_no_error (error);
|
|
|
|
|
|
|
|
return info;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2015-12-21 09:22:33 +00:00
|
|
|
nmtstc_service_cleanup (NMTstcServiceInfo *info)
|
2014-07-31 17:32:10 +00:00
|
|
|
{
|
2018-05-06 06:51:26 +00:00
|
|
|
int ret;
|
|
|
|
gint64 t;
|
|
|
|
int status;
|
2014-07-31 17:32:10 +00:00
|
|
|
|
2018-05-06 06:51:26 +00:00
|
|
|
if (!info)
|
|
|
|
return;
|
2014-07-31 17:32:10 +00:00
|
|
|
|
2018-05-06 06:51:26 +00:00
|
|
|
nm_close (nm_steal_fd (&info->keepalive_fd));
|
2014-07-31 17:32:10 +00:00
|
|
|
|
2018-05-06 06:51:26 +00:00
|
|
|
g_clear_object (&info->proxy);
|
2014-07-31 17:32:10 +00:00
|
|
|
|
2018-05-06 06:51:26 +00:00
|
|
|
if (info->pid != NM_PID_T_INVAL) {
|
|
|
|
kill (info->pid, SIGTERM);
|
|
|
|
|
|
|
|
t = g_get_monotonic_time ();
|
|
|
|
again_wait:
|
|
|
|
ret = waitpid (info->pid, &status, WNOHANG);
|
|
|
|
if (ret == 0) {
|
|
|
|
if (t + 2000000 < g_get_monotonic_time ()) {
|
|
|
|
kill (info->pid, SIGKILL);
|
|
|
|
g_error ("child process %lld did not exit within timeout", (long long) info->pid);
|
|
|
|
}
|
|
|
|
g_usleep (G_USEC_PER_SEC / 50);
|
|
|
|
goto again_wait;
|
|
|
|
}
|
|
|
|
if (ret == -1 && errno == EINTR)
|
|
|
|
goto again_wait;
|
|
|
|
|
|
|
|
g_assert (ret == info->pid);
|
|
|
|
}
|
|
|
|
|
|
|
|
g_assert (!name_exists (info->bus, "org.freedesktop.NetworkManager"));
|
|
|
|
|
|
|
|
g_clear_object (&info->bus);
|
|
|
|
|
2014-07-31 17:32:10 +00:00
|
|
|
memset (info, 0, sizeof (*info));
|
|
|
|
g_free (info);
|
|
|
|
}
|
2015-12-20 15:43:01 +00:00
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
GMainLoop *loop;
|
|
|
|
const char *ifname;
|
2020-01-03 15:04:09 +00:00
|
|
|
const char *path;
|
2015-12-20 15:43:01 +00:00
|
|
|
NMDevice *device;
|
|
|
|
} AddDeviceInfo;
|
|
|
|
|
|
|
|
static void
|
|
|
|
device_added_cb (NMClient *client,
|
|
|
|
NMDevice *device,
|
|
|
|
gpointer user_data)
|
|
|
|
{
|
|
|
|
AddDeviceInfo *info = user_data;
|
|
|
|
|
2020-01-03 15:04:09 +00:00
|
|
|
g_assert (info);
|
|
|
|
g_assert (!info->device);
|
|
|
|
|
|
|
|
g_assert (NM_IS_DEVICE (device));
|
2015-12-20 15:43:01 +00:00
|
|
|
g_assert_cmpstr (nm_object_get_path (NM_OBJECT (device)), ==, info->path);
|
|
|
|
g_assert_cmpstr (nm_device_get_iface (device), ==, info->ifname);
|
|
|
|
|
2020-01-03 15:04:09 +00:00
|
|
|
info->device = g_object_ref (device);
|
2015-12-20 15:43:01 +00:00
|
|
|
g_main_loop_quit (info->loop);
|
|
|
|
}
|
|
|
|
|
|
|
|
static GVariant *
|
|
|
|
call_add_wired_device (GDBusProxy *proxy, const char *ifname, const char *hwaddr,
|
|
|
|
const char **subchannels, GError **error)
|
|
|
|
{
|
|
|
|
const char *empty[] = { NULL };
|
|
|
|
|
|
|
|
if (!hwaddr)
|
|
|
|
hwaddr = "/";
|
|
|
|
if (!subchannels)
|
|
|
|
subchannels = empty;
|
|
|
|
|
|
|
|
return g_dbus_proxy_call_sync (proxy,
|
|
|
|
"AddWiredDevice",
|
|
|
|
g_variant_new ("(ss^as)", ifname, hwaddr, subchannels),
|
|
|
|
G_DBUS_CALL_FLAGS_NO_AUTO_START,
|
|
|
|
3000,
|
|
|
|
NULL,
|
|
|
|
error);
|
|
|
|
}
|
|
|
|
|
|
|
|
static GVariant *
|
|
|
|
call_add_device (GDBusProxy *proxy, const char *method, const char *ifname, GError **error)
|
|
|
|
{
|
|
|
|
return g_dbus_proxy_call_sync (proxy,
|
2015-12-21 09:22:33 +00:00
|
|
|
method,
|
|
|
|
g_variant_new ("(s)", ifname),
|
|
|
|
G_DBUS_CALL_FLAGS_NO_AUTO_START,
|
|
|
|
3000,
|
|
|
|
NULL,
|
|
|
|
error);
|
2015-12-20 15:43:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static NMDevice *
|
2020-01-03 15:04:09 +00:00
|
|
|
add_device_common (NMTstcServiceInfo *sinfo,
|
|
|
|
NMClient *client,
|
|
|
|
const char *method,
|
|
|
|
const char *ifname,
|
|
|
|
const char *hwaddr,
|
|
|
|
const char **subchannels)
|
2015-12-20 15:43:01 +00:00
|
|
|
{
|
2020-01-03 15:04:09 +00:00
|
|
|
nm_auto_unref_gmainloop GMainLoop *loop = NULL;
|
|
|
|
gs_unref_variant GVariant *ret = NULL;
|
|
|
|
gs_free_error GError *error = NULL;
|
2015-12-20 15:43:01 +00:00
|
|
|
AddDeviceInfo info;
|
|
|
|
|
2020-01-03 15:04:09 +00:00
|
|
|
g_assert (sinfo);
|
|
|
|
g_assert (NM_IS_CLIENT (client));
|
|
|
|
|
|
|
|
if (nm_streq0 (method, "AddWiredDevice"))
|
2015-12-20 15:43:01 +00:00
|
|
|
ret = call_add_wired_device (sinfo->proxy, ifname, hwaddr, subchannels, &error);
|
|
|
|
else
|
|
|
|
ret = call_add_device (sinfo->proxy, method, ifname, &error);
|
|
|
|
|
2020-01-03 15:04:09 +00:00
|
|
|
nmtst_assert_success (ret, error);
|
2015-12-20 15:43:01 +00:00
|
|
|
g_assert_cmpstr (g_variant_get_type_string (ret), ==, "(o)");
|
2020-01-03 15:04:09 +00:00
|
|
|
|
|
|
|
/* Wait for NMClient to find the device */
|
|
|
|
|
|
|
|
loop = g_main_loop_new (nm_client_get_main_context (client), FALSE);
|
|
|
|
|
|
|
|
info = (AddDeviceInfo) {
|
|
|
|
.ifname = ifname,
|
|
|
|
.loop = loop,
|
|
|
|
};
|
|
|
|
g_variant_get (ret, "(&o)", &info.path);
|
|
|
|
|
|
|
|
g_signal_connect (client,
|
|
|
|
NM_CLIENT_DEVICE_ADDED,
|
|
|
|
G_CALLBACK (device_added_cb),
|
|
|
|
&info);
|
|
|
|
|
|
|
|
if (!nmtst_main_loop_run (loop, 5000))
|
|
|
|
g_assert_not_reached ();
|
|
|
|
|
2015-12-20 15:43:01 +00:00
|
|
|
g_signal_handlers_disconnect_by_func (client, device_added_cb, &info);
|
|
|
|
|
2020-01-03 15:04:09 +00:00
|
|
|
g_assert (NM_IS_DEVICE (info.device));
|
|
|
|
|
|
|
|
g_assert (info.device == nm_client_get_device_by_path (client, nm_object_get_path (NM_OBJECT (info.device))));
|
|
|
|
g_object_unref (info.device);
|
2015-12-20 15:43:01 +00:00
|
|
|
return info.device;
|
|
|
|
}
|
|
|
|
|
|
|
|
NMDevice *
|
2015-12-21 09:22:33 +00:00
|
|
|
nmtstc_service_add_device (NMTstcServiceInfo *sinfo, NMClient *client,
|
|
|
|
const char *method, const char *ifname)
|
2015-12-20 15:43:01 +00:00
|
|
|
{
|
|
|
|
return add_device_common (sinfo, client, method, ifname, NULL, NULL);
|
|
|
|
}
|
|
|
|
|
|
|
|
NMDevice *
|
2015-12-21 09:22:33 +00:00
|
|
|
nmtstc_service_add_wired_device (NMTstcServiceInfo *sinfo, NMClient *client,
|
|
|
|
const char *ifname, const char *hwaddr,
|
|
|
|
const char **subchannels)
|
2015-12-20 15:43:01 +00:00
|
|
|
{
|
|
|
|
return add_device_common (sinfo, client, "AddWiredDevice", ifname, hwaddr, subchannels);
|
|
|
|
}
|
2015-12-22 12:53:20 +00:00
|
|
|
|
2015-12-25 19:27:45 +00:00
|
|
|
void
|
|
|
|
nmtstc_service_add_connection (NMTstcServiceInfo *sinfo,
|
|
|
|
NMConnection *connection,
|
|
|
|
gboolean verify_connection,
|
|
|
|
char **out_path)
|
|
|
|
{
|
|
|
|
nmtstc_service_add_connection_variant (sinfo,
|
|
|
|
nm_connection_to_dbus (connection, NM_CONNECTION_SERIALIZE_ALL),
|
|
|
|
verify_connection,
|
|
|
|
out_path);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
nmtstc_service_add_connection_variant (NMTstcServiceInfo *sinfo,
|
|
|
|
GVariant *connection,
|
|
|
|
gboolean verify_connection,
|
|
|
|
char **out_path)
|
|
|
|
{
|
|
|
|
GVariant *result;
|
|
|
|
GError *error = NULL;
|
|
|
|
|
|
|
|
g_assert (sinfo);
|
|
|
|
g_assert (G_IS_DBUS_PROXY (sinfo->proxy));
|
|
|
|
g_assert (g_variant_is_of_type (connection, G_VARIANT_TYPE ("a{sa{sv}}")));
|
|
|
|
|
|
|
|
result = g_dbus_proxy_call_sync (sinfo->proxy,
|
|
|
|
"AddConnection",
|
|
|
|
g_variant_new ("(vb)", connection, verify_connection),
|
|
|
|
G_DBUS_CALL_FLAGS_NO_AUTO_START,
|
|
|
|
3000,
|
|
|
|
NULL,
|
|
|
|
&error);
|
|
|
|
g_assert_no_error (error);
|
|
|
|
g_assert (g_variant_is_of_type (result, G_VARIANT_TYPE ("(o)")));
|
|
|
|
if (out_path)
|
|
|
|
g_variant_get (result, "(o)", out_path);
|
|
|
|
g_variant_unref (result);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
nmtstc_service_update_connection (NMTstcServiceInfo *sinfo,
|
|
|
|
const char *path,
|
|
|
|
NMConnection *connection,
|
|
|
|
gboolean verify_connection)
|
|
|
|
{
|
|
|
|
if (!path)
|
|
|
|
path = nm_connection_get_path (connection);
|
|
|
|
g_assert (path);
|
|
|
|
|
|
|
|
nmtstc_service_update_connection_variant (sinfo,
|
|
|
|
path,
|
|
|
|
nm_connection_to_dbus (connection, NM_CONNECTION_SERIALIZE_ALL),
|
|
|
|
verify_connection);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
nmtstc_service_update_connection_variant (NMTstcServiceInfo *sinfo,
|
|
|
|
const char *path,
|
|
|
|
GVariant *connection,
|
|
|
|
gboolean verify_connection)
|
|
|
|
{
|
|
|
|
GVariant *result;
|
|
|
|
GError *error = NULL;
|
|
|
|
|
|
|
|
g_assert (sinfo);
|
|
|
|
g_assert (G_IS_DBUS_PROXY (sinfo->proxy));
|
|
|
|
g_assert (g_variant_is_of_type (connection, G_VARIANT_TYPE ("a{sa{sv}}")));
|
|
|
|
g_assert (path && path[0] == '/');
|
|
|
|
|
|
|
|
result = g_dbus_proxy_call_sync (sinfo->proxy,
|
|
|
|
"UpdateConnection",
|
|
|
|
g_variant_new ("(ovb)", path, connection, verify_connection),
|
|
|
|
G_DBUS_CALL_FLAGS_NO_AUTO_START,
|
|
|
|
3000,
|
|
|
|
NULL,
|
|
|
|
&error);
|
|
|
|
g_assert_no_error (error);
|
|
|
|
g_assert (g_variant_is_of_type (result, G_VARIANT_TYPE ("()")));
|
|
|
|
g_variant_unref (result);
|
|
|
|
}
|
2019-11-02 13:15:48 +00:00
|
|
|
|
|
|
|
/*****************************************************************************/
|
|
|
|
|
|
|
|
typedef struct {
|
2020-01-03 07:34:20 +00:00
|
|
|
GType gtype;
|
2019-11-02 13:15:48 +00:00
|
|
|
GMainLoop *loop;
|
2020-01-03 07:34:20 +00:00
|
|
|
GObject *obj;
|
|
|
|
bool call_nm_client_new_async:1;
|
|
|
|
} NMTstcObjNewData;
|
2019-11-02 13:15:48 +00:00
|
|
|
|
|
|
|
static void
|
2020-01-03 07:34:20 +00:00
|
|
|
_context_object_new_do_cb (GObject *source_object,
|
|
|
|
GAsyncResult *res,
|
|
|
|
gpointer user_data)
|
2019-11-02 13:15:48 +00:00
|
|
|
{
|
2020-01-03 07:34:20 +00:00
|
|
|
NMTstcObjNewData *d = user_data;
|
2019-11-02 13:15:48 +00:00
|
|
|
gs_free_error GError *error = NULL;
|
|
|
|
|
2020-01-03 07:34:20 +00:00
|
|
|
g_assert (!d->obj);
|
2019-11-02 13:15:48 +00:00
|
|
|
|
2020-01-03 07:34:20 +00:00
|
|
|
if (d->call_nm_client_new_async) {
|
|
|
|
d->obj = G_OBJECT (nm_client_new_finish (res,
|
|
|
|
nmtst_get_rand_bool () ? &error : NULL));
|
|
|
|
} else {
|
|
|
|
d->obj = g_async_initable_new_finish (G_ASYNC_INITABLE (source_object),
|
|
|
|
res,
|
|
|
|
nmtst_get_rand_bool () ? &error : NULL);
|
|
|
|
}
|
2019-11-02 13:15:48 +00:00
|
|
|
|
2020-01-03 07:34:20 +00:00
|
|
|
nmtst_assert_success (G_IS_OBJECT (d->obj), error);
|
|
|
|
g_assert (G_OBJECT_TYPE (d->obj) == d->gtype);
|
2019-11-02 13:15:48 +00:00
|
|
|
|
|
|
|
g_main_loop_quit (d->loop);
|
|
|
|
}
|
|
|
|
|
2020-01-03 07:34:20 +00:00
|
|
|
static GObject *
|
|
|
|
_context_object_new_do (GType gtype,
|
|
|
|
gboolean sync,
|
|
|
|
const gchar *first_property_name,
|
|
|
|
va_list var_args)
|
2019-11-02 13:15:48 +00:00
|
|
|
{
|
2019-12-16 16:39:17 +00:00
|
|
|
gs_free_error GError *error = NULL;
|
2020-01-03 07:34:20 +00:00
|
|
|
GObject *obj;
|
2019-11-02 13:15:48 +00:00
|
|
|
|
2020-01-03 07:34:20 +00:00
|
|
|
/* Create a GObject instance synchronously, and arbitrarily use either
|
2019-11-02 13:15:48 +00:00
|
|
|
* the sync or async constructor.
|
|
|
|
*
|
|
|
|
* Note that the sync and async construct differ in one important aspect:
|
|
|
|
* the async constructor iterates the current g_main_context_get_thread_default(),
|
|
|
|
* while the sync constructor does not! Aside from that, both should behave
|
|
|
|
* pretty much the same way. */
|
|
|
|
|
|
|
|
if (sync) {
|
|
|
|
nm_auto_destroy_and_unref_gsource GSource *source = NULL;
|
|
|
|
|
|
|
|
if (nmtst_get_rand_bool ()) {
|
|
|
|
/* the current main context must not be iterated! */
|
|
|
|
source = g_idle_source_new ();
|
|
|
|
g_source_set_callback (source, nmtst_g_source_assert_not_called, NULL, NULL);
|
|
|
|
g_source_attach (source, g_main_context_get_thread_default ());
|
|
|
|
}
|
|
|
|
|
2020-01-03 07:34:20 +00:00
|
|
|
if ( gtype != NM_TYPE_CLIENT
|
|
|
|
|| first_property_name
|
|
|
|
|| nmtst_get_rand_bool ()) {
|
2019-11-02 13:15:48 +00:00
|
|
|
gboolean success;
|
|
|
|
|
2020-01-03 07:34:20 +00:00
|
|
|
if ( first_property_name
|
|
|
|
|| nmtst_get_rand_bool ())
|
|
|
|
obj = g_object_new_valist (gtype, first_property_name, var_args);
|
|
|
|
else
|
|
|
|
obj = g_object_new (gtype, NULL);
|
2019-11-02 13:15:48 +00:00
|
|
|
|
2020-01-03 07:34:20 +00:00
|
|
|
success = g_initable_init (G_INITABLE (obj),
|
2019-11-02 13:15:48 +00:00
|
|
|
NULL,
|
|
|
|
nmtst_get_rand_bool () ? &error : NULL);
|
|
|
|
nmtst_assert_success (success, error);
|
|
|
|
} else {
|
2020-01-03 07:34:20 +00:00
|
|
|
obj = G_OBJECT (nm_client_new (NULL,
|
|
|
|
nmtst_get_rand_bool () ? &error : NULL));
|
2019-11-02 13:15:48 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
nm_auto_unref_gmainloop GMainLoop *loop = NULL;
|
2020-01-03 07:34:20 +00:00
|
|
|
NMTstcObjNewData d = {
|
|
|
|
.gtype = gtype,
|
|
|
|
.loop = NULL,
|
|
|
|
};
|
|
|
|
gs_unref_object GObject *obj2 = NULL;
|
2019-11-02 13:15:48 +00:00
|
|
|
|
|
|
|
loop = g_main_loop_new (g_main_context_get_thread_default (), FALSE);
|
|
|
|
d.loop = loop;
|
2020-01-03 07:34:20 +00:00
|
|
|
|
|
|
|
if ( gtype != NM_TYPE_CLIENT
|
|
|
|
|| first_property_name
|
|
|
|
|| nmtst_get_rand_bool ()) {
|
|
|
|
if ( first_property_name
|
|
|
|
|| nmtst_get_rand_bool ())
|
|
|
|
obj2 = g_object_new_valist (gtype, first_property_name, var_args);
|
|
|
|
else
|
|
|
|
obj2 = g_object_new (gtype, NULL);
|
|
|
|
|
|
|
|
g_async_initable_init_async (G_ASYNC_INITABLE (obj2),
|
|
|
|
G_PRIORITY_DEFAULT,
|
|
|
|
NULL,
|
|
|
|
_context_object_new_do_cb,
|
|
|
|
&d);
|
|
|
|
} else {
|
|
|
|
d.call_nm_client_new_async = TRUE;
|
|
|
|
nm_client_new_async (NULL,
|
|
|
|
_context_object_new_do_cb,
|
|
|
|
&d);
|
|
|
|
}
|
2019-11-02 13:15:48 +00:00
|
|
|
g_main_loop_run (loop);
|
2020-01-03 07:34:20 +00:00
|
|
|
obj = d.obj;
|
|
|
|
g_assert (!obj2 || obj == obj2);
|
2019-11-02 13:15:48 +00:00
|
|
|
}
|
|
|
|
|
2020-01-03 07:34:20 +00:00
|
|
|
nmtst_assert_success (G_IS_OBJECT (obj), error);
|
|
|
|
g_assert (G_OBJECT_TYPE (obj) == gtype);
|
|
|
|
return obj;
|
2019-11-02 13:15:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
typedef struct {
|
2020-01-03 07:34:20 +00:00
|
|
|
GType gtype;
|
|
|
|
const char *first_property_name;
|
|
|
|
va_list var_args;
|
2019-11-02 13:15:48 +00:00
|
|
|
GMainLoop *loop;
|
2020-01-03 07:34:20 +00:00
|
|
|
GObject *obj;
|
2019-11-02 13:15:48 +00:00
|
|
|
bool sync;
|
|
|
|
} NewSyncInsideDispatchedData;
|
|
|
|
|
|
|
|
static gboolean
|
2020-01-03 07:34:20 +00:00
|
|
|
_context_object_new_inside_loop_do (gpointer user_data)
|
2019-11-02 13:15:48 +00:00
|
|
|
{
|
|
|
|
NewSyncInsideDispatchedData *d = user_data;
|
|
|
|
|
|
|
|
g_assert (d->loop);
|
2020-01-03 07:34:20 +00:00
|
|
|
g_assert (!d->obj);
|
2019-11-02 13:15:48 +00:00
|
|
|
|
2020-01-03 07:34:20 +00:00
|
|
|
d->obj = nmtstc_context_object_new_valist (d->gtype, d->sync, d->first_property_name, d->var_args);
|
2019-11-02 13:15:48 +00:00
|
|
|
g_main_loop_quit (d->loop);
|
|
|
|
return G_SOURCE_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2020-01-03 07:34:20 +00:00
|
|
|
static GObject *
|
|
|
|
_context_object_new_inside_loop (GType gtype,
|
|
|
|
gboolean sync,
|
|
|
|
const char *first_property_name,
|
|
|
|
va_list var_args)
|
2019-11-02 13:15:48 +00:00
|
|
|
{
|
|
|
|
GMainContext *context = g_main_context_get_thread_default ();
|
|
|
|
nm_auto_unref_gmainloop GMainLoop *loop = g_main_loop_new (context, FALSE);
|
|
|
|
NewSyncInsideDispatchedData d = {
|
2020-01-03 07:34:20 +00:00
|
|
|
.gtype = gtype,
|
|
|
|
.first_property_name = first_property_name,
|
|
|
|
.sync = sync,
|
|
|
|
.loop = loop,
|
2019-11-02 13:15:48 +00:00
|
|
|
};
|
|
|
|
nm_auto_destroy_and_unref_gsource GSource *source = NULL;
|
|
|
|
|
2020-01-03 07:34:20 +00:00
|
|
|
va_copy (d.var_args, var_args);
|
|
|
|
|
2019-11-02 13:15:48 +00:00
|
|
|
source = g_idle_source_new ();
|
2020-01-03 07:34:20 +00:00
|
|
|
g_source_set_callback (source, _context_object_new_inside_loop_do, &d, NULL);
|
2019-11-02 13:15:48 +00:00
|
|
|
g_source_attach (source, context);
|
|
|
|
|
|
|
|
g_main_loop_run (loop);
|
libnm: refactor caching of D-Bus objects in NMClient
No longer use GDBusObjectMangaerClient and gdbus-codegen generated classes
for the NMClient cache. Instead, use GDBusConnection directly and a
custom implementation (NMLDBusObject) for caching D-Bus' ObjectManager
data.
CHANGES
-------
- This is a complete rework. I think the previous implementation was
difficult to understand. There were unfixed bugs and nobody understood
the code well enough to fix them. Maybe somebody out there understood the
code, but I certainly did not. At least nobody provided patches to fix those
issues. I do believe that this implementation is more straightforward and
easier to understand. It removes a lot of layers of code. Whether this claim
of simplicity is true, each reader must decide for himself/herself. Note
that it is still fairly complex.
- There was a lingering performance issue with large number of D-Bus
objects. The patch tries hard that the implementation scales well. Of
course, when we cache N objects that have N-to-M references to other,
we still are fundamentally O(N*M) for runtime and memory consumption (with
M being the number of references between objects). But each part should behave
efficiently and well.
- Play well with GMainContext. libnm code (NMClient) is generally not
thread safe. However, it should work to use multiple instances in
parallel, as long as each access to a NMClient is through the caller's
GMainContext. This follows glib's style and effectively allows to use NMClient
in a multi threaded scenario. This implies to stick to a main context
upon construction and ensure that callbacks are only invoked when
iterating that context. Also, NMClient itself shall never iterate the
caller's context. This also means, libnm must never use g_idle_add() or
g_timeout_add(), as those enqueue sources in the g_main_context_default()
context.
- Get ordering of messages right. All events are consistently enqueued
in a GMainContext and processed strictly in order. For example,
previously "nm-object.c" tried to combine signals and emit them on an
idle handler. That is wrong, signals must be emitted in the right order
and when they happen. Note that when using GInitable's synchronous initialization
to initialize the NMClient instance, NMClient internally still operates fully
asynchronously. In that case NMClient has an internal main context.
- NMClient takes over most of the functionality. When using D-Bus'
ObjectManager interface, one needs to handle basically the entire state
of the D-Bus interface. That cannot be separated well into distinct
parts, and even if you try, you just end up having closely related code
in different source files. Spreading related code does not make it
easier to understand, on the contrary. That means, NMClient is
inherently complex as it contains most of the logic. I think that is
not avoidable, but it's not as bad as it sounds.
- NMClient processes D-Bus messages and state changes in separate steps.
First NMClient unpacks the message (e.g. _dbus_handle_properties_changed()) and
keeps track of the changed data. Then we update the GObject instances
(_dbus_handle_obj_changed_dbus()) without emitting any signals yet. Finally,
we emit all signals and notifications that were collected
(_dbus_handle_changes_commit()). Note that for example during the initial
GetManagedObjects() reply, NMClient receive a large amount of state at once.
But we first apply all the changes to our GObject instances before
emitting any signals. The result is that signals are always emitted in a moment
when the cache is consistent. The unavoidable downside is that when you receive
a property changed signal, possibly many other properties changed
already and more signals are about to be emitted.
- NMDeviceWifi no longer modifies the content of the cache from client side
during poke_wireless_devices_with_rf_status(). The content of the cache
should be determined by D-Bus alone and follow what NetworkManager
service exposes. Local modifications should be avoided.
- This aims to bring no API/ABI change, though it does of course bring
various subtle changes in behavior. Those should be all for the better, but the
goal is not to break any existing clients. This does change internal
(albeit externally visible) API, like dropping NM_OBJECT_DBUS_OBJECT_MANAGER
property and NMObject no longer implementing GInitableIface and GAsyncInitableIface.
- Some uses of gdbus-codegen classes remain in NMVpnPluginOld, NMVpnServicePlugin
and NMSecretAgentOld. These are independent of NMClient/NMObject and
should be reworked separately.
- While we no longer use generated classes from gdbus-codegen, we don't
need more glue code than before. Also before we constructed NMPropertiesInfo and
a had large amount of code to propagate properties from NMDBus* to NMObject.
That got completely reworked, but did not fundamentally change. You still need
about the same effort to create the NMLDBusMetaIface. Not using
generated bindings did not make anything worse (which tells about the
usefulness of generated code, at least in the way it was used).
- NMLDBusMetaIface and other meta data is static and immutable. This
avoids copying them around. Also, macros like NML_DBUS_META_PROPERTY_INIT_U()
have compile time checks to ensure the property types matches. It's pretty hard
to misuse them because it won't compile.
- The meta data now explicitly encodes the expected D-Bus types and
makes sure never to accept wrong data. That would only matter when the
server (accidentally or intentionally) exposes unexpected types on
D-Bus. I don't think that was previously ensured in all cases.
For example, demarshal_generic() only cared about the GObject property
type, it didn't know the expected D-Bus type.
- Previously GDBusObjectManager would sometimes emit warnings (g_log()). Those
probably indicated real bugs. In any case, it prevented us from running CI
with G_DEBUG=fatal-warnings, because there would be just too many
unrelated crashes. Now we log debug messages that can be enabled with
"LIBNM_CLIENT_DEBUG=trace". Some of these messages can also be turned
into g_warning()/g_critical() by setting LIBNM_CLIENT_DEBUG=warning,error.
Together with G_DEBUG=fatal-warnings, this turns them into assertions.
Note that such "assertion failures" might also happen because of a server
bug (or change). Thus these are not common assertions that indicate a bug
in libnm and are thus not armed unless explicitly requested. In our CI we
should now always run with LIBNM_CLIENT_DEBUG=warning,error and
G_DEBUG=fatal-warnings and to catch bugs. Note that currently
NetworkManager has bugs in this regard, so enabling this will result in
assertion failures. That should be fixed first.
- Note that this changes the order in which we emit "notify:devices" and
"device-added" signals. I think it makes the most sense to emit first
"device-removed", then "notify:devices", and finally "device-added"
signals.
This changes behavior for commit 52ae28f6e5bf ('libnm: queue
added/removed signals and suppress uninitialized notifications'),
but I don't think that users should actually rely on the order. Still,
the new order makes the most sense to me.
- In NetworkManager, profiles can be invisible to the user by setting
"connection.permissions". Such profiles would be hidden by NMClient's
nm_client_get_connections() and their "connection-added"/"connection-removed"
signals.
Note that NMActiveConnection's nm_active_connection_get_connection()
and NMDevice's nm_device_get_available_connections() still exposes such
hidden NMRemoteConnection instances. This behavior was preserved.
NUMBERS
-------
I compared 3 versions of libnm.
[1] 962297f9085d, current tip of nm-1-20 branch
[2] 4fad8c7c642e, current master, immediate parent of this patch
[3] this patch
All tests were done on Fedora 31, x86_64, gcc 9.2.1-1.fc31.
The libraries were build with
$ ./contrib/fedora/rpm/build_clean.sh -g -w test -W debug
Note that RPM build already stripped the library.
---
N1) File size of libnm.so.0.1.0 in bytes. There currently seems to be a issue
on Fedora 31 generating wrong ELF notes. Usually, libnm is smaller but
in these tests it had large (and bogus) ELF notes. Anyway, the point
is to show the relative sizes, so it doesn't matter).
[1] 4075552 (102.7%)
[2] 3969624 (100.0%)
[3] 3705208 ( 93.3%)
---
N2) `size /usr/lib64/libnm.so.0.1.0`:
text data bss dec hex filename
[1] 1314569 (102.0%) 69980 ( 94.8%) 10632 ( 80.4%) 1395181 (101.4%) 1549ed /usr/lib64/libnm.so.0.1.0
[2] 1288410 (100.0%) 73796 (100.0%) 13224 (100.0%) 1375430 (100.0%) 14fcc6 /usr/lib64/libnm.so.0.1.0
[3] 1229066 ( 95.4%) 65248 ( 88.4%) 13400 (101.3%) 1307714 ( 95.1%) 13f442 /usr/lib64/libnm.so.0.1.0
---
N3) Performance test with test-client.py. With checkout of [2], run
```
prepare_checkout() {
rm -rf /tmp/nm-test && \
git checkout -B test 4fad8c7c642e && \
git clean -fdx && \
./autogen.sh --prefix=/tmp/nm-test && \
make -j 5 install && \
make -j 5 check-local-clients-tests-test-client
}
prepare_test() {
NM_TEST_REGENERATE=1 NM_TEST_CLIENT_BUILDDIR="/data/src/NetworkManager" NM_TEST_CLIENT_NMCLI_PATH=/usr/bin/nmcli python3 ./clients/tests/test-client.py -v
}
do_test() {
for i in {1..10}; do
NM_TEST_CLIENT_BUILDDIR="/data/src/NetworkManager" NM_TEST_CLIENT_NMCLI_PATH=/usr/bin/nmcli python3 ./clients/tests/test-client.py -v || return -1
done
echo "done!"
}
prepare_checkout
prepare_test
time do_test
```
[1] real 2m14.497s (101.3%) user 5m26.651s (100.3%) sys 1m40.453s (101.4%)
[2] real 2m12.800s (100.0%) user 5m25.619s (100.0%) sys 1m39.065s (100.0%)
[3] real 1m54.915s ( 86.5%) user 4m18.585s ( 79.4%) sys 1m32.066s ( 92.9%)
---
N4) Performance. Run NetworkManager from build [2] and setup a large number
of profiles (551 profiles and 515 devices, mostly unrealized). This
setup is already at the edge of what NetworkManager currently can
handle. Of course, that is a different issue. Here we just check how
long plain `nmcli` takes on the system.
```
do_cleanup() {
for UUID in $(nmcli -g NAME,UUID connection show | sed -n 's/^xx-c-.*:\([^:]\+\)$/\1/p'); do
nmcli connection delete uuid "$UUID"
done
for DEVICE in $(nmcli -g DEVICE device status | grep '^xx-i-'); do
nmcli device delete "$DEVICE"
done
}
do_setup() {
do_cleanup
for i in {1..30}; do
nmcli connection add type bond autoconnect no con-name xx-c-bond-$i ifname xx-i-bond-$i ipv4.method disabled ipv6.method ignore
for j in $(seq $i 30); do
nmcli connection add type vlan autoconnect no con-name xx-c-vlan-$i-$j vlan.id $j ifname xx-i-vlan-$i-$j vlan.parent xx-i-bond-$i ipv4.method disabled ipv6.method ignore
done
done
systemctl restart NetworkManager.service
sleep 5
}
do_test() {
perf stat -r 50 -B nmcli 1>/dev/null
}
do_test
```
[1]
Performance counter stats for 'nmcli' (50 runs):
456.33 msec task-clock:u # 1.093 CPUs utilized ( +- 0.44% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
5,900 page-faults:u # 0.013 M/sec ( +- 0.02% )
1,408,675,453 cycles:u # 3.087 GHz ( +- 0.48% )
1,594,741,060 instructions:u # 1.13 insn per cycle ( +- 0.02% )
368,744,018 branches:u # 808.061 M/sec ( +- 0.02% )
4,566,058 branch-misses:u # 1.24% of all branches ( +- 0.76% )
0.41761 +- 0.00282 seconds time elapsed ( +- 0.68% )
[2]
Performance counter stats for 'nmcli' (50 runs):
477.99 msec task-clock:u # 1.088 CPUs utilized ( +- 0.36% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
5,948 page-faults:u # 0.012 M/sec ( +- 0.03% )
1,471,133,482 cycles:u # 3.078 GHz ( +- 0.36% )
1,655,275,369 instructions:u # 1.13 insn per cycle ( +- 0.02% )
382,595,152 branches:u # 800.433 M/sec ( +- 0.02% )
4,746,070 branch-misses:u # 1.24% of all branches ( +- 0.49% )
0.43923 +- 0.00242 seconds time elapsed ( +- 0.55% )
[3]
Performance counter stats for 'nmcli' (50 runs):
352.36 msec task-clock:u # 1.027 CPUs utilized ( +- 0.32% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
4,790 page-faults:u # 0.014 M/sec ( +- 0.26% )
1,092,341,186 cycles:u # 3.100 GHz ( +- 0.26% )
1,209,045,283 instructions:u # 1.11 insn per cycle ( +- 0.02% )
281,708,462 branches:u # 799.499 M/sec ( +- 0.01% )
3,101,031 branch-misses:u # 1.10% of all branches ( +- 0.61% )
0.34296 +- 0.00120 seconds time elapsed ( +- 0.35% )
---
N5) same setup as N4), but run `PAGER= /bin/time -v nmcli`:
[1]
Command being timed: "nmcli"
User time (seconds): 0.42
System time (seconds): 0.04
Percent of CPU this job got: 107%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.43
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 34456
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 0
Minor (reclaiming a frame) page faults: 6128
Voluntary context switches: 1298
Involuntary context switches: 1106
Swaps: 0
File system inputs: 0
File system outputs: 0
Socket messages sent: 0
Socket messages received: 0
Signals delivered: 0
Page size (bytes): 4096
Exit status: 0
[2]
Command being timed: "nmcli"
User time (seconds): 0.44
System time (seconds): 0.04
Percent of CPU this job got: 108%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.44
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 34452
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 0
Minor (reclaiming a frame) page faults: 6169
Voluntary context switches: 1849
Involuntary context switches: 142
Swaps: 0
File system inputs: 0
File system outputs: 0
Socket messages sent: 0
Socket messages received: 0
Signals delivered: 0
Page size (bytes): 4096
Exit status: 0
[3]
Command being timed: "nmcli"
User time (seconds): 0.32
System time (seconds): 0.02
Percent of CPU this job got: 102%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.34
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 29196
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 0
Minor (reclaiming a frame) page faults: 5059
Voluntary context switches: 919
Involuntary context switches: 685
Swaps: 0
File system inputs: 0
File system outputs: 0
Socket messages sent: 0
Socket messages received: 0
Signals delivered: 0
Page size (bytes): 4096
Exit status: 0
---
N6) same setup as N4), but run `nmcli monitor` and look at `ps aux` for
the RSS size.
USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND
[1] me 1492900 21.0 0.2 461348 33248 pts/10 Sl+ 15:02 0:00 nmcli monitor
[2] me 1490721 5.0 0.2 461496 33548 pts/10 Sl+ 15:00 0:00 nmcli monitor
[3] me 1495801 16.5 0.1 459476 28692 pts/10 Sl+ 15:04 0:00 nmcli monitor
2019-10-30 10:42:58 +00:00
|
|
|
|
2020-01-03 07:34:20 +00:00
|
|
|
va_end (d.var_args);
|
libnm: refactor caching of D-Bus objects in NMClient
No longer use GDBusObjectMangaerClient and gdbus-codegen generated classes
for the NMClient cache. Instead, use GDBusConnection directly and a
custom implementation (NMLDBusObject) for caching D-Bus' ObjectManager
data.
CHANGES
-------
- This is a complete rework. I think the previous implementation was
difficult to understand. There were unfixed bugs and nobody understood
the code well enough to fix them. Maybe somebody out there understood the
code, but I certainly did not. At least nobody provided patches to fix those
issues. I do believe that this implementation is more straightforward and
easier to understand. It removes a lot of layers of code. Whether this claim
of simplicity is true, each reader must decide for himself/herself. Note
that it is still fairly complex.
- There was a lingering performance issue with large number of D-Bus
objects. The patch tries hard that the implementation scales well. Of
course, when we cache N objects that have N-to-M references to other,
we still are fundamentally O(N*M) for runtime and memory consumption (with
M being the number of references between objects). But each part should behave
efficiently and well.
- Play well with GMainContext. libnm code (NMClient) is generally not
thread safe. However, it should work to use multiple instances in
parallel, as long as each access to a NMClient is through the caller's
GMainContext. This follows glib's style and effectively allows to use NMClient
in a multi threaded scenario. This implies to stick to a main context
upon construction and ensure that callbacks are only invoked when
iterating that context. Also, NMClient itself shall never iterate the
caller's context. This also means, libnm must never use g_idle_add() or
g_timeout_add(), as those enqueue sources in the g_main_context_default()
context.
- Get ordering of messages right. All events are consistently enqueued
in a GMainContext and processed strictly in order. For example,
previously "nm-object.c" tried to combine signals and emit them on an
idle handler. That is wrong, signals must be emitted in the right order
and when they happen. Note that when using GInitable's synchronous initialization
to initialize the NMClient instance, NMClient internally still operates fully
asynchronously. In that case NMClient has an internal main context.
- NMClient takes over most of the functionality. When using D-Bus'
ObjectManager interface, one needs to handle basically the entire state
of the D-Bus interface. That cannot be separated well into distinct
parts, and even if you try, you just end up having closely related code
in different source files. Spreading related code does not make it
easier to understand, on the contrary. That means, NMClient is
inherently complex as it contains most of the logic. I think that is
not avoidable, but it's not as bad as it sounds.
- NMClient processes D-Bus messages and state changes in separate steps.
First NMClient unpacks the message (e.g. _dbus_handle_properties_changed()) and
keeps track of the changed data. Then we update the GObject instances
(_dbus_handle_obj_changed_dbus()) without emitting any signals yet. Finally,
we emit all signals and notifications that were collected
(_dbus_handle_changes_commit()). Note that for example during the initial
GetManagedObjects() reply, NMClient receive a large amount of state at once.
But we first apply all the changes to our GObject instances before
emitting any signals. The result is that signals are always emitted in a moment
when the cache is consistent. The unavoidable downside is that when you receive
a property changed signal, possibly many other properties changed
already and more signals are about to be emitted.
- NMDeviceWifi no longer modifies the content of the cache from client side
during poke_wireless_devices_with_rf_status(). The content of the cache
should be determined by D-Bus alone and follow what NetworkManager
service exposes. Local modifications should be avoided.
- This aims to bring no API/ABI change, though it does of course bring
various subtle changes in behavior. Those should be all for the better, but the
goal is not to break any existing clients. This does change internal
(albeit externally visible) API, like dropping NM_OBJECT_DBUS_OBJECT_MANAGER
property and NMObject no longer implementing GInitableIface and GAsyncInitableIface.
- Some uses of gdbus-codegen classes remain in NMVpnPluginOld, NMVpnServicePlugin
and NMSecretAgentOld. These are independent of NMClient/NMObject and
should be reworked separately.
- While we no longer use generated classes from gdbus-codegen, we don't
need more glue code than before. Also before we constructed NMPropertiesInfo and
a had large amount of code to propagate properties from NMDBus* to NMObject.
That got completely reworked, but did not fundamentally change. You still need
about the same effort to create the NMLDBusMetaIface. Not using
generated bindings did not make anything worse (which tells about the
usefulness of generated code, at least in the way it was used).
- NMLDBusMetaIface and other meta data is static and immutable. This
avoids copying them around. Also, macros like NML_DBUS_META_PROPERTY_INIT_U()
have compile time checks to ensure the property types matches. It's pretty hard
to misuse them because it won't compile.
- The meta data now explicitly encodes the expected D-Bus types and
makes sure never to accept wrong data. That would only matter when the
server (accidentally or intentionally) exposes unexpected types on
D-Bus. I don't think that was previously ensured in all cases.
For example, demarshal_generic() only cared about the GObject property
type, it didn't know the expected D-Bus type.
- Previously GDBusObjectManager would sometimes emit warnings (g_log()). Those
probably indicated real bugs. In any case, it prevented us from running CI
with G_DEBUG=fatal-warnings, because there would be just too many
unrelated crashes. Now we log debug messages that can be enabled with
"LIBNM_CLIENT_DEBUG=trace". Some of these messages can also be turned
into g_warning()/g_critical() by setting LIBNM_CLIENT_DEBUG=warning,error.
Together with G_DEBUG=fatal-warnings, this turns them into assertions.
Note that such "assertion failures" might also happen because of a server
bug (or change). Thus these are not common assertions that indicate a bug
in libnm and are thus not armed unless explicitly requested. In our CI we
should now always run with LIBNM_CLIENT_DEBUG=warning,error and
G_DEBUG=fatal-warnings and to catch bugs. Note that currently
NetworkManager has bugs in this regard, so enabling this will result in
assertion failures. That should be fixed first.
- Note that this changes the order in which we emit "notify:devices" and
"device-added" signals. I think it makes the most sense to emit first
"device-removed", then "notify:devices", and finally "device-added"
signals.
This changes behavior for commit 52ae28f6e5bf ('libnm: queue
added/removed signals and suppress uninitialized notifications'),
but I don't think that users should actually rely on the order. Still,
the new order makes the most sense to me.
- In NetworkManager, profiles can be invisible to the user by setting
"connection.permissions". Such profiles would be hidden by NMClient's
nm_client_get_connections() and their "connection-added"/"connection-removed"
signals.
Note that NMActiveConnection's nm_active_connection_get_connection()
and NMDevice's nm_device_get_available_connections() still exposes such
hidden NMRemoteConnection instances. This behavior was preserved.
NUMBERS
-------
I compared 3 versions of libnm.
[1] 962297f9085d, current tip of nm-1-20 branch
[2] 4fad8c7c642e, current master, immediate parent of this patch
[3] this patch
All tests were done on Fedora 31, x86_64, gcc 9.2.1-1.fc31.
The libraries were build with
$ ./contrib/fedora/rpm/build_clean.sh -g -w test -W debug
Note that RPM build already stripped the library.
---
N1) File size of libnm.so.0.1.0 in bytes. There currently seems to be a issue
on Fedora 31 generating wrong ELF notes. Usually, libnm is smaller but
in these tests it had large (and bogus) ELF notes. Anyway, the point
is to show the relative sizes, so it doesn't matter).
[1] 4075552 (102.7%)
[2] 3969624 (100.0%)
[3] 3705208 ( 93.3%)
---
N2) `size /usr/lib64/libnm.so.0.1.0`:
text data bss dec hex filename
[1] 1314569 (102.0%) 69980 ( 94.8%) 10632 ( 80.4%) 1395181 (101.4%) 1549ed /usr/lib64/libnm.so.0.1.0
[2] 1288410 (100.0%) 73796 (100.0%) 13224 (100.0%) 1375430 (100.0%) 14fcc6 /usr/lib64/libnm.so.0.1.0
[3] 1229066 ( 95.4%) 65248 ( 88.4%) 13400 (101.3%) 1307714 ( 95.1%) 13f442 /usr/lib64/libnm.so.0.1.0
---
N3) Performance test with test-client.py. With checkout of [2], run
```
prepare_checkout() {
rm -rf /tmp/nm-test && \
git checkout -B test 4fad8c7c642e && \
git clean -fdx && \
./autogen.sh --prefix=/tmp/nm-test && \
make -j 5 install && \
make -j 5 check-local-clients-tests-test-client
}
prepare_test() {
NM_TEST_REGENERATE=1 NM_TEST_CLIENT_BUILDDIR="/data/src/NetworkManager" NM_TEST_CLIENT_NMCLI_PATH=/usr/bin/nmcli python3 ./clients/tests/test-client.py -v
}
do_test() {
for i in {1..10}; do
NM_TEST_CLIENT_BUILDDIR="/data/src/NetworkManager" NM_TEST_CLIENT_NMCLI_PATH=/usr/bin/nmcli python3 ./clients/tests/test-client.py -v || return -1
done
echo "done!"
}
prepare_checkout
prepare_test
time do_test
```
[1] real 2m14.497s (101.3%) user 5m26.651s (100.3%) sys 1m40.453s (101.4%)
[2] real 2m12.800s (100.0%) user 5m25.619s (100.0%) sys 1m39.065s (100.0%)
[3] real 1m54.915s ( 86.5%) user 4m18.585s ( 79.4%) sys 1m32.066s ( 92.9%)
---
N4) Performance. Run NetworkManager from build [2] and setup a large number
of profiles (551 profiles and 515 devices, mostly unrealized). This
setup is already at the edge of what NetworkManager currently can
handle. Of course, that is a different issue. Here we just check how
long plain `nmcli` takes on the system.
```
do_cleanup() {
for UUID in $(nmcli -g NAME,UUID connection show | sed -n 's/^xx-c-.*:\([^:]\+\)$/\1/p'); do
nmcli connection delete uuid "$UUID"
done
for DEVICE in $(nmcli -g DEVICE device status | grep '^xx-i-'); do
nmcli device delete "$DEVICE"
done
}
do_setup() {
do_cleanup
for i in {1..30}; do
nmcli connection add type bond autoconnect no con-name xx-c-bond-$i ifname xx-i-bond-$i ipv4.method disabled ipv6.method ignore
for j in $(seq $i 30); do
nmcli connection add type vlan autoconnect no con-name xx-c-vlan-$i-$j vlan.id $j ifname xx-i-vlan-$i-$j vlan.parent xx-i-bond-$i ipv4.method disabled ipv6.method ignore
done
done
systemctl restart NetworkManager.service
sleep 5
}
do_test() {
perf stat -r 50 -B nmcli 1>/dev/null
}
do_test
```
[1]
Performance counter stats for 'nmcli' (50 runs):
456.33 msec task-clock:u # 1.093 CPUs utilized ( +- 0.44% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
5,900 page-faults:u # 0.013 M/sec ( +- 0.02% )
1,408,675,453 cycles:u # 3.087 GHz ( +- 0.48% )
1,594,741,060 instructions:u # 1.13 insn per cycle ( +- 0.02% )
368,744,018 branches:u # 808.061 M/sec ( +- 0.02% )
4,566,058 branch-misses:u # 1.24% of all branches ( +- 0.76% )
0.41761 +- 0.00282 seconds time elapsed ( +- 0.68% )
[2]
Performance counter stats for 'nmcli' (50 runs):
477.99 msec task-clock:u # 1.088 CPUs utilized ( +- 0.36% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
5,948 page-faults:u # 0.012 M/sec ( +- 0.03% )
1,471,133,482 cycles:u # 3.078 GHz ( +- 0.36% )
1,655,275,369 instructions:u # 1.13 insn per cycle ( +- 0.02% )
382,595,152 branches:u # 800.433 M/sec ( +- 0.02% )
4,746,070 branch-misses:u # 1.24% of all branches ( +- 0.49% )
0.43923 +- 0.00242 seconds time elapsed ( +- 0.55% )
[3]
Performance counter stats for 'nmcli' (50 runs):
352.36 msec task-clock:u # 1.027 CPUs utilized ( +- 0.32% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
4,790 page-faults:u # 0.014 M/sec ( +- 0.26% )
1,092,341,186 cycles:u # 3.100 GHz ( +- 0.26% )
1,209,045,283 instructions:u # 1.11 insn per cycle ( +- 0.02% )
281,708,462 branches:u # 799.499 M/sec ( +- 0.01% )
3,101,031 branch-misses:u # 1.10% of all branches ( +- 0.61% )
0.34296 +- 0.00120 seconds time elapsed ( +- 0.35% )
---
N5) same setup as N4), but run `PAGER= /bin/time -v nmcli`:
[1]
Command being timed: "nmcli"
User time (seconds): 0.42
System time (seconds): 0.04
Percent of CPU this job got: 107%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.43
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 34456
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 0
Minor (reclaiming a frame) page faults: 6128
Voluntary context switches: 1298
Involuntary context switches: 1106
Swaps: 0
File system inputs: 0
File system outputs: 0
Socket messages sent: 0
Socket messages received: 0
Signals delivered: 0
Page size (bytes): 4096
Exit status: 0
[2]
Command being timed: "nmcli"
User time (seconds): 0.44
System time (seconds): 0.04
Percent of CPU this job got: 108%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.44
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 34452
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 0
Minor (reclaiming a frame) page faults: 6169
Voluntary context switches: 1849
Involuntary context switches: 142
Swaps: 0
File system inputs: 0
File system outputs: 0
Socket messages sent: 0
Socket messages received: 0
Signals delivered: 0
Page size (bytes): 4096
Exit status: 0
[3]
Command being timed: "nmcli"
User time (seconds): 0.32
System time (seconds): 0.02
Percent of CPU this job got: 102%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.34
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 29196
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 0
Minor (reclaiming a frame) page faults: 5059
Voluntary context switches: 919
Involuntary context switches: 685
Swaps: 0
File system inputs: 0
File system outputs: 0
Socket messages sent: 0
Socket messages received: 0
Signals delivered: 0
Page size (bytes): 4096
Exit status: 0
---
N6) same setup as N4), but run `nmcli monitor` and look at `ps aux` for
the RSS size.
USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND
[1] me 1492900 21.0 0.2 461348 33248 pts/10 Sl+ 15:02 0:00 nmcli monitor
[2] me 1490721 5.0 0.2 461496 33548 pts/10 Sl+ 15:00 0:00 nmcli monitor
[3] me 1495801 16.5 0.1 459476 28692 pts/10 Sl+ 15:04 0:00 nmcli monitor
2019-10-30 10:42:58 +00:00
|
|
|
|
2020-01-03 07:34:20 +00:00
|
|
|
g_assert (G_IS_OBJECT (d.obj));
|
|
|
|
g_assert (G_OBJECT_TYPE (d.obj) == gtype);
|
|
|
|
return d.obj;
|
libnm: refactor caching of D-Bus objects in NMClient
No longer use GDBusObjectMangaerClient and gdbus-codegen generated classes
for the NMClient cache. Instead, use GDBusConnection directly and a
custom implementation (NMLDBusObject) for caching D-Bus' ObjectManager
data.
CHANGES
-------
- This is a complete rework. I think the previous implementation was
difficult to understand. There were unfixed bugs and nobody understood
the code well enough to fix them. Maybe somebody out there understood the
code, but I certainly did not. At least nobody provided patches to fix those
issues. I do believe that this implementation is more straightforward and
easier to understand. It removes a lot of layers of code. Whether this claim
of simplicity is true, each reader must decide for himself/herself. Note
that it is still fairly complex.
- There was a lingering performance issue with large number of D-Bus
objects. The patch tries hard that the implementation scales well. Of
course, when we cache N objects that have N-to-M references to other,
we still are fundamentally O(N*M) for runtime and memory consumption (with
M being the number of references between objects). But each part should behave
efficiently and well.
- Play well with GMainContext. libnm code (NMClient) is generally not
thread safe. However, it should work to use multiple instances in
parallel, as long as each access to a NMClient is through the caller's
GMainContext. This follows glib's style and effectively allows to use NMClient
in a multi threaded scenario. This implies to stick to a main context
upon construction and ensure that callbacks are only invoked when
iterating that context. Also, NMClient itself shall never iterate the
caller's context. This also means, libnm must never use g_idle_add() or
g_timeout_add(), as those enqueue sources in the g_main_context_default()
context.
- Get ordering of messages right. All events are consistently enqueued
in a GMainContext and processed strictly in order. For example,
previously "nm-object.c" tried to combine signals and emit them on an
idle handler. That is wrong, signals must be emitted in the right order
and when they happen. Note that when using GInitable's synchronous initialization
to initialize the NMClient instance, NMClient internally still operates fully
asynchronously. In that case NMClient has an internal main context.
- NMClient takes over most of the functionality. When using D-Bus'
ObjectManager interface, one needs to handle basically the entire state
of the D-Bus interface. That cannot be separated well into distinct
parts, and even if you try, you just end up having closely related code
in different source files. Spreading related code does not make it
easier to understand, on the contrary. That means, NMClient is
inherently complex as it contains most of the logic. I think that is
not avoidable, but it's not as bad as it sounds.
- NMClient processes D-Bus messages and state changes in separate steps.
First NMClient unpacks the message (e.g. _dbus_handle_properties_changed()) and
keeps track of the changed data. Then we update the GObject instances
(_dbus_handle_obj_changed_dbus()) without emitting any signals yet. Finally,
we emit all signals and notifications that were collected
(_dbus_handle_changes_commit()). Note that for example during the initial
GetManagedObjects() reply, NMClient receive a large amount of state at once.
But we first apply all the changes to our GObject instances before
emitting any signals. The result is that signals are always emitted in a moment
when the cache is consistent. The unavoidable downside is that when you receive
a property changed signal, possibly many other properties changed
already and more signals are about to be emitted.
- NMDeviceWifi no longer modifies the content of the cache from client side
during poke_wireless_devices_with_rf_status(). The content of the cache
should be determined by D-Bus alone and follow what NetworkManager
service exposes. Local modifications should be avoided.
- This aims to bring no API/ABI change, though it does of course bring
various subtle changes in behavior. Those should be all for the better, but the
goal is not to break any existing clients. This does change internal
(albeit externally visible) API, like dropping NM_OBJECT_DBUS_OBJECT_MANAGER
property and NMObject no longer implementing GInitableIface and GAsyncInitableIface.
- Some uses of gdbus-codegen classes remain in NMVpnPluginOld, NMVpnServicePlugin
and NMSecretAgentOld. These are independent of NMClient/NMObject and
should be reworked separately.
- While we no longer use generated classes from gdbus-codegen, we don't
need more glue code than before. Also before we constructed NMPropertiesInfo and
a had large amount of code to propagate properties from NMDBus* to NMObject.
That got completely reworked, but did not fundamentally change. You still need
about the same effort to create the NMLDBusMetaIface. Not using
generated bindings did not make anything worse (which tells about the
usefulness of generated code, at least in the way it was used).
- NMLDBusMetaIface and other meta data is static and immutable. This
avoids copying them around. Also, macros like NML_DBUS_META_PROPERTY_INIT_U()
have compile time checks to ensure the property types matches. It's pretty hard
to misuse them because it won't compile.
- The meta data now explicitly encodes the expected D-Bus types and
makes sure never to accept wrong data. That would only matter when the
server (accidentally or intentionally) exposes unexpected types on
D-Bus. I don't think that was previously ensured in all cases.
For example, demarshal_generic() only cared about the GObject property
type, it didn't know the expected D-Bus type.
- Previously GDBusObjectManager would sometimes emit warnings (g_log()). Those
probably indicated real bugs. In any case, it prevented us from running CI
with G_DEBUG=fatal-warnings, because there would be just too many
unrelated crashes. Now we log debug messages that can be enabled with
"LIBNM_CLIENT_DEBUG=trace". Some of these messages can also be turned
into g_warning()/g_critical() by setting LIBNM_CLIENT_DEBUG=warning,error.
Together with G_DEBUG=fatal-warnings, this turns them into assertions.
Note that such "assertion failures" might also happen because of a server
bug (or change). Thus these are not common assertions that indicate a bug
in libnm and are thus not armed unless explicitly requested. In our CI we
should now always run with LIBNM_CLIENT_DEBUG=warning,error and
G_DEBUG=fatal-warnings and to catch bugs. Note that currently
NetworkManager has bugs in this regard, so enabling this will result in
assertion failures. That should be fixed first.
- Note that this changes the order in which we emit "notify:devices" and
"device-added" signals. I think it makes the most sense to emit first
"device-removed", then "notify:devices", and finally "device-added"
signals.
This changes behavior for commit 52ae28f6e5bf ('libnm: queue
added/removed signals and suppress uninitialized notifications'),
but I don't think that users should actually rely on the order. Still,
the new order makes the most sense to me.
- In NetworkManager, profiles can be invisible to the user by setting
"connection.permissions". Such profiles would be hidden by NMClient's
nm_client_get_connections() and their "connection-added"/"connection-removed"
signals.
Note that NMActiveConnection's nm_active_connection_get_connection()
and NMDevice's nm_device_get_available_connections() still exposes such
hidden NMRemoteConnection instances. This behavior was preserved.
NUMBERS
-------
I compared 3 versions of libnm.
[1] 962297f9085d, current tip of nm-1-20 branch
[2] 4fad8c7c642e, current master, immediate parent of this patch
[3] this patch
All tests were done on Fedora 31, x86_64, gcc 9.2.1-1.fc31.
The libraries were build with
$ ./contrib/fedora/rpm/build_clean.sh -g -w test -W debug
Note that RPM build already stripped the library.
---
N1) File size of libnm.so.0.1.0 in bytes. There currently seems to be a issue
on Fedora 31 generating wrong ELF notes. Usually, libnm is smaller but
in these tests it had large (and bogus) ELF notes. Anyway, the point
is to show the relative sizes, so it doesn't matter).
[1] 4075552 (102.7%)
[2] 3969624 (100.0%)
[3] 3705208 ( 93.3%)
---
N2) `size /usr/lib64/libnm.so.0.1.0`:
text data bss dec hex filename
[1] 1314569 (102.0%) 69980 ( 94.8%) 10632 ( 80.4%) 1395181 (101.4%) 1549ed /usr/lib64/libnm.so.0.1.0
[2] 1288410 (100.0%) 73796 (100.0%) 13224 (100.0%) 1375430 (100.0%) 14fcc6 /usr/lib64/libnm.so.0.1.0
[3] 1229066 ( 95.4%) 65248 ( 88.4%) 13400 (101.3%) 1307714 ( 95.1%) 13f442 /usr/lib64/libnm.so.0.1.0
---
N3) Performance test with test-client.py. With checkout of [2], run
```
prepare_checkout() {
rm -rf /tmp/nm-test && \
git checkout -B test 4fad8c7c642e && \
git clean -fdx && \
./autogen.sh --prefix=/tmp/nm-test && \
make -j 5 install && \
make -j 5 check-local-clients-tests-test-client
}
prepare_test() {
NM_TEST_REGENERATE=1 NM_TEST_CLIENT_BUILDDIR="/data/src/NetworkManager" NM_TEST_CLIENT_NMCLI_PATH=/usr/bin/nmcli python3 ./clients/tests/test-client.py -v
}
do_test() {
for i in {1..10}; do
NM_TEST_CLIENT_BUILDDIR="/data/src/NetworkManager" NM_TEST_CLIENT_NMCLI_PATH=/usr/bin/nmcli python3 ./clients/tests/test-client.py -v || return -1
done
echo "done!"
}
prepare_checkout
prepare_test
time do_test
```
[1] real 2m14.497s (101.3%) user 5m26.651s (100.3%) sys 1m40.453s (101.4%)
[2] real 2m12.800s (100.0%) user 5m25.619s (100.0%) sys 1m39.065s (100.0%)
[3] real 1m54.915s ( 86.5%) user 4m18.585s ( 79.4%) sys 1m32.066s ( 92.9%)
---
N4) Performance. Run NetworkManager from build [2] and setup a large number
of profiles (551 profiles and 515 devices, mostly unrealized). This
setup is already at the edge of what NetworkManager currently can
handle. Of course, that is a different issue. Here we just check how
long plain `nmcli` takes on the system.
```
do_cleanup() {
for UUID in $(nmcli -g NAME,UUID connection show | sed -n 's/^xx-c-.*:\([^:]\+\)$/\1/p'); do
nmcli connection delete uuid "$UUID"
done
for DEVICE in $(nmcli -g DEVICE device status | grep '^xx-i-'); do
nmcli device delete "$DEVICE"
done
}
do_setup() {
do_cleanup
for i in {1..30}; do
nmcli connection add type bond autoconnect no con-name xx-c-bond-$i ifname xx-i-bond-$i ipv4.method disabled ipv6.method ignore
for j in $(seq $i 30); do
nmcli connection add type vlan autoconnect no con-name xx-c-vlan-$i-$j vlan.id $j ifname xx-i-vlan-$i-$j vlan.parent xx-i-bond-$i ipv4.method disabled ipv6.method ignore
done
done
systemctl restart NetworkManager.service
sleep 5
}
do_test() {
perf stat -r 50 -B nmcli 1>/dev/null
}
do_test
```
[1]
Performance counter stats for 'nmcli' (50 runs):
456.33 msec task-clock:u # 1.093 CPUs utilized ( +- 0.44% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
5,900 page-faults:u # 0.013 M/sec ( +- 0.02% )
1,408,675,453 cycles:u # 3.087 GHz ( +- 0.48% )
1,594,741,060 instructions:u # 1.13 insn per cycle ( +- 0.02% )
368,744,018 branches:u # 808.061 M/sec ( +- 0.02% )
4,566,058 branch-misses:u # 1.24% of all branches ( +- 0.76% )
0.41761 +- 0.00282 seconds time elapsed ( +- 0.68% )
[2]
Performance counter stats for 'nmcli' (50 runs):
477.99 msec task-clock:u # 1.088 CPUs utilized ( +- 0.36% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
5,948 page-faults:u # 0.012 M/sec ( +- 0.03% )
1,471,133,482 cycles:u # 3.078 GHz ( +- 0.36% )
1,655,275,369 instructions:u # 1.13 insn per cycle ( +- 0.02% )
382,595,152 branches:u # 800.433 M/sec ( +- 0.02% )
4,746,070 branch-misses:u # 1.24% of all branches ( +- 0.49% )
0.43923 +- 0.00242 seconds time elapsed ( +- 0.55% )
[3]
Performance counter stats for 'nmcli' (50 runs):
352.36 msec task-clock:u # 1.027 CPUs utilized ( +- 0.32% )
0 context-switches:u # 0.000 K/sec
0 cpu-migrations:u # 0.000 K/sec
4,790 page-faults:u # 0.014 M/sec ( +- 0.26% )
1,092,341,186 cycles:u # 3.100 GHz ( +- 0.26% )
1,209,045,283 instructions:u # 1.11 insn per cycle ( +- 0.02% )
281,708,462 branches:u # 799.499 M/sec ( +- 0.01% )
3,101,031 branch-misses:u # 1.10% of all branches ( +- 0.61% )
0.34296 +- 0.00120 seconds time elapsed ( +- 0.35% )
---
N5) same setup as N4), but run `PAGER= /bin/time -v nmcli`:
[1]
Command being timed: "nmcli"
User time (seconds): 0.42
System time (seconds): 0.04
Percent of CPU this job got: 107%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.43
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 34456
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 0
Minor (reclaiming a frame) page faults: 6128
Voluntary context switches: 1298
Involuntary context switches: 1106
Swaps: 0
File system inputs: 0
File system outputs: 0
Socket messages sent: 0
Socket messages received: 0
Signals delivered: 0
Page size (bytes): 4096
Exit status: 0
[2]
Command being timed: "nmcli"
User time (seconds): 0.44
System time (seconds): 0.04
Percent of CPU this job got: 108%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.44
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 34452
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 0
Minor (reclaiming a frame) page faults: 6169
Voluntary context switches: 1849
Involuntary context switches: 142
Swaps: 0
File system inputs: 0
File system outputs: 0
Socket messages sent: 0
Socket messages received: 0
Signals delivered: 0
Page size (bytes): 4096
Exit status: 0
[3]
Command being timed: "nmcli"
User time (seconds): 0.32
System time (seconds): 0.02
Percent of CPU this job got: 102%
Elapsed (wall clock) time (h:mm:ss or m:ss): 0:00.34
Average shared text size (kbytes): 0
Average unshared data size (kbytes): 0
Average stack size (kbytes): 0
Average total size (kbytes): 0
Maximum resident set size (kbytes): 29196
Average resident set size (kbytes): 0
Major (requiring I/O) page faults: 0
Minor (reclaiming a frame) page faults: 5059
Voluntary context switches: 919
Involuntary context switches: 685
Swaps: 0
File system inputs: 0
File system outputs: 0
Socket messages sent: 0
Socket messages received: 0
Signals delivered: 0
Page size (bytes): 4096
Exit status: 0
---
N6) same setup as N4), but run `nmcli monitor` and look at `ps aux` for
the RSS size.
USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND
[1] me 1492900 21.0 0.2 461348 33248 pts/10 Sl+ 15:02 0:00 nmcli monitor
[2] me 1490721 5.0 0.2 461496 33548 pts/10 Sl+ 15:00 0:00 nmcli monitor
[3] me 1495801 16.5 0.1 459476 28692 pts/10 Sl+ 15:04 0:00 nmcli monitor
2019-10-30 10:42:58 +00:00
|
|
|
}
|
|
|
|
|
2020-01-03 07:34:20 +00:00
|
|
|
gpointer
|
|
|
|
nmtstc_context_object_new_valist (GType gtype,
|
|
|
|
gboolean allow_iterate_main_context,
|
|
|
|
const char *first_property_name,
|
|
|
|
va_list var_args)
|
2019-11-02 13:15:48 +00:00
|
|
|
{
|
|
|
|
gboolean inside_loop;
|
|
|
|
gboolean sync;
|
|
|
|
|
|
|
|
if (!allow_iterate_main_context) {
|
|
|
|
sync = TRUE;
|
|
|
|
inside_loop = FALSE;
|
|
|
|
} else {
|
|
|
|
/* The caller allows to iterate the main context. That that point,
|
|
|
|
* we can both use the synchronous and the asynchronous initialization,
|
|
|
|
* both should yield the same result. Choose one randomly. */
|
|
|
|
sync = nmtst_get_rand_bool ();
|
|
|
|
inside_loop = ((nmtst_get_rand_uint32 () % 3) == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (inside_loop) {
|
2020-01-03 07:34:20 +00:00
|
|
|
/* Create the obj on an idle handler of the current context.
|
2019-11-02 13:15:48 +00:00
|
|
|
* In practice, it should make no difference, which this check
|
|
|
|
* tries to prove. */
|
2020-01-03 07:34:20 +00:00
|
|
|
return _context_object_new_inside_loop (gtype, sync, first_property_name, var_args);
|
2019-11-02 13:15:48 +00:00
|
|
|
}
|
|
|
|
|
2020-01-03 07:34:20 +00:00
|
|
|
return _context_object_new_do (gtype, sync, first_property_name, var_args);
|
|
|
|
}
|
|
|
|
|
|
|
|
gpointer
|
|
|
|
nmtstc_context_object_new (GType gtype,
|
|
|
|
gboolean allow_iterate_main_context,
|
|
|
|
const char *first_property_name,
|
|
|
|
...)
|
|
|
|
{
|
|
|
|
GObject *obj;
|
|
|
|
va_list var_args;
|
|
|
|
|
|
|
|
va_start (var_args, first_property_name);
|
|
|
|
obj = nmtstc_context_object_new_valist (gtype, allow_iterate_main_context, first_property_name, var_args);
|
|
|
|
va_end (var_args);
|
|
|
|
return obj;
|
2019-11-02 13:15:48 +00:00
|
|
|
}
|