X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stat.c;h=0457a0f3dc689139179f9a5495e110b6a260f8f3;hp=ed63ec36b36ff89b5dfc0767ddb6720a6b4a45bb;hb=73f02f72cb49baebff3e0f6946750a5bc0693321;hpb=e1a71def2832a108ed081b4ad8981cc94e8a1412

diff --git a/stat.c b/stat.c
index ed63ec36..0457a0f3 100644
--- a/stat.c
+++ b/stat.c
@@ -5,8 +5,8 @@
  */
 
 /**
- *  \file stat.c functions used for sending/receiving the status of para_server
- *  and para_audiod
+ *  \file stat.c Functions used for sending/receiving the status of para_server
+ *  and para_audiod.
  */
 
 
@@ -20,11 +20,11 @@
 #include "string.h"
 #include "fd.h"
 
-/** the maximal number of simultaneous connections */
+/** The maximal number of simultaneous connections. */
 #define MAX_STAT_CLIENTS 50
 
 /**
- * describes a status client of para_audiod
+ * Describes a status client of para_audiod.
  *
  * There's one such structure per audiod client that sent the 'stat' command.
  *
@@ -32,11 +32,11 @@
  * keeps a list of connected status clients.
  */
 struct stat_client {
-	/** the stat client's file descriptor */
+	/** The stat client's file descriptor. */
 	int fd;
-	/** bitmask of those status items the client is interested in */
+	/** Bitmask of those status items the client is interested in. */
 	long unsigned item_mask;
-	/** its entry in the list of stat clients */
+	/** Its entry in the list of stat clients. */
 	struct list_head node;
 };
 
@@ -44,43 +44,8 @@ static struct list_head client_list;
 static int initialized;
 static int num_clients;
 
-/** The list of all status items used by para_server/para_audiod. */
-const char *status_item_list[NUM_STAT_ITEMS] = {
-	[SI_BASENAME] = "basename",
-	[SI_STATUS] = "status",
-	[SI_NUM_PLAYED] = "num_played",
-
-	[SI_MTIME] = "mtime",
-	[SI_LENGTH_MIN] = "length_min",
-	[SI_LENGTH_SEC] = "length_sec",
-
-	[SI_FILE_SIZE] = "file_size",
-	[SI_STATUS_FLAGS] = "status_flags",
-	[SI_FORMAT] = "format",
-
-	[SI_SCORE] = "score",
-	[SI_AUDIO_INFO1] = "audio_file_info1",
-	[SI_AUDIO_INFO2] = "audio_file_info2",
-
-	[SI_AUDIO_INFO3] = "audio_file_info3",
-	[SI_AFS_MODE] = "afs_mode",
-	[SI_ATTRIBUTES] = "attributes",
-
-	[SI_DBINFO3] = "dbinfo3",
-	[SI_DECODER_FLAGS] = "decoder_flags",
-	[SI_AUDIOD_STATUS] = "audiod_status",
-
-	[SI_PLAY_TIME] = "play_time",
-	[SI_UPTIME] = "uptime",
-	[SI_OFFSET] = "offset",
-
-	[SI_LENGTH] = "length",
-	[SI_STREAM_START] = "stream_start",
-	[SI_CURRENT_TIME] = "current_time",
-
-	[SI_AUDIOD_UPTIME] = "audiod_uptime",
-	[SI_SELECTOR] = "dbtool"
-};
+/** The list of all status items used by para_{server,audiod,gui}. */
+const char *status_item_list[] = {STATUS_ITEM_ARRAY};
 
 static void dump_stat_client_list(void)
 {
@@ -92,10 +57,10 @@ static void dump_stat_client_list(void)
 		PARA_INFO_LOG("stat client on fd %d\n", sc->fd);
 }
 /**
- * add a status client to the list
+ * Add a status client to the list.
  *
- * \param fd the file descriptor of the client
- * \param mask bitfield of status items for this client
+ * \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.
@@ -126,10 +91,10 @@ int stat_client_add(int fd, long unsigned mask)
 	return 1;
 }
 /**
- * write a message to all connected status 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
+ * \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.
@@ -138,24 +103,18 @@ void stat_client_write(const char *msg, int itemnum)
 {
 	struct stat_client *sc, *tmp;
 	size_t len = strlen(msg);
-	struct timeval tv = {0 , 0};
 
 	if (!initialized || !len)
 		return;
 	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);
-		ret = para_select(fd + 1, NULL, &wfds, &tv);
-		if (ret > 0) {
+		if (write_ok(fd) > 0) {
 			ret = write(fd, msg, len);
 			PARA_DEBUG_LOG("dumped %s to fd %d, ret = %d\n", msg, fd, ret);
-			if (ret == len )
+			if (ret == len)
 				continue;
 		}
 		/* write error or fd not ready for writing */
@@ -170,9 +129,9 @@ void stat_client_write(const char *msg, int itemnum)
 }
 
 /**
- * check if string is a known status item.
+ * Check if string is a known status item.
  *
- * \param item buffer containing the text to check
+ * \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.
@@ -184,7 +143,7 @@ int stat_item_valid(const char *item)
 		PARA_ERROR_LOG("%s\n", "no item");
 		return -E_UNKNOWN_STAT_ITEM;
 	}
-	FOR_EACH_STAT_ITEM(i)
+	FOR_EACH_STATUS_ITEM(i)
 		if (!strcmp(status_item_list[i], item))
 			return i;
 	PARA_ERROR_LOG("invalid stat item: %s\n", item);
@@ -192,9 +151,9 @@ int stat_item_valid(const char *item)
 }
 
 /**
- * check if line starts with known status item.
+ * Check if line starts with known status item.
  *
- * \param line buffer containing the line
+ * \param line Buffer containing the line.
  *
  * \return If the beginning of \a line matches any paraslash status item and is
  * followed by a colon, the number of that status item is returned. Otherwise,
@@ -208,7 +167,7 @@ int stat_line_valid(const char *line)
 	if (!line || !*line)
 		return -E_UNKNOWN_STAT_ITEM;
 	line_len = strlen(line);
-	FOR_EACH_STAT_ITEM(i) {
+	FOR_EACH_STATUS_ITEM(i) {
 		const char *s = status_item_list[i];
 		size_t item_len = strlen(s);