colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iface-modem: ensure we cancel the re-initialization idle if the modem goes away

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=697290
This commit is contained in:
Aleksander Morgado
2013-04-05 08:54:09 +02:00
parent 76ecc1301a
commit 1cb5831af3
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/mm-iface-modem.c
View File

@@ -36,11 +36,13 @@
#define SIGNAL_QUALITY_UPDATE_CONTEXT_TAG "signal-quality-update-context-tag" #define SIGNAL_QUALITY_UPDATE_CONTEXT_TAG "signal-quality-update-context-tag"
#define SIGNAL_QUALITY_CHECK_CONTEXT_TAG "signal-quality-check-context-tag" #define SIGNAL_QUALITY_CHECK_CONTEXT_TAG "signal-quality-check-context-tag"
#define ACCESS_TECHNOLOGIES_CHECK_CONTEXT_TAG "access-technologies-check-context-tag" #define ACCESS_TECHNOLOGIES_CHECK_CONTEXT_TAG "access-technologies-check-context-tag"
#define RESTART_INITIALIZE_IDLE_TAG "restart-initialize-tag"
static GQuark state_update_context_quark; static GQuark state_update_context_quark;
static GQuark signal_quality_update_context_quark; static GQuark signal_quality_update_context_quark;
static GQuark signal_quality_check_context_quark; static GQuark signal_quality_check_context_quark;
static GQuark access_technologies_check_context_quark; static GQuark access_technologies_check_context_quark;
static GQuark restart_initialize_idle_quark;
/*****************************************************************************/ /*****************************************************************************/
@@ -2391,6 +2393,8 @@ reinitialize_ready (MMBaseModem *self,
static gboolean static gboolean
restart_initialize_idle (MMIfaceModem *self) restart_initialize_idle (MMIfaceModem *self)
{ {
g_object_set_qdata (G_OBJECT (self), restart_initialize_idle_quark, NULL);
/* If no wait needed, just go on */ /* If no wait needed, just go on */
mm_base_modem_initialize (MM_BASE_MODEM (self), mm_base_modem_initialize (MM_BASE_MODEM (self),
(GAsyncReadyCallback) reinitialize_ready, (GAsyncReadyCallback) reinitialize_ready,
@@ -2398,6 +2402,12 @@ restart_initialize_idle (MMIfaceModem *self)
return FALSE; return FALSE;
} }
static void
restart_initialize_idle_cancel (gpointer idp)
{
g_source_remove (GPOINTER_TO_UINT (idp));
}
static void static void
set_lock_status (MMIfaceModem *self, set_lock_status (MMIfaceModem *self,
MmGdbusModem *skeleton, MmGdbusModem *skeleton,
@@ -2420,8 +2430,18 @@ set_lock_status (MMIfaceModem *self,
/* Only restart initialization if leaving LOCKED. /* Only restart initialization if leaving LOCKED.
* If this is the case, we do NOT update the state yet, we wait * If this is the case, we do NOT update the state yet, we wait
* to be completely re-initialized to do so. */ * to be completely re-initialized to do so. */
if (old_lock != MM_MODEM_LOCK_UNKNOWN) if (old_lock != MM_MODEM_LOCK_UNKNOWN) {
g_idle_add ((GSourceFunc)restart_initialize_idle, self); guint id;
if (G_UNLIKELY (!restart_initialize_idle_quark))
restart_initialize_idle_quark = (g_quark_from_static_string (RESTART_INITIALIZE_IDLE_TAG));
id = g_idle_add ((GSourceFunc)restart_initialize_idle, self);
g_object_set_qdata_full (G_OBJECT (self),
restart_initialize_idle_quark,
GUINT_TO_POINTER (id),
(GDestroyNotify)restart_initialize_idle_cancel);
}
} }
} else { } else {
if (old_lock == MM_MODEM_LOCK_UNKNOWN) { if (old_lock == MM_MODEM_LOCK_UNKNOWN) {
@@ -4173,6 +4193,12 @@ mm_iface_modem_shutdown (MMIfaceModem *self)
access_technologies_check_context_quark, access_technologies_check_context_quark,
NULL); NULL);
/* Remove running restart initialization idle, if any */
if (G_LIKELY (restart_initialize_idle_quark))
g_object_set_qdata (G_OBJECT (self),
restart_initialize_idle_quark,
NULL);
/* Remove SIM object */ /* Remove SIM object */
g_object_set (self, g_object_set (self,
MM_IFACE_MODEM_SIM, NULL, MM_IFACE_MODEM_SIM, NULL,