Skip to contentSkip to conversation

Do not increment mdl reference in reconnections

PATCH In review Santiago Carot-Nemesio 3 participants 8 messages Nov 22, 2010 Bluetooth drivers

lore
Share & tools
lore
#1 lore raw

PATCH 2/2 Increment reference counter when a io_watcher is added

In reply to Santiago Carot-Nemesio

Also a destroy function is added in order to avoid memory leaks

---
 health/mcap.c |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)
health/mcap.c +19 -9
index 8ecdc68..81fd8df 100644
@@ -1638,8 +1638,11 @@ static void mcap_connect_mdl_cb(GIOChannel *chan, GError *conn_err,
 	}
 
 	mdl->state = MDL_CONNECTED;
-	mdl->wid = g_io_add_watch(mdl->dc, G_IO_ERR | G_IO_HUP | G_IO_NVAL,
-						(GIOFunc) mdl_event_cb, mdl);
+	mdl->wid = g_io_add_watch_full(mdl->dc, G_PRIORITY_DEFAULT,
+					G_IO_ERR | G_IO_HUP | G_IO_NVAL,
+					(GIOFunc) mdl_event_cb,
+					mcap_mdl_ref(mdl),
+					(GDestroyNotify) mcap_mdl_unref);
 
 	cb(mdl, conn_err, user_data);
 }
@@ -1774,9 +1777,11 @@ static void mcap_connect_mcl_cb(GIOChannel *chan, GError *conn_err,
 							mcap_mcl_ref(mcl));
 	}
 
-	mcl->wid = g_io_add_watch(mcl->cc,
+	mcl->wid = g_io_add_watch_full(mcl->cc, G_PRIORITY_DEFAULT,
 				G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
-				(GIOFunc) mcl_control_cb, mcl);
+				(GIOFunc) mcl_control_cb,
+				mcap_mcl_ref(mcl),
+				(GDestroyNotify) mcap_mcl_unref);
 	connect_cb(mcl, gerr, data);
 }
 
@@ -1786,8 +1791,11 @@ static void set_mdl_properties(GIOChannel *chan, struct mcap_mdl *mdl)
 
 	mdl->state = MDL_CONNECTED;
 	mdl->dc = g_io_channel_ref(chan);
-	mdl->wid = g_io_add_watch(mdl->dc, G_IO_ERR | G_IO_HUP | G_IO_NVAL,
-						(GIOFunc) mdl_event_cb, mdl);
+	mdl->wid = g_io_add_watch_full(mdl->dc, G_PRIORITY_DEFAULT,
+					G_IO_ERR | G_IO_HUP | G_IO_NVAL,
+					(GIOFunc) mdl_event_cb,
+					mcap_mdl_ref(mdl),
+					(GDestroyNotify) mcap_mdl_unref);
 
 	mcl->state = MCL_ACTIVE;
 	mcl->cb->mdl_connected(mdl, mcl->cb->user_data);
@@ -1919,9 +1927,11 @@ static void set_mcl_conf(GIOChannel *chan, struct mcap_mcl *mcl)
 		mcl->mi->mcls = g_slist_prepend(mcl->mi->mcls,
 							mcap_mcl_ref(mcl));
 
-	mcl->wid = g_io_add_watch(mcl->cc,
-			G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
-			(GIOFunc) mcl_control_cb, mcl);
+	mcl->wid = g_io_add_watch_full(mcl->cc, G_PRIORITY_DEFAULT,
+				G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
+				(GIOFunc) mcl_control_cb,
+				mcap_mcl_ref(mcl),
+				(GDestroyNotify) mcap_mcl_unref);
 
 	/* Callback to report new MCL */
 	if (reconn)
Signature · 1 line
1.7.1
#0 lore raw

PATCH 1/2 Do not increment mdl reference in reconnections

health/hdp.c +2 -1
index 2e06a6b..769e300 100644
@@ -921,7 +921,8 @@ static void hdp_mcap_mdl_connected_cb(struct mcap_mdl *mdl, void *data)
 		return;
 
 	chan = dev->ndc;
