X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stat.c;h=e881ae09fed1f0d77983cb6eb6081598f3fc3f90;hp=532f9cdfc5449add435bcfb4ba71a91924991c9b;hb=ca9b84e496c63f8a016c042eb2a84916c6d385e1;hpb=69f0930489da9ace5af8aee104ad21d188aed387

diff --git a/stat.c b/stat.c
index 532f9cdf..e881ae09 100644
--- a/stat.c
+++ b/stat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -31,25 +31,20 @@
 #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;
-long unsigned item_mask;
-/**
- *
- * 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;
@@ -95,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)
 {
@@ -109,8 +103,14 @@ static void dump_stat_client_list(void)
 /**
  * add a status client to the list
  *
+ * \param fd the file descriptor of the client
+ * \param mask bitfield of status items for this client
+ *
+ * Only those status items having the bit set in \a mask will be
+ * sent to the client.
+ *
  * \return Positive value on success, or -E_TOO_MANY_CLIENTS if
- * the number of connected clients exceeds #MAX_STAT_CLIENTS
+ * the number of connected clients exceeds #MAX_STAT_CLIENTS.
  */
 int stat_client_add(int fd, long unsigned mask)
 {
@@ -129,8 +129,7 @@ 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);
+	para_list_add(&new_client->node, &client_list);
 	dump_stat_client_list();
 	num_clients++;
 	return 1;
@@ -144,15 +143,14 @@ int stat_client_add(int fd, long unsigned mask)
  * On write errors, remove the status client from the client list and close its
  * file descriptor.
  */
-void stat_client_write(char *msg, int itemnum)
+void stat_client_write(const char *msg, int itemnum)
 {
 	struct stat_client *sc, *tmp;
-	ssize_t len;
+	size_t len = strlen(msg);
 	struct timeval tv = {0 , 0};
 
-	if (!initialized)
+	if (!initialized || !len)
 		return;
-	len = strlen(msg);
 	list_for_each_entry_safe(sc, tmp, &client_list, node) {
 		int fd = sc->fd, ret;
 		fd_set wfds;
@@ -171,7 +169,6 @@ 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);
@@ -181,24 +178,6 @@ void stat_client_write(char *msg, int itemnum)
 	PARA_DEBUG_LOG("%d client(s)\n", num_clients);
 }
 
-/**
- * send empty status list
- *
- * Send to  each connected client the full status item list
- * with empty values.
- */
-void dump_empty_status(void)
-{
-	int i;
-
-	if (!initialized)
-		return;
-	FOR_EACH_STAT_ITEM(i) {
-		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.
@@ -264,18 +243,18 @@ int stat_line_valid(const char *line)
  * \return If line_handler is not NULL, this function returns the number
  * of bytes not handled to \a line_handler.
  */
-unsigned for_each_line(char *buf, int n, void (*line_handler)(char *))
+size_t for_each_line(char *buf, size_t n, void (*line_handler)(char *))
 {
 	char *start = buf, *end;
-	int i, num_lines = 0;
+	size_t num_lines = 0, bytes_left = n;
 
-	PARA_INFO_LOG("buf: %s", buf);
-	while (start < buf + n) {
+//	PARA_INFO_LOG("buf: %s", buf);
+	while (bytes_left) {
 		char *next_null;
 		char *next_cr;
 
-		next_cr = memchr(start, '\n', buf + n - start);
-		next_null = memchr(start, '\0', buf + n - start);
+		next_cr = memchr(start, '\n', bytes_left);
+		next_null = memchr(start, '\0', bytes_left);
 		if (!next_cr && !next_null)
 			break;
 		if (next_cr && next_null) {
@@ -287,17 +266,16 @@ 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);
+//			PARA_INFO_LOG("calling line handler: %s\n", start);
 			line_handler(start);
-			start = ++end;
-		} else
-			start = ++end;
+		}
+		start = ++end;
+		bytes_left = buf + n - start;
 	}
 	if (!line_handler)
 		return num_lines;
-	i = buf + n - start;
-	if (i && i != n)
-		memmove(buf, start, i);
-	return i;
+	if (bytes_left && bytes_left != n)
+		memmove(buf, start, bytes_left);
+	return bytes_left;
 }