Mirrors_Framework/mosquitto
1
0
Fork 0
mirror of https://github.com/eclipse-mosquitto/mosquitto.git synced 2026-09-22 08:04:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Simplify stopping the thread in libmosquitto

Browse Source
This commit is contained in:
Roger A. Light
2025-11-23 23:11:56 +00:00
parent 160ccde1cd
commit 49d71f2bd9
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/loop.c
+6 -6
View File
@@ -243,7 +243,6 @@ static int interruptible_sleep(struct mosquitto *mosq, time_t reconnect_delay)
int mosquitto_loop_forever(struct mosquitto *mosq, int timeout, int max_packets)
{
int run = 1;
int rc = MOSQ_ERR_SUCCESS;
unsigned long reconnect_delay;
@@ -252,14 +251,15 @@ int mosquitto_loop_forever(struct mosquitto *mosq, int timeout, int max_packets)
}
mosq->reconnects = 0;
mosq->run = true;
while(run){
while(mosq->run){
do{
#ifdef HAVE_PTHREAD_CANCEL
COMPAT_pthread_testcancel();
#endif
rc = mosquitto_loop(mosq, timeout, max_packets);
}while(run && rc == MOSQ_ERR_SUCCESS);
}while(mosq->run && rc == MOSQ_ERR_SUCCESS);
/* Quit after fatal errors. */
switch(rc){
case MOSQ_ERR_NOMEM:
@@ -287,7 +287,7 @@ int mosquitto_loop_forever(struct mosquitto *mosq, int timeout, int max_packets)
#endif
rc = MOSQ_ERR_SUCCESS;
if(mosquitto__get_request_disconnect(mosq)){
run = 0;
mosq->run = false;
}else{
if(mosq->reconnect_delay_max > mosq->reconnect_delay){
if(mosq->reconnect_exponential_backoff){
@@ -311,12 +311,12 @@ int mosquitto_loop_forever(struct mosquitto *mosq, int timeout, int max_packets)
}
if(mosquitto__get_request_disconnect(mosq)){
run = 0;
mosq->run = false;
}else{
rc = mosquitto_reconnect(mosq);
}
}
}while(run && rc != MOSQ_ERR_SUCCESS);
}while(mosq->run && rc != MOSQ_ERR_SUCCESS);
}
return rc;
}
lib/mosquitto_internal.h
+1
View File
@@ -360,6 +360,7 @@ struct mosquitto {
enum mosquitto__keyform tls_keyform;
#endif
bool want_write;
bool run;
#if defined(WITH_THREADING) && !defined(WITH_BROKER)
pthread_mutex_t callback_mutex;
pthread_mutex_t log_callback_mutex;
lib/thread_mosq.c
+1
View File
@@ -79,6 +79,7 @@ int mosquitto_loop_stop(struct mosquitto *mosq, bool force)
return MOSQ_ERR_INVAL;
}
mosq->run = false;
/* Write a single byte to sockpairW (connected to sockpairR) to break out
* of select() if in threaded mode. */