system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-22 02:35:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

2008-04-28 Dan Williams <dcbw@redhat.com>

Browse source 
* src/nm-hal-manager.c
		- (add_initial_devices): convert to a GSourceFunc prototype
		- (nm_manager_state_changed): when coming out of sleep, punt the
			device re-addition to an idle handler to let D-Bus events go out
			first, fixing a potential dbus-glib assert if the old device was
			not yet disposed (due to references held while emitting the D-Bus
			signals) but the new device was found, because the mainloop didn't
			run between signal emission and add_initial_devices()



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3616 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-04-29 15:15:42 +00:00
parent d1fcfe9474
commit fe72d85cf1
2 changed files with 38 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2008-04-28 Dan Williams <dcbw@redhat.com>
* src/nm-hal-manager.c
- (add_initial_devices): convert to a GSourceFunc prototype
- (nm_manager_state_changed): when coming out of sleep, punt the
device re-addition to an idle handler to let D-Bus events go out
first, fixing a potential dbus-glib assert if the old device was
not yet disposed (due to references held while emitting the D-Bus
signals) but the new device was found, because the mainloop didn't
run between signal emission and add_initial_devices()
2008-04-27 Dan Williams <dcbw@redhat.com>
Patch from Benoit Boissinot <bboissin+networkmanager@gmail.com>

30
src/nm-hal-manager.c
View file

@ -25,6 +25,7 @@ struct _NMHalManager {
GSList *device_creators;
gboolean nm_sleeping;
guint add_devices_id;
/* Killswitch handling */
GSList *killswitch_list;
@ -366,9 +367,10 @@ device_new_capability (LibHalContext *ctx, const char *udi, const char *capabili
create_device_and_add_to_list (manager, creator, udi);
}
static void
add_initial_devices (NMHalManager *manager)
static gboolean
add_initial_devices (gpointer user_data)
{
NMHalManager *manager = (NMHalManager *) user_data;
DeviceCreator *creator;
GSList *iter;
char **devices;
@ -376,6 +378,8 @@ add_initial_devices (NMHalManager *manager)
int i;
DBusError err;
manager->add_devices_id = 0;
for (iter = manager->device_creators; iter; iter = iter->next) {
creator = (DeviceCreator *) iter->data;
@ -399,6 +403,8 @@ add_initial_devices (NMHalManager *manager)
libhal_free_string_array (devices);
}
return FALSE;
}
typedef struct {
@ -699,7 +705,20 @@ nm_manager_state_changed (NMManager *nm_manager, NMState state, gpointer user_da
} else if (manager->nm_sleeping) {
/* If the previous state was sleep, the next one means we just woke up */
manager->nm_sleeping = FALSE;
add_initial_devices (manager);
/* Punt adding back devices to an idle handler to give the manager
* time to push signals out over D-Bus when it wakes up. Since the
* signal emission might ref the old pre-sleep device, when the new
* device gets found there will be a D-Bus object path conflict between
* the old device and the new device, and dbus-glib "helpfully" asserts
* here and we die.
*/
if (manager->add_devices_id)
g_source_remove (manager->add_devices_id);
manager->add_devices_id = g_idle_add_full (G_PRIORITY_LOW,
add_initial_devices,
manager,
NULL);
}
}
@ -766,6 +785,11 @@ nm_hal_manager_destroy (NMHalManager *manager)
if (!manager)
return;
if (manager->add_devices_id) {
g_source_remove (manager->add_devices_id);
manager->add_devices_id = 0;
}
g_free (manager->kswitch_err);
g_slist_foreach (manager->device_creators, destroy_creator, NULL);