From: Keith Packard <keithp@keithp.com>
Date: Sat, 27 Feb 2010 23:11:44 +0000 (-0800)
Subject: Eliminate deadlock when writing config from radio link
X-Git-Tag: debian/0.6+106+ga1478f6~4
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=1d6d8d76ec65373ffee70add75d183f5c4168f61;hp=f1956ebadd7bf46b84a05a0c383b6404ca26b344

Eliminate deadlock when writing config from radio link

Writing the 'Saved\r\n' string would fill the packet buffer and cause
a flush to occur, which would need to wait for the radio link to
receive and transmit a packet. The radio link always re-fetches the
radio channel number when lighting up the radio, so it need to look in
the config space. If the config mutex was held by the config writing
process while the radio was trying to get the channel number, then
we'd get a deadlock.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/ao_config.c b/src/ao_config.c
index f8ea27fe..8df994a6 100644
--- a/src/ao_config.c
+++ b/src/ao_config.c
@@ -377,13 +377,18 @@ ao_config_show(void) __reentrant
 void
 ao_config_write(void) __reentrant
 {
+	uint8_t saved = 0;
 	ao_mutex_get(&ao_config_mutex);
 	if (ao_config_dirty) {
 		_ao_config_put();
 		ao_config_dirty = 0;
-		printf("Saved\n");
+		saved = 1;
 	}
 	ao_mutex_put(&ao_config_mutex);
+	if (saved)
+		puts("Saved");
+	else
+		puts("Nothing to save");
 }
 #endif