mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Do not lock the Avahi thread before stopping it. Leads to a deadlock, 

so it seems it's actually not necessary anymore.
merge-requests/1/head
Julien BLACHE 2009-02-18 11:07:38 +00:00
rodzic aef46252cc
commit 6733db0ec1
2 zmienionych plików z 12 dodań i 1 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
ChangeLog
Wyświetl plik

@ -1,3 +1,7 @@
2009-02-18 Julien Blache <jb@jblache.org>
* backend/net.c: do not lock the Avahi thread before stopping
it. It looks like it's no longer necessary to do so.
2009-02-14 Chris Bagwell <cbagwell-guest at users.alioth.debian.org>
* configure.in, doc/Makefile.am, frontend/Makefile.am,
include/Makefile.am, sanei/Makefile.am, tools/Makefile.am:

9
backend/net.c
Wyświetl plik

@ -922,9 +922,14 @@ net_avahi_cleanup (void)
if (!avahi_thread)
return;
avahi_threaded_poll_lock (avahi_thread);
/* Not needed anymore? */
/* avahi_threaded_poll_lock (avahi_thread); */
DBG (1, "net_avahi_cleanup: stopping thread\n");
avahi_threaded_poll_stop (avahi_thread);
DBG (1, "net_avahi_cleanup: locking thread\n");
if (avahi_browser)
avahi_service_browser_free (avahi_browser);
@ -932,6 +937,8 @@ net_avahi_cleanup (void)
avahi_client_free (avahi_client);
avahi_threaded_poll_free (avahi_thread);
DBG (1, "net_avahi_cleanup: done\n");
}
#endif /* WITH_AVAHI */