Browse Source

Merge branch 'master' into adl_support

nfactor-troky
Con Kolivas 13 years ago
parent
commit
fc36e13d5b
  1. 5
      main.c

5
main.c

@ -3976,6 +3976,7 @@ static void *longpoll_thread(void *userdata) @@ -3976,6 +3976,7 @@ static void *longpoll_thread(void *userdata)
struct pool *pool = current_pool();
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
pthread_detach(pthread_self());
curl = curl_easy_init();
if (unlikely(!curl)) {
@ -4068,7 +4069,8 @@ static void stop_longpoll(void) @@ -4068,7 +4069,8 @@ static void stop_longpoll(void)
struct thr_info *thr = &thr_info[longpoll_thr_id];
tq_freeze(thr->q);
pthread_cancel(*thr->pth);
if (thr->pth)
pthread_cancel(*thr->pth);
have_longpoll = false;
}
@ -4079,7 +4081,6 @@ static void start_longpoll(void) @@ -4079,7 +4081,6 @@ static void start_longpoll(void)
tq_thaw(thr->q);
if (unlikely(thr_info_create(thr, NULL, longpoll_thread, thr)))
quit(1, "longpoll thread create failed");
pthread_detach(*thr->pth);
if (opt_debug)
applog(LOG_DEBUG, "Pushing ping to longpoll thread");
tq_push(thr_info[longpoll_thr_id].q, &ping);

Loading…
Cancel
Save