X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=avahi-common%2Fthread-watch.c;h=c0cadeb2fe48f552e75429d4b64ce54130d269de;hb=6c560282c3d67856e62fb7faa12bf036f9fce529;hp=27a0835b590b56a2fcfbb37d6b3704ac323d93e3;hpb=63b016778a0a8c277f192acd6fe5fd5f56a9f170;p=catta

diff --git a/avahi-common/thread-watch.c b/avahi-common/thread-watch.c
index 27a0835..c0cadeb 100644
--- a/avahi-common/thread-watch.c
+++ b/avahi-common/thread-watch.c
@@ -1,18 +1,16 @@
-/* $Id$ */
-
 /***
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
- 
+
   avahi is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
   Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public
   License along with avahi; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -53,7 +51,7 @@ static int poll_func(struct pollfd *ufds, unsigned int nfds, int timeout, void *
 
     /* Before entering poll() we unlock the mutex, so that
      * avahi_simple_poll_quit() can succeed from another thread. */
-    
+
     pthread_mutex_unlock(mutex);
     r = poll(ufds, nfds, timeout);
     pthread_mutex_lock(mutex);
@@ -68,11 +66,11 @@ static void* thread(void *userdata){
     /* Make sure that signals are delivered to the main thread */
     sigfillset(&mask);
     pthread_sigmask(SIG_BLOCK, &mask, NULL);
-    
+
     pthread_mutex_lock(&p->mutex);
     p->retval = avahi_simple_poll_loop(p->simple_poll);
     pthread_mutex_unlock(&p->mutex);
-    
+
     return NULL;
 }
 
@@ -81,14 +79,14 @@ AvahiThreadedPoll *avahi_threaded_poll_new(void) {
 
     if (!(p = avahi_new(AvahiThreadedPoll, 1)))
         goto fail; /* OOM */
-    
+
     if (!(p->simple_poll = avahi_simple_poll_new()))
         goto fail;
-        
+
     pthread_mutex_init(&p->mutex, NULL);
 
     avahi_simple_poll_set_func(p->simple_poll, poll_func, &p->mutex);
-    
+
     p->thread_running = 0;
 
     return p;
@@ -113,7 +111,7 @@ void avahi_threaded_poll_free(AvahiThreadedPoll *p) {
     assert(!p->thread_running || !pthread_equal(pthread_self(), p->thread_id));
 
     if (p->thread_running)
-        avahi_threaded_poll_quit(p);
+        avahi_threaded_poll_stop(p);
 
     if (p->simple_poll)
         avahi_simple_poll_free(p->simple_poll);
@@ -136,6 +134,8 @@ int avahi_threaded_poll_start(AvahiThreadedPoll *p) {
     if (pthread_create(&p->thread_id, NULL, thread, p) < 0)
         return -1;
 
+    p->thread_running = 1;
+
     return 0;
 }
 
@@ -151,7 +151,7 @@ int avahi_threaded_poll_stop(AvahiThreadedPoll *p) {
     pthread_mutex_lock(&p->mutex);
     avahi_simple_poll_quit(p->simple_poll);
     pthread_mutex_unlock(&p->mutex);
-    
+
     pthread_join(p->thread_id, NULL);
     p->thread_running = 0;
 
@@ -172,7 +172,7 @@ void avahi_threaded_poll_lock(AvahiThreadedPoll *p) {
 
     /* Make sure that this function is not called from the helper thread */
     assert(!p->thread_running || !pthread_equal(pthread_self(), p->thread_id));
-    
+
     pthread_mutex_lock(&p->mutex);
 }
 
@@ -181,6 +181,6 @@ void avahi_threaded_poll_unlock(AvahiThreadedPoll *p) {
 
     /* Make sure that this function is not called from the helper thread */
     assert(!p->thread_running || !pthread_equal(pthread_self(), p->thread_id));
-    
+
     pthread_mutex_unlock(&p->mutex);
 }