-	chan->mdl = mcap_mdl_ref(mdl);
+	if (!chan->mdl)
+		chan->mdl = mcap_mdl_ref(mdl);
 
 	if (!g_slist_find(dev->channels, chan))
 		dev->channels = g_slist_prepend(dev->channels,
Signature · 1 line
1.7.3.2
#7 lore raw

Hi,

Quoted 5 lines · Santiago Carot-Nemesio
health/hdp.c +0 -0
index 2e06a6b..769e300 100644

health/hdp.c static void hdp_mcap_mdl_connected_cb(struct mcap_mdl *mdl, void *data) · line 928

Quoted 9 lines
health/hdp.c +2 -1
@@ -921,7 +921,8 @@ static void hdp_mcap_mdl_connected_cb(struct mcap_mdl *mdl, void *data)
 		return;
 
 	chan = dev->ndc;
-	chan->mdl = mcap_mdl_ref(mdl);
+	if (!chan->mdl)
+		chan->mdl = mcap_mdl_ref(mdl);
 
 	if (!g_slist_find(dev->channels, chan))
 		dev->channels = g_slist_prepend(dev->channels,

Pushed upstream. Do try to be more verbose in your commit messages please. Also have the summary lines of fix commits (like this one) starting with "Fix ..." so they can be easily detected e.g. when doing summaries for release changelogs.

Johan

#2 lore raw

Re: [PATCH 2/2] Increment reference counter when a io_watcher is added

In reply to Jose Antonio Santos Cadenas

Hi Jose,

Quoted 4 lines · Jose Antonio Santos Cadenas

Also a destroy function is added in order to avoid memory leaks

---
 health/mcap.c |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

The patch content itself is fine but you need to fix the commit message. Now you have half of the info in the summary and half in the message body (both halves being equaly relevant). The summary line should be a summary of the whole patch (in this case it could be e.g. "Fix MDL reference counting for IO watchers") and the body should contain the details. So please reformulate, resend, and pay more attention to this kind of things in the future. Thanks :)

Johan

#3 lore raw

Re: [PATCH 2/2] Increment reference counter when a io_watcher is added

Hi Johan,

2010/11/22 Johan Hedberg <[email protected]>:

Quoted 8 lines

Hi Jose,

Quoted 4 lines · Jose Antonio Santos Cadenas

Also a destroy function is added in order to avoid memory leaks
---
 health/mcap.c |   28 +++++++++++++++++++---------

 1 files changed, 19 insertions(+), 9 deletions(-)
Quoted 7 lines

The patch content itself is fine but you need to fix the commit message. Now you have half of the info in the summary and half in the message body (both halves being equaly relevant). The summary line should be a summary of the whole patch (in this case it could be e.g. "Fix MDL reference counting for IO watchers") and the body should contain the details. So please reformulate, resend, and pay more attention to this kind of things in the future. Thanks :)

Sorry for for the inconvenience, I'm fixing this and sending the new patch. I'll try be more carefully with the commit messages in the future.

Regards

Quoted 3 lines

Johan

#4 lore raw

PATCH 2/2 Fix: increment MDL and MCL reference counter in IO watchers.

When a io_watcher is added to an MDL or an MCL channel, its reference should be incremented because the watcher should keep its own reference the the structure.

Also a destroy function is added in order to decrement the reference once the watcher is removed.

---
 health/mcap.c |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)
health/mcap.c +19 -9
index 8ecdc68..81fd8df 100644
@@ -1638,8 +1638,11 @@ static void mcap_connect_mdl_cb(GIOChannel *chan, GError *conn_err,
 	}
 
 	mdl->state = MDL_CONNECTED;
-	mdl->wid = g_io_add_watch(mdl->dc, G_IO_ERR | G_IO_HUP | G_IO_NVAL,
-						(GIOFunc) mdl_event_cb, mdl);
+	mdl->wid = g_io_add_watch_full(mdl->dc, G_PRIORITY_DEFAULT,
+					G_IO_ERR | G_IO_HUP | G_IO_NVAL,
+					(GIOFunc) mdl_event_cb,
+					mcap_mdl_ref(mdl),
+					(GDestroyNotify) mcap_mdl_unref);
 
 	cb(mdl, conn_err, user_data);
 }
