server: Add com_tasks().

It is sometimes useful to see the task list of para_server. The
infrastructure for obtaining this information is already in sched.c,
so this is a rather simple matter.

diff --git a/client.c b/client.c
index 4c4806f928950919d0d763a02104e5d93f316796..e0c978261980b01759fbe66d6d55f2bb541a82fc 100644 (file)
--- a/client.c
+++ b/client.c
@@ -208,6 +208,7 @@ I9E_DUMMY_COMPLETER(version);
 I9E_DUMMY_COMPLETER(stop);
 I9E_DUMMY_COMPLETER(addatt);
 I9E_DUMMY_COMPLETER(init);
+I9E_DUMMY_COMPLETER(tasks);
 
 static struct i9e_completer completers[];
 

diff --git a/command.c b/command.c
index 09f00f2f23d7479c5a567fa8fe85a357088b1ff0..6880cb4091a008b7063f5d7bed43f1ceda8ee5ac 100644 (file)
--- a/command.c
+++ b/command.c
@@ -759,6 +759,16 @@ out:
        return ret;
 }
 
+static int com_tasks(struct command_context *cc)
+{
+       char *tl = server_get_tasks();
+       int ret = 1;
+
+       if (tl)
+               ret = send_sb(&cc->scc, tl, strlen(tl), SBD_OUTPUT, false);
+       return ret;
+}
+
 /*
  * check if perms are sufficient to exec a command having perms cmd_perms.
  * Returns 0 if perms are sufficient, -E_PERM otherwise.

diff --git a/server.c b/server.c
index b5063e2dfc2a7bd66c9b25836438e6c4677167c7..fc81b9440150f886af47b97ce77878f937959344 100644 (file)
--- a/server.c
+++ b/server.c
@@ -113,6 +113,19 @@ struct server_command_task {
        struct task *task;
 };
 
+/**
+ * Return the list of tasks for the server process.
+ *
+ * This is called from \a com_tasks(). The helper is necessary since command
+ * handlers can not access the scheduler structure directly.
+ *
+ * \return A dynamically allocated string that must be freed by the caller.
+ */
+char *server_get_tasks(void)
+{
+       return get_task_list(&sched);
+}
+
 static int want_colors(void)
 {
        if (conf.color_arg == color_arg_no)

diff --git a/server.cmd b/server.cmd
index ebe372b7da67442c11dd2854300aa867fed0408a..5f46ba1eae979b7d1da428d0cd0a069f23640ee5 100644 (file)
--- a/server.cmd
+++ b/server.cmd
@@ -108,6 +108,12 @@ U: stop
 H: Clear the 'P' (playing) bit and set the 'N' (next audio file) bit of the vss
 H: status flags, effectively stopping playback.
 ---
+N: tasks
+P: 0
+D: List server tasks.
+U: tasks
+H: For each task, print ID, status and name.
+---
 N: term
 P: VSS_READ | VSS_WRITE
 D: Ask the server to terminate.

diff --git a/server.h b/server.h
index 16449e6dad787d31010ca856f258c89e7d1147e3..e24dd834faecb4c5c7b8b1fe2567260875a66b15 100644 (file)
--- a/server.h
+++ b/server.h
@@ -98,3 +98,4 @@ extern struct server_args_info conf;
 
 __noreturn void handle_connect(int fd, const char *peername);
 void parse_config_or_die(int override);
+char *server_get_tasks(void);