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

device: after stage1 call stage2 synchronously

Browse source 
We know we are ready and in a situation where we can handle state changes.
Don't schedule stage2 in an idle handler, just invoke it directly.
This commit is contained in:
Thomas Haller 2019-08-22 13:36:29 +02:00
parent 5b677d5a3b
commit 79952b6296
1 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -683,6 +683,8 @@ static void (*const activate_stage4_ip_config_timeout_x[2]) (NMDevice *self) = {
static void sriov_op_cb (GError *error, gpointer user_data);
static void activate_stage2_device_config (NMDevice *self);
static void activate_stage5_ip_config_result_4 (NMDevice *self);
static void activate_stage5_ip_config_result_6 (NMDevice *self);
@ -6257,6 +6259,36 @@ activation_source_schedule (NMDevice *self, ActivationHandleFunc func, int addr_
priv->activation_source_id_x[IS_IPv4] = new_id;
}
static void
activation_source_invoke_sync (NMDevice *self, ActivationHandleFunc func, int addr_family)
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
const gboolean IS_IPv4 = (addr_family == AF_INET);
if (priv->activation_source_id_x[IS_IPv4] == 0) {
_LOGD (LOGD_DEVICE, "activation-stage: synchronously invoke %s,v%c",
_activation_func_to_string (func),
nm_utils_addr_family_to_char (addr_family));
} else if (priv->activation_source_func_x[IS_IPv4] == func) {
_LOGD (LOGD_DEVICE, "activation-stage: synchronously invoke %s,v%c which was already scheduled (id %u)",
_activation_func_to_string (func),
nm_utils_addr_family_to_char (addr_family),
priv->activation_source_id_x[IS_IPv4]);
} else {
_LOGD (LOGD_DEVICE, "activation-stage: synchronously invoke %s,v%c which replaces %s,v%c (id %u)",
_activation_func_to_string (func),
nm_utils_addr_family_to_char (addr_family),
_activation_func_to_string (priv->activation_source_func_x[IS_IPv4]),
nm_utils_addr_family_to_char (addr_family),
priv->activation_source_id_x[IS_IPv4]);
}
nm_clear_g_source (&priv->activation_source_id_x[IS_IPv4]);
priv->activation_source_func_x[IS_IPv4] = NULL;
func (self);
}
/*****************************************************************************/
static void
@ -6585,7 +6617,7 @@ activate_stage1_device_prepare (NMDevice *self)
if (master)
master_ready (self, active);
nm_device_activate_schedule_stage2_device_config (self);
activation_source_invoke_sync (self, activate_stage2_device_config, AF_INET);
}
/*