X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stat.c;h=caf432d9748ca3b5e293657359a17ca98f5b8559;hp=ac5fe8c84bb0b45dafaa752e9692986b89a7728f;hb=6f58bbe94b49c0fb473bffebde598a3d26b051f3;hpb=b24869714aed385f04d282f854aaec7e69428cce

diff --git a/stat.c b/stat.c
index ac5fe8c8..caf432d9 100644
--- a/stat.c
+++ b/stat.c
@@ -25,29 +25,26 @@
 #include "list.h"
 #include "error.h"
 #include "string.h"
+#include "fd.h"
 
 /** the maximal number of simultaneous connections */
 #define MAX_STAT_CLIENTS 50
 
 /**
- * The structure associated with a connected client that sent the 'stat' command
-*
+ * describes a status client of para_audiod
+ *
+ * There's one such structure per audiod client that sent the 'stat' command.
  *
  * A status client is identified by its file descriptor.  para_audiod
  * keeps a list of connected status clients.
  */
 struct stat_client {
-/**
- *
- *
- * the stat client's file descriptor
- */
-int fd;
-/**
- *
- * its entry in the list of stat clients
-*/
-struct list_head node;
+	/** the stat client's file descriptor */
+	int fd;
+	/** bitmask of those status items the client is interested in */
+	long unsigned item_mask;
+	/** its entry in the list of stat clients */
+	struct list_head node;
 };
 
 static struct list_head client_list;
@@ -93,7 +90,6 @@ const char *status_item_list[NUM_STAT_ITEMS] = {
 	[SI_AUDIOD_UPTIME] = "audiod_uptime",
 	[SI_SELECTOR] = "dbtool"
 };
-#define FOR_EACH_STAT_ITEM(i) for (i = 0; i < NUM_STAT_ITEMS; i++)
 
 static void dump_stat_client_list(void)
 {
@@ -110,7 +106,7 @@ static void dump_stat_client_list(void)
  * \return Positive value on success, or -E_TOO_MANY_CLIENTS if
  * the number of connected clients exceeds #MAX_STAT_CLIENTS
  */
-int stat_client_add(int fd)
+int stat_client_add(int fd, long unsigned mask)
 {
 	struct stat_client *new_client;
 
@@ -126,77 +122,77 @@ int stat_client_add(int fd)
 	PARA_INFO_LOG("adding client on fd %d\n", fd);
 	new_client = para_malloc(sizeof(struct stat_client));
 	new_client->fd = fd;
-	add_close_on_fork_list(fd);
-	list_add(&new_client->node, &client_list);
+	new_client->item_mask = mask;
+	para_list_add(&new_client->node, &client_list);
 	dump_stat_client_list();
 	num_clients++;
 	return 1;
 }
 /**
- * write a message to all connected stat clients
+ * write a message to all connected status clients
  *
  * \param msg a \p NULL terminated buffer
+ * \param itemnum The number of the status item of \a msg
+ *
+ * On write errors, remove the status client from the client list and close its
+ * file descriptor.
  */
-void stat_client_write(char *msg)
+void stat_client_write(char *msg, int itemnum)
 {
 	struct stat_client *sc, *tmp;
-	char *buf;
 	ssize_t len;
 	struct timeval tv = {0 , 0};
 
 	if (!initialized)
 		return;
-	buf = make_message("%s\n", msg);
-	len = strlen(buf);
+	len = strlen(msg);
 	list_for_each_entry_safe(sc, tmp, &client_list, node) {
 		int fd = sc->fd, ret;
 		fd_set wfds;
+
+		if (!((1 << itemnum) & sc->item_mask))
+			continue;
 		FD_ZERO(&wfds);
 		FD_SET(fd, &wfds);
 //		PARA_DEBUG_LOG("%s: p=%lx\n", __func__, (long)p);
-		do
-			ret = select(fd + 1, NULL, &wfds, NULL, &tv);
-		while (ret < 0 && errno == EINTR);
-		if (ret) {
-			ret = write(fd, buf, len);
+		ret = para_select(fd + 1, NULL, &wfds, &tv);
+		if (ret > 0) {
+			ret = write(fd, msg, len);
 			PARA_DEBUG_LOG("dumped %s to fd %d, ret = %d\n", msg, fd, ret);
 			if (ret == len )
 				continue;
 		}
 		/* write error or fd not ready for writing */
 		close(fd);
-		del_close_on_fork_list(fd);
 		num_clients--;
 		PARA_INFO_LOG("deleting client on fd %d\n", fd);
 		list_del(&sc->node);
 		free(sc);
 		dump_stat_client_list();
 	}
-	free(buf);
 	PARA_DEBUG_LOG("%d client(s)\n", num_clients);
 }
 
+
 /**
- * send empty status list
+ * check if string is a known status item.
  *
- * Send to  each connected client the full status item list
- * with empty values.
+ * \param item buffer containing the text to check
+ *
+ * \return If \a item is a valid status item, the number of that status item is
+ * returned. Otherwise, this function returns \p -E_UNKNOWN_STAT_ITEM.
  */
-void dump_empty_status(void)
+int stat_item_valid(const char *item)
 {
 	int i;
-	char *empty_items = NULL;
-
-	if (!initialized)
-		return;
-	FOR_EACH_STAT_ITEM(i) {
-		char *tmp = make_message("%s%s:\n", empty_items? empty_items : "",
-			status_item_list[i]);
-		free(empty_items);
-		empty_items = tmp;
+	if (!item || !*item) {
+	PARA_ERROR_LOG("%s\n", "no item");
+		return -E_UNKNOWN_STAT_ITEM;
 	}
-	stat_client_write(empty_items);
-	free(empty_items);
+	FOR_EACH_STAT_ITEM(i)
+		if (!strcmp(status_item_list[i], item))
+			return i;
+	return -E_UNKNOWN_STAT_ITEM;
 }
 
 /**
@@ -216,7 +212,7 @@ int stat_line_valid(const char *line)
 	if (!line || !*line)
 		return -E_UNKNOWN_STAT_ITEM;
 	line_len = strlen(line);
-	for (i = 0; i < NUM_STAT_ITEMS; i++) {
+	FOR_EACH_STAT_ITEM(i) {
 		const char *s = status_item_list[i];
 		size_t item_len = strlen(s);
 
@@ -247,6 +243,7 @@ unsigned for_each_line(char *buf, int n, void (*line_handler)(char *))
 	char *start = buf, *end;
 	int i, num_lines = 0;
 
+//	PARA_INFO_LOG("buf: %s", buf);
 	while (start < buf + n) {
 		char *next_null;
 		char *next_cr;
@@ -264,6 +261,7 @@ unsigned for_each_line(char *buf, int n, void (*line_handler)(char *))
 		num_lines++;
 		if (line_handler) {
 			*end = '\0';
+//			PARA_INFO_LOG("calling line handler: %s\n", start);
 			line_handler(start);
 			start = ++end;
 		} else