sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

examples/watcher: get the thread name using pthread_getname_np

Browse Source 
Signed-off-by: yinshengkai <yinshengkai@xiaomi.com>
This commit is contained in:
yinshengkai 2023-08-10 18:28:20 +08:00 committed by Xiang Xiao
parent 6534f3d87c
commit d090da6b91
2 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
examples/watcher/task_mn.c
View File

@ -23,17 +23,15 @@
****************************************************************************/ ****************************************************************************/
#include <nuttx/config.h> #include <nuttx/config.h>
#include <sys/boardctl.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/ioctl.h> #include <pthread.h>
#include <unistd.h> #include <unistd.h>
#include <nuttx/note/noteram_driver.h>
#include "task_mn.h" #include "task_mn.h"
/**************************************************************************** /****************************************************************************
@ -62,7 +60,6 @@ struct task_list_s watched_tasks =
void task_mn_print_tasks_status(void) void task_mn_print_tasks_status(void)
{ {
int notefd; int notefd;
struct noteram_get_taskname_s task;
struct task_node_s *node; struct task_node_s *node;
/* If the list is not empty */ /* If the list is not empty */
@ -82,15 +79,15 @@ void task_mn_print_tasks_status(void)
for (node = watched_tasks.head; node != NULL; node = node->next) for (node = watched_tasks.head; node != NULL; node = node->next)
{ {
task.pid = node->task_id; char taskname[CONFIG_NAME_MAX];
ioctl(notefd, NOTERAM_GETTASKNAME, (unsigned long)&task); pthread_getname_np(node->task_id, taskname, sizeof(taskname));
if (node->reset) if (node->reset)
{ {
printf("%s fed the dog.\n", task.taskname); printf("%s fed the dog.\n", taskname);
} }
else else
{ {
printf("%s starved the dog.\n", task.taskname); printf("%s starved the dog.\n", taskname);
} }
} }
@ -241,32 +238,16 @@ void task_mn_remove_from_list(pid_t id)
fprintf(stderr, "watcher daemon: This node is not in the list.\n"); fprintf(stderr, "watcher daemon: This node is not in the list.\n");
} }
void task_mn_get_task_name(struct noteram_get_taskname_s *task)
{
int notefd;
notefd = open("/dev/note/ram", O_RDONLY);
if (notefd < 0)
{
fprintf(stderr, "trace: cannot open /dev/note/ram\n");
return;
}
ioctl(notefd, NOTERAM_GETTASKNAME, (unsigned long)task);
close(notefd);
}
void task_mn_subscribe(pid_t id) void task_mn_subscribe(pid_t id)
{ {
struct noteram_get_taskname_s task; char taskname[CONFIG_NAME_MAX];
/* Verify if the task exists in the list */ /* Verify if the task exists in the list */
if (task_mn_is_task_subscribed(id) != NULL) if (task_mn_is_task_subscribed(id) != NULL)
{ {
task.pid = id; pthread_getname_np(id, taskname, sizeof(taskname));
task_mn_get_task_name(&task); printf("Task %s was already subscribed\n", taskname);
printf("Task %s was already subscribed\n", task.taskname);
} }
else else
{ {
@ -278,7 +259,7 @@ void task_mn_subscribe(pid_t id)
void task_mn_unsubscribe(pid_t id) void task_mn_unsubscribe(pid_t id)
{ {
struct noteram_get_taskname_s task; char taskname[CONFIG_NAME_MAX];
/* Verify if the task exists in the list */ /* Verify if the task exists in the list */
@ -290,9 +271,8 @@ void task_mn_unsubscribe(pid_t id)
} }
else else
{ {
task.pid = id; pthread_getname_np(id, taskname, sizeof(taskname));
task_mn_get_task_name(&task); printf("Task %s is not subscribed\n", taskname);
printf("Task %s is not subscribed\n", task.taskname);
} }
} }

1
examples/watcher/task_mn.h
View File

@ -71,7 +71,6 @@ void task_mn_reset_all(void);
struct task_node_s *task_mn_is_task_subscribed(pid_t id); struct task_node_s *task_mn_is_task_subscribed(pid_t id);
void task_mn_add_to_list(pid_t id); void task_mn_add_to_list(pid_t id);
void task_mn_remove_from_list(pid_t id); void task_mn_remove_from_list(pid_t id);
void task_mn_get_task_name(struct noteram_get_taskname_s *task);
void task_mn_subscribe(pid_t id); void task_mn_subscribe(pid_t id);
void task_mn_unsubscribe(pid_t id); void task_mn_unsubscribe(pid_t id);
bool task_mn_all_tasks_fed(void); bool task_mn_all_tasks_fed(void);