e8185ddaa7
libmosquitto shouldn't cancel threads it didn't create. This change allows us to keep track of whether threads were created by the library or by external code. Thanks to Josip Ćavar. Bug: https://github.com/eclipse/mosquitto/issues/166
117 lines
2.6 KiB
C
117 lines
2.6 KiB
C
/*
|
|
Copyright (c) 2011-2014 Roger Light <roger@atchoo.org>
|
|
|
|
All rights reserved. This program and the accompanying materials
|
|
are made available under the terms of the Eclipse Public License v1.0
|
|
and Eclipse Distribution License v1.0 which accompany this distribution.
|
|
|
|
The Eclipse Public License is available at
|
|
http://www.eclipse.org/legal/epl-v10.html
|
|
and the Eclipse Distribution License is available at
|
|
http://www.eclipse.org/org/documents/edl-v10.php.
|
|
|
|
Contributors:
|
|
Roger Light - initial implementation and documentation.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#ifndef WIN32
|
|
#include <unistd.h>
|
|
#endif
|
|
|
|
#include <mosquitto_internal.h>
|
|
#include <net_mosq.h>
|
|
|
|
void *_mosquitto_thread_main(void *obj);
|
|
|
|
int mosquitto_loop_start(struct mosquitto *mosq)
|
|
{
|
|
#ifdef WITH_THREADING
|
|
if(!mosq || mosq->threaded != mosq_ts_none) return MOSQ_ERR_INVAL;
|
|
|
|
mosq->threaded = mosq_ts_self;
|
|
if(!pthread_create(&mosq->thread_id, NULL, _mosquitto_thread_main, mosq)){
|
|
return MOSQ_ERR_SUCCESS;
|
|
}else{
|
|
return MOSQ_ERR_ERRNO;
|
|
}
|
|
#else
|
|
return MOSQ_ERR_NOT_SUPPORTED;
|
|
#endif
|
|
}
|
|
|
|
int mosquitto_loop_stop(struct mosquitto *mosq, bool force)
|
|
{
|
|
#ifdef WITH_THREADING
|
|
# ifndef WITH_BROKER
|
|
char sockpair_data = 0;
|
|
# endif
|
|
|
|
if(!mosq || mosq->threaded != mosq_ts_self) return MOSQ_ERR_INVAL;
|
|
|
|
|
|
/* Write a single byte to sockpairW (connected to sockpairR) to break out
|
|
* of select() if in threaded mode. */
|
|
if(mosq->sockpairW != INVALID_SOCKET){
|
|
#ifndef WIN32
|
|
if(write(mosq->sockpairW, &sockpair_data, 1)){
|
|
}
|
|
#else
|
|
send(mosq->sockpairW, &sockpair_data, 1, 0);
|
|
#endif
|
|
}
|
|
|
|
if(force){
|
|
pthread_cancel(mosq->thread_id);
|
|
}
|
|
pthread_join(mosq->thread_id, NULL);
|
|
mosq->thread_id = pthread_self();
|
|
mosq->threaded = mosq_ts_none;
|
|
|
|
return MOSQ_ERR_SUCCESS;
|
|
#else
|
|
return MOSQ_ERR_NOT_SUPPORTED;
|
|
#endif
|
|
}
|
|
|
|
#ifdef WITH_THREADING
|
|
void *_mosquitto_thread_main(void *obj)
|
|
{
|
|
struct mosquitto *mosq = obj;
|
|
|
|
if(!mosq) return NULL;
|
|
|
|
pthread_mutex_lock(&mosq->state_mutex);
|
|
if(mosq->state == mosq_cs_connect_async){
|
|
pthread_mutex_unlock(&mosq->state_mutex);
|
|
mosquitto_reconnect(mosq);
|
|
}else{
|
|
pthread_mutex_unlock(&mosq->state_mutex);
|
|
}
|
|
|
|
if(!mosq->keepalive){
|
|
/* Sleep for a day if keepalive disabled. */
|
|
mosquitto_loop_forever(mosq, 1000*86400, 1);
|
|
}else{
|
|
/* Sleep for our keepalive value. publish() etc. will wake us up. */
|
|
mosquitto_loop_forever(mosq, mosq->keepalive*1000, 1);
|
|
}
|
|
|
|
return obj;
|
|
}
|
|
#endif
|
|
|
|
int mosquitto_threaded_set(struct mosquitto *mosq, bool threaded)
|
|
{
|
|
if(!mosq) return MOSQ_ERR_INVAL;
|
|
|
|
if(threaded){
|
|
mosq->threaded = mosq_ts_external;
|
|
}else{
|
|
mosq->threaded = mosq_ts_none;
|
|
}
|
|
|
|
return MOSQ_ERR_SUCCESS;
|
|
}
|