Embedded/pikapython
1
0
Fork 0
mirror of https://gitee.com/Lyon1998/pikapython.git synced 2025-02-05 17:28:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix mem break when mqtt_thread not exit

Browse Source
This commit is contained in:
lyon 2022-11-20 00:17:34 +08:00
parent d1499ff983
commit 1c55ca0223
4 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/mqtt/mqttclient.c
View File

@ -1612,7 +1612,12 @@ int mqtt_set_will_options(mqtt_client_t* c,
} }
int mqtt_release_free(mqtt_client_t* c) { int mqtt_release_free(mqtt_client_t* c) {
/* wait for mqtt thread exit */
while (c->mqtt_thread != NULL) {
}
if (CLIENT_STATE_INVALID != mqtt_get_client_state(c)) {
mqtt_clean_session(c); mqtt_clean_session(c);
}
mqtt_release(c); mqtt_release(c);
platform_memory_free(c); platform_memory_free(c);
return 0; return 0;

5
package/mqtt/platform_thread.c
View File

@ -83,8 +83,11 @@ PIKA_WEAK void platform_thread_start(platform_thread_t* thread) {
PIKA_WEAK void platform_thread_destroy(platform_thread_t* thread) { PIKA_WEAK void platform_thread_destroy(platform_thread_t* thread) {
#ifdef __linux #ifdef __linux
if (NULL != thread) if (NULL != thread){
pthread_detach(thread->thread); pthread_detach(thread->thread);
platform_memory_free(thread);
thread = NULL;
}
#elif PIKA_FREERTOS_ENABLE #elif PIKA_FREERTOS_ENABLE
if (NULL != thread) if (NULL != thread)
vTaskDelete(thread->thread); vTaskDelete(thread->thread);

5
port/linux/package/pikascript/pikascript-lib/mqtt/mqttclient.c
View File

@ -1612,7 +1612,12 @@ int mqtt_set_will_options(mqtt_client_t* c,
} }
int mqtt_release_free(mqtt_client_t* c) { int mqtt_release_free(mqtt_client_t* c) {
/* wait for mqtt thread exit */
while (c->mqtt_thread != NULL) {
}
if (CLIENT_STATE_INVALID != mqtt_get_client_state(c)) {
mqtt_clean_session(c); mqtt_clean_session(c);
}
mqtt_release(c); mqtt_release(c);
platform_memory_free(c); platform_memory_free(c);
return 0; return 0;

5
port/linux/package/pikascript/pikascript-lib/mqtt/platform_thread.c
View File

@ -83,8 +83,11 @@ PIKA_WEAK void platform_thread_start(platform_thread_t* thread) {
PIKA_WEAK void platform_thread_destroy(platform_thread_t* thread) { PIKA_WEAK void platform_thread_destroy(platform_thread_t* thread) {
#ifdef __linux #ifdef __linux
if (NULL != thread) if (NULL != thread){
pthread_detach(thread->thread); pthread_detach(thread->thread);
platform_memory_free(thread);
thread = NULL;
}
#elif PIKA_FREERTOS_ENABLE #elif PIKA_FREERTOS_ENABLE
if (NULL != thread) if (NULL != thread)
vTaskDelete(thread->thread); vTaskDelete(thread->thread);