espressif/esp-mqtt
1
0
Fork 1
mirror of https://github.com/espressif/esp-mqtt.git synced 2025-07-30 02:38:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/atomic_state' into 'master'

Browse Source 
Make state and size atomic

See merge request espressif/esp-mqtt!199
This commit is contained in:
Rocha Euripedes
2024-03-22 15:26:15 +08:00
parent 74481cbbf4 891380bdf5
commit 37cb056c5f
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/include/mqtt_client_priv.h
View File

@ -114,7 +114,7 @@ struct esp_mqtt_client {
esp_transport_handle_t transport; esp_transport_handle_t transport;
mqtt_config_storage_t *config; mqtt_config_storage_t *config;
mqtt_state_t mqtt_state; mqtt_state_t mqtt_state;
mqtt_client_state_t state; _Atomic mqtt_client_state_t state;
uint64_t refresh_connection_tick; uint64_t refresh_connection_tick;
int64_t keepalive_tick; int64_t keepalive_tick;
uint64_t reconnect_tick; uint64_t reconnect_tick;

2
lib/mqtt_outbox.c
View File

@ -24,7 +24,7 @@ typedef struct outbox_item {
STAILQ_HEAD(outbox_list_t, outbox_item); STAILQ_HEAD(outbox_list_t, outbox_item);
struct outbox_t { struct outbox_t {
uint64_t size; _Atomic uint64_t size;
struct outbox_list_t *list; struct outbox_list_t *list;
}; };

14
mqtt_client.c
View File

@ -1585,7 +1585,8 @@ static void esp_mqtt_task(void *pv)
while (client->run) { while (client->run) {
MQTT_API_LOCK(client); MQTT_API_LOCK(client);
run_event_loop(client); run_event_loop(client);
switch (client->state) { mqtt_client_state_t state = client->state;
switch (state) {
case MQTT_STATE_DISCONNECTED: case MQTT_STATE_DISCONNECTED:
break; break;
case MQTT_STATE_INIT: case MQTT_STATE_INIT:
@ -1874,12 +1875,13 @@ int esp_mqtt_client_subscribe_multiple(esp_mqtt_client_handle_t client,
if (client->config->outbox_limit > 0 && outbox_get_size(client->outbox) > client->config->outbox_limit) { if (client->config->outbox_limit > 0 && outbox_get_size(client->outbox) > client->config->outbox_limit) {
return -2; return -2;
} }
MQTT_API_LOCK(client);
if (client->state != MQTT_STATE_CONNECTED) { if (client->state != MQTT_STATE_CONNECTED) {
ESP_LOGE(TAG, "Client has not connected"); ESP_LOGE(TAG, "Client has not connected");
MQTT_API_UNLOCK(client);
return -1; return -1;
} }
MQTT_API_LOCK(client);
if (client->mqtt_state.connection.information.protocol_ver == MQTT_PROTOCOL_V_5) { if (client->mqtt_state.connection.information.protocol_ver == MQTT_PROTOCOL_V_5) {
#ifdef MQTT_PROTOCOL_5 #ifdef MQTT_PROTOCOL_5
int max_qos = topic_list[0].qos; int max_qos = topic_list[0].qos;
@ -1942,12 +1944,11 @@ int esp_mqtt_client_unsubscribe(esp_mqtt_client_handle_t client, const char *top
ESP_LOGE(TAG, "Client was not initialized"); ESP_LOGE(TAG, "Client was not initialized");
return -1; return -1;
} }
MQTT_API_LOCK(client);
if (client->state != MQTT_STATE_CONNECTED) { if (client->state != MQTT_STATE_CONNECTED) {
MQTT_API_UNLOCK(client);
ESP_LOGE(TAG, "Client has not connected"); ESP_LOGE(TAG, "Client has not connected");
return -1; return -1;
} }
MQTT_API_LOCK(client);
if (client->mqtt_state.connection.information.protocol_ver == MQTT_PROTOCOL_V_5) { if (client->mqtt_state.connection.information.protocol_ver == MQTT_PROTOCOL_V_5) {
#ifdef MQTT_PROTOCOL_5 #ifdef MQTT_PROTOCOL_5
mqtt5_msg_unsubscribe(&client->mqtt_state.connection, mqtt5_msg_unsubscribe(&client->mqtt_state.connection,
@ -2049,15 +2050,14 @@ int esp_mqtt_client_publish(esp_mqtt_client_handle_t client, const char *topic,
ESP_LOGE(TAG, "Client was not initialized"); ESP_LOGE(TAG, "Client was not initialized");
return -1; return -1;
} }
MQTT_API_LOCK(client);
#if MQTT_SKIP_PUBLISH_IF_DISCONNECTED #if MQTT_SKIP_PUBLISH_IF_DISCONNECTED
if (client->state != MQTT_STATE_CONNECTED) { if (client->state != MQTT_STATE_CONNECTED) {
ESP_LOGI(TAG, "Publishing skipped: client is not connected"); ESP_LOGI(TAG, "Publishing skipped: client is not connected");
MQTT_API_UNLOCK(client);
return -1; return -1;
} }
#endif #endif
MQTT_API_LOCK(client);
#ifdef MQTT_PROTOCOL_5 #ifdef MQTT_PROTOCOL_5
if (client->mqtt_state.connection.information.protocol_ver == MQTT_PROTOCOL_V_5) { if (client->mqtt_state.connection.information.protocol_ver == MQTT_PROTOCOL_V_5) {
if (esp_mqtt5_client_publish_check(client, qos, retain) != ESP_OK) { if (esp_mqtt5_client_publish_check(client, qos, retain) != ESP_OK) {