Hi John,
On 04/22/2016 08:07 AM, John Ernberg wrote:
From: John Ernberg <[email protected]>
Prevents glib from causing SIGFPE during certain circumstances of modem
removal.
Do you have a stack trace handy?
---
plugins/push-notification.c | 26 +++++++++++++++++++++++---
1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/plugins/push-notification.c b/plugins/push-notification.c
index ff388d9..ecf100f 100644
--- a/plugins/push-notification.c
+++ b/plugins/push-notification.c
@@ -45,6 +45,7 @@
#define WAP_PUSH_DST_PORT 2948
static unsigned int modemwatch_id;
+static GHashTable *sms_watches = NULL;
struct push_notification {
struct ofono_modem *modem;
@@ -164,6 +165,16 @@ static void push_notification_cleanup(gpointer user)
ofono_modem_remove_interface(pn->modem, PUSH_NOTIFICATION_INTERFACE);
}
+static gboolean atom_watch_remove(gpointer key, gpointer value,
+ gpointer user_data)
+{
+ struct ofono_modem *modem = key;
+
+ __ofono_modem_remove_atom_watch(modem, GPOINTER_TO_UINT(value));
+
+ return TRUE;
+}
+
static void sms_watch(struct ofono_atom *atom,
enum ofono_atom_watch_condition cond,
void *data)
@@ -197,18 +208,22 @@ static void sms_watch(struct ofono_atom *atom,
static void modem_watch(struct ofono_modem *modem, gboolean added, void *user)
{
struct push_notification *pn;
+ int sms;
DBG("modem: %p, added: %d", modem, added);
- if (added == FALSE)
+ if (added == FALSE) {
+ g_hash_table_remove(sms_watches, modem);
return;
+ }
This has no effect. The atom_watches for that particular modem have
already been freed by the time the modem watch has been called in
call_modemwatches(). See modem_unregister for details.
pn = g_try_new0(struct push_notification, 1);
if (pn == NULL)
return;
pn->modem = modem;
- __ofono_modem_add_atom_watch(modem, OFONO_ATOM_TYPE_SMS,
- sms_watch, pn, g_free);
+ sms = __ofono_modem_add_atom_watch(modem, OFONO_ATOM_TYPE_SMS,
+ sms_watch, pn, g_free);
+ g_hash_table_insert(sms_watches, modem, GUINT_TO_POINTER(sms));
}
static void call_modemwatch(struct ofono_modem *modem, void *user)
@@ -220,6 +235,8 @@ static int push_notification_init(void)
{
DBG("");
+ sms_watches = g_hash_table_new(g_direct_hash, g_direct_equal);
+
modemwatch_id = __ofono_modemwatch_add(modem_watch, NULL, NULL);
__ofono_modem_foreach(call_modemwatch, NULL);
@@ -232,6 +249,9 @@ static void push_notification_exit(void)
DBG("");
__ofono_modemwatch_remove(modemwatch_id);
+
+ g_hash_table_foreach_remove(sms_watches, atom_watch_remove, NULL);
+ g_hash_table_destroy(sms_watches);
atom watches are already being removed by the virtue of modems being
unregistered.
}
OFONO_PLUGIN_DEFINE(push_notification, "Push Notification Plugin", VERSION,
Regards,
-Denis
_______________________________________________
ofono mailing list
[email protected]
https://lists.ofono.org/mailman/listinfo/ofono
