X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stat.c;h=e3773df6403fb72d0c5163efa19c2f0ea43f7392;hp=4ad1b5a88d957f411c5ccad6bb00f871e440f842;hb=e2213f2468eb1c6f8ca033c6529ee1b5ceadab7f;hpb=19c9891a4083cf0d5d7ee82b09bed71a1059f71e

diff --git a/stat.c b/stat.c
index 4ad1b5a8..e3773df6 100644
--- a/stat.c
+++ b/stat.c
@@ -43,6 +43,7 @@ struct stat_client {
  * the stat client's file descriptor
  */
 int fd;
+long unsigned item_mask;
 /**
  *
  * its entry in the list of stat clients
@@ -91,7 +92,7 @@ const char *status_item_list[NUM_STAT_ITEMS] = {
 	[SI_CURRENT_TIME] = "current_time",
 
 	[SI_AUDIOD_UPTIME] = "audiod_uptime",
-	[SI_DBTOOL] = "dbtool"
+	[SI_SELECTOR] = "dbtool"
 };
 #define FOR_EACH_STAT_ITEM(i) for (i = 0; i < NUM_STAT_ITEMS; i++)
 
@@ -110,7 +111,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,6 +127,7 @@ 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;
+	new_client->item_mask = mask;
 	add_close_on_fork_list(fd);
 	list_add(&new_client->node, &client_list);
 	dump_stat_client_list();
@@ -133,24 +135,29 @@ int stat_client_add(int fd)
 	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);
@@ -158,7 +165,7 @@ void stat_client_write(char *msg)
 			ret = select(fd + 1, NULL, &wfds, NULL, &tv);
 		while (ret < 0 && errno == EINTR);
 		if (ret) {
-			ret = write(fd, buf, len);
+			ret = write(fd, msg, len);
 			PARA_DEBUG_LOG("dumped %s to fd %d, ret = %d\n", msg, fd, ret);
 			if (ret == len )
 				continue;
@@ -172,7 +179,6 @@ void stat_client_write(char *msg)
 		free(sc);
 		dump_stat_client_list();
 	}
-	free(buf);
 	PARA_DEBUG_LOG("%d client(s)\n", num_clients);
 }
 
@@ -185,19 +191,33 @@ void stat_client_write(char *msg)
 void dump_empty_status(void)
 {
 	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;
+		char *tmp = make_message("%s:\n", status_item_list[i]);
+		stat_client_write(tmp, i);
+		free(tmp);
 	}
-//	PARA_DEBUG_LOG("%s: empty items: %s\n", __func__, empty_items);
-	stat_client_write(empty_items);
-	free(empty_items);
+}
+
+/**
+ * check if string is a known status item.
+ *
+ * \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.
+ */
+int stat_item_valid(const char *item)
+{
+	int i;
+	if (!item || !*item)
+		return -E_UNKNOWN_STAT_ITEM;
+	FOR_EACH_STAT_ITEM(i)
+		if (!strcmp(status_item_list[i], item))
+			return i;
+	return -E_UNKNOWN_STAT_ITEM;
 }
 
 /**
@@ -217,7 +237,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);