X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stat.c;h=9def50759cf22706860b9d0ddea4e488247a839b;hp=536807dc483f7353566ec1853ba8696598e517e7;hb=c9d743cd9a0ac9788884fafd70e6cf5e78941290;hpb=466c0d2b45c100b4b3caeb4c8b476bba21dcd00b

diff --git a/stat.c b/stat.c
index 536807dc..9def5075 100644
--- a/stat.c
+++ b/stat.c
@@ -25,6 +25,7 @@
 #include "list.h"
 #include "error.h"
 #include "string.h"
+#include "fd.h"
 
 /** the maximal number of simultaneous connections */
 #define MAX_STAT_CLIENTS 50
@@ -43,6 +44,7 @@ struct stat_client {
  * the stat client's file descriptor
  */
 int fd;
+long unsigned item_mask;
 /**
  *
  * its entry in the list of stat clients
@@ -110,7 +112,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 +128,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,32 +136,35 @@ 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);
-		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;
@@ -172,7 +178,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,18 +190,35 @@ 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);
+	}
+}
+
+/**
+ * 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) {
+	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;
 }
 
 /**
@@ -247,6 +269,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 +287,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