@@ -1774,9 +1777,11 @@ static void mcap_connect_mcl_cb(GIOChannel *chan, GError *conn_err,
 							mcap_mcl_ref(mcl));
 	}
 
-	mcl->wid = g_io_add_watch(mcl->cc,
+	mcl->wid = g_io_add_watch_full(mcl->cc, G_PRIORITY_DEFAULT,
 				G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
-				(GIOFunc) mcl_control_cb, mcl);
+				(GIOFunc) mcl_control_cb,
+				mcap_mcl_ref(mcl),
+				(GDestroyNotify) mcap_mcl_unref);
 	connect_cb(mcl, gerr, data);
 }
 
@@ -1786,8 +1791,11 @@ static void set_mdl_properties(GIOChannel *chan, struct mcap_mdl *mdl)
 
 	mdl->state = MDL_CONNECTED;
 	mdl->dc = g_io_channel_ref(chan);
-	mdl->wid = g_io_add_watch(mdl->dc, G_IO_ERR | G_IO_HUP | G_IO_NVAL,
-						(GIOFunc) mdl_event_cb, mdl);
+	mdl->wid = g_io_add_watch_full(mdl->dc, G_PRIORITY_DEFAULT,
+					G_IO_ERR | G_IO_HUP | G_IO_NVAL,
+					(GIOFunc) mdl_event_cb,
+					mcap_mdl_ref(mdl),
+					(GDestroyNotify) mcap_mdl_unref);
 
 	mcl->state = MCL_ACTIVE;
 	mcl->cb->mdl_connected(mdl, mcl->cb->user_data);
@@ -1919,9 +1927,11 @@ static void set_mcl_conf(GIOChannel *chan, struct mcap_mcl *mcl)
 		mcl->mi->mcls = g_slist_prepend(mcl->mi->mcls,
 							mcap_mcl_ref(mcl));
 
-	mcl->wid = g_io_add_watch(mcl->cc,
-			G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
-			(GIOFunc) mcl_control_cb, mcl);
+	mcl->wid = g_io_add_watch_full(mcl->cc, G_PRIORITY_DEFAULT,
+				G_IO_IN | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
+				(GIOFunc) mcl_control_cb,
+				mcap_mcl_ref(mcl),
+				(GDestroyNotify) mcap_mcl_unref);
 
 	/* Callback to report new MCL */
 	if (reconn)
Signature · 1 line
1.7.1
#5 lore raw

Re: [PATCH 2/2] Fix: increment MDL and MCL reference counter in IO watchers.

Hi Jose,

Quoted 9 lines · Jose Antonio Santos Cadenas

When a io_watcher is added to an MDL or an MCL channel, its reference should be incremented because the watcher should keep its own reference the the structure.

Also a destroy function is added in order to decrement the reference once the watcher is removed.

---
 health/mcap.c |   28 +++++++++++++++++++---------
 1 files changed, 19 insertions(+), 9 deletions(-)

Thanks. Pushed upstream, but I still had to tweak the summary line a little bit (take a look at the upstream tree if you're interested).

Johan

#6 lore raw

Re: [PATCH 2/2] Fix: increment MDL and MCL reference counter in IO watchers.

2010/11/22 Johan Hedberg <[email protected]>:

Quoted 7 lines

Hi Jose,

Quoted 4 lines · Jose Antonio Santos Cadenas

When a io_watcher is added to an MDL or an MCL channel, its reference should be incremented because the watcher should keep its own reference the the structure.

Quoted 8 lines
Quoted 5 lines

Also  a destroy function is added in order to decrement the reference once the watcher is removed.
---
 health/mcap.c |   28 +++++++++++++++++++---------

 1 files changed, 19 insertions(+), 9 deletions(-)

Thanks. Pushed upstream, but I still had to tweak the summary line a little bit (take a look at the upstream tree if you're interested).

I have to avoid dots at the end of the commit message I always think that, but sometimes my fingers are quicker than my mind. Sorry :) .

Quoted 3 lines

Johan