Compare commits

...

2 Commits

Author SHA1 Message Date
Daniel Agar 153b683a0e module.h fix trivial whitespace astyle failure 2024-06-20 15:50:25 -04:00
Thomas Debrunner eba9276e6f system: never call task_delete on nuttx, never force stop tasks 2024-06-20 13:31:51 +02:00
2 changed files with 6 additions and 15 deletions
@@ -239,21 +239,10 @@ public:
unlock_module();
px4_usleep(10000); // 10 ms
lock_module();
i++;
if (++i > 500 && _task_id != -1) { // wait at most 5 sec
PX4_ERR("timeout, forcing stop");
if (_task_id != task_id_is_work_queue) {
px4_task_delete(_task_id);
}
_task_id = -1;
delete _object.load();
_object.store(nullptr);
ret = -1;
break;
if (i % 500 == 0) {
PX4_INFO("Waiting for task to stop...");
}
} while (_task_id != -1);
+3 -1
View File
@@ -45,6 +45,7 @@
#include <nuttx/kthread.h>
#include <sys/wait.h>
#include <syslog.h>
#include <stdbool.h>
#include <stdio.h>
#include <stdlib.h>
@@ -88,7 +89,8 @@ int px4_task_spawn_cmd(const char *name, int scheduler, int priority, int stack_
int px4_task_delete(int pid)
{
return task_delete(pid);
syslog(LOG_ERR, "Ignoring force task delete on NuttX\n");
return ERROR;
}
const char *px4_get_taskname(void)