Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix mosquitto_loop_stop() hangs on Windows. #1748

Closed
wants to merge 1 commit into from
Closed

Fix mosquitto_loop_stop() hangs on Windows. #1748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 21 additions & 1 deletion lib/loop.c
View file
Open in desktop
Expand Up @@ -243,19 +243,28 @@ static int interruptible_sleep(struct mosquitto *mosq, unsigned long reconnect_d
}


int mosquitto_loop_forever(struct mosquitto *mosq, int timeout, int max_packets)
int mosquitto__loop_forever(struct mosquitto *mosq, int timeout, int max_packets, bool explicit_cancellation_points)
{
int run = 1;
int rc;
unsigned long reconnect_delay;
int state;

#ifndef WIN32
UNUSED(explicit_cancellation_points);
#endif

if(!mosq) return MOSQ_ERR_INVAL;

mosq->reconnects = 0;

while(run){
do{
#ifdef WIN32
if(explicit_cancellation_points) {
pthread_testcancel();
}
#endif
rc = mosquitto_loop(mosq, timeout, max_packets);
}while(run && rc == MOSQ_ERR_SUCCESS);
/* Quit after fatal errors. */
Expand All @@ -280,6 +289,11 @@ int mosquitto_loop_forever(struct mosquitto *mosq, int timeout, int max_packets)
return rc;
}
do{
#ifdef WIN32
if(explicit_cancellation_points) {
pthread_testcancel();
}
#endif
rc = MOSQ_ERR_SUCCESS;
state = mosquitto__get_state(mosq);
if(state == mosq_cs_disconnecting || state == mosq_cs_disconnected){
Expand Down Expand Up @@ -317,6 +331,12 @@ int mosquitto_loop_forever(struct mosquitto *mosq, int timeout, int max_packets)
}


int mosquitto_loop_forever(struct mosquitto *mosq, int timeout, int max_packets)
{
return mosquitto__loop_forever(mosq, timeout, max_packets, false);
}


int mosquitto_loop_misc(struct mosquitto *mosq)
{
if(!mosq) return MOSQ_ERR_INVAL;
Expand Down
9 changes: 7 additions & 2 deletions lib/thread_mosq.c
View file
Open in desktop
Expand Up @@ -77,14 +77,19 @@ int mosquitto_loop_stop(struct mosquitto *mosq, bool force)
}

#ifdef WITH_THREADING
int mosquitto__loop_forever(struct mosquitto *mosq, int timeout, int max_packets, bool explicit_cancellation_points);

void *mosquitto__thread_main(void *obj)
{
struct mosquitto *mosq = obj;
int state;
#ifndef WIN32
bool explicit_cancellation_points = false;
struct timespec ts;
ts.tv_sec = 0;
ts.tv_nsec = 10000000;
#else
bool explicit_cancellation_points = true;
#endif

if(!mosq) return NULL;
Expand All @@ -104,10 +109,10 @@ void *mosquitto__thread_main(void *obj)

if(!mosq->keepalive){
/* Sleep for a day if keepalive disabled. */
mosquitto_loop_forever(mosq, 1000*86400, 1);
mosquitto__loop_forever(mosq, 1000*86400, 1, explicit_cancellation_points);
}else{
/* Sleep for our keepalive value. publish() etc. will wake us up. */
mosquitto_loop_forever(mosq, mosq->keepalive*1000, 1);
mosquitto__loop_forever(mosq, mosq->keepalive*1000, 1, explicit_cancellation_points);
}

return obj;
Expand Down