X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stat.c;h=39aab43ebd256a6de2e20015e4519ed98b77c761;hp=9b73fcd9c9ce6e2e4d8e4ef7c0319ab5906cd728;hb=786010c598f79d20280e6ea9ea458cad4a7e9af7;hpb=513a3be6c609dd812e2b7755bab533d28676bd9c

diff --git a/stat.c b/stat.c
index 9b73fcd9..39aab43e 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
@@ -128,27 +129,28 @@ int stat_client_add(int fd, long unsigned mask)
 	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();
 	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, 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(msg);
 	list_for_each_entry_safe(sc, tmp, &client_list, node) {
 		int fd = sc->fd, ret;
@@ -159,10 +161,8 @@ void stat_client_write(char *msg, int itemnum)
 		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 = 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 )
@@ -170,14 +170,12 @@ void stat_client_write(char *msg, int itemnum)
 		}
 		/* 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);
 }
 
@@ -211,8 +209,10 @@ void dump_empty_status(void)
 int stat_item_valid(const char *item)
 {
 	int i;
-	if (!item || !*item)
+	if (!item || !*item) {
+	PARA_ERROR_LOG("%s\n", "no item");
 		return -E_UNKNOWN_STAT_ITEM;
+	}
 	FOR_EACH_STAT_ITEM(i)
 		if (!strcmp(status_item_list[i], item))
 			return i;
@@ -267,6 +267,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;
@@ -284,6 +285,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