X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stat.c;h=ed63ec36b36ff89b5dfc0767ddb6720a6b4a45bb;hp=33fdb8c1d0fec0596482820f447fb57c3754b003;hb=e1a71def2832a108ed081b4ad8981cc94e8a1412;hpb=7050cf4ed059227268e964604ca1c6597c856167 diff --git a/stat.c b/stat.c index 33fdb8c1..ed63ec36 100644 --- a/stat.c +++ b/stat.c @@ -1,25 +1,18 @@ /* - * Copyright (C) 2005-2006 Andre Noll + * Copyright (C) 2005-2007 Andre Noll * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Licensed under the GPL v2. For licencing details see COPYING. */ /** * \file stat.c functions used for sending/receiving the status of para_server * and para_audiod */ + + +#include +#include + #include "para.h" #include "close_on_fork.h" #include "list.h" @@ -51,11 +44,9 @@ static struct list_head client_list; static int initialized; static int num_clients; -/** - * the list of all status items sent by para_server/para_audiod - */ +/** The list of all status items used by para_server/para_audiod. */ const char *status_item_list[NUM_STAT_ITEMS] = { - [SI_STATUS_BAR] = "status_bar", + [SI_BASENAME] = "basename", [SI_STATUS] = "status", [SI_NUM_PLAYED] = "num_played", @@ -72,8 +63,8 @@ const char *status_item_list[NUM_STAT_ITEMS] = { [SI_AUDIO_INFO2] = "audio_file_info2", [SI_AUDIO_INFO3] = "audio_file_info3", - [SI_DBINFO1] = "dbinfo1", - [SI_DBINFO2] = "dbinfo2", + [SI_AFS_MODE] = "afs_mode", + [SI_ATTRIBUTES] = "attributes", [SI_DBINFO3] = "dbinfo3", [SI_DECODER_FLAGS] = "decoder_flags", @@ -90,7 +81,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) { @@ -104,8 +94,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) { @@ -124,7 +120,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; - list_add(&new_client->node, &client_list); + para_list_add(&new_client->node, &client_list); dump_stat_client_list(); num_clients++; return 1; @@ -138,15 +134,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; @@ -174,25 +169,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. * @@ -205,12 +181,13 @@ int stat_item_valid(const char *item) { int i; if (!item || !*item) { - PARA_ERROR_LOG("%s\n", "no 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; + PARA_ERROR_LOG("invalid stat item: %s\n", item); return -E_UNKNOWN_STAT_ITEM; } @@ -242,55 +219,3 @@ int stat_line_valid(const char *line) return -E_UNKNOWN_STAT_ITEM; } -/** - * call a custom function for each complete line - * - * \param buf the buffer containing data seperated by newlines - * \param n the number of bytes in \a buf - * \param line_handler the custom function - * - * If \a line_handler is \p NULL, return number of complete lines in buf. - * Otherwise, call \a line_handler for each complete line. The rest of the - * buffer (last chunk containing incomplete line is moved to the beginning of - * the buffer. - * - * \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 *)) -{ - 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; - - next_cr = memchr(start, '\n', buf + n - start); - next_null = memchr(start, '\0', buf + n - start); - if (!next_cr && !next_null) - break; - if (next_cr && next_null) { - end = next_cr < next_null? next_cr : next_null; - } else if (next_null) { - end = next_null; - } else - end = next_cr; - num_lines++; - if (line_handler) { - *end = '\0'; -// PARA_INFO_LOG("calling line handler: %s\n", start); - line_handler(start); - start = ++end; - } else - start = ++end; - } - if (!line_handler) - return num_lines; - i = buf + n - start; - if (i && i != n) - memmove(buf, start, i); - return i; -} -