X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stat.c;h=e881ae09fed1f0d77983cb6eb6081598f3fc3f90;hp=7550f2d6d2f33d684be389417589efe4a75dd71c;hb=ca9b84e496c63f8a016c042eb2a84916c6d385e1;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623 diff --git a/stat.c b/stat.c index 7550f2d6..e881ae09 100644 --- a/stat.c +++ b/stat.c @@ -1,5 +1,5 @@ /* - * 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 @@ -25,29 +25,26 @@ #include "list.h" #include "error.h" #include "string.h" +#include "fd.h" /** the maximal number of simultaneous connections */ #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; -/** - * - * 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; @@ -91,9 +88,8 @@ const char *status_item_list[NUM_STAT_ITEMS] = { [SI_CURRENT_TIME] = "current_time", [SI_AUDIOD_UPTIME] = "audiod_uptime", - [SI_DBTOOL] = "dbtool" + [SI_SELECTOR] = "dbtool" }; -#define FOR_EACH_STAT_ITEM(i) for (i = 0; i < NUM_STAT_ITEMS; i++) static void dump_stat_client_list(void) { @@ -107,10 +103,16 @@ 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) +int stat_client_add(int fd, long unsigned mask) { struct stat_client *new_client; @@ -126,78 +128,76 @@ 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; - add_close_on_fork_list(fd); - list_add(&new_client->node, &client_list); + new_client->item_mask = mask; + para_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) +void stat_client_write(const char *msg, int itemnum) { struct stat_client *sc, *tmp; - char *buf; - ssize_t len; + size_t len = strlen(msg); struct timeval tv = {0 , 0}; - if (!initialized) + if (!initialized || !len) return; - buf = make_message("%s\n", msg); - len = strlen(buf); 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; } /* 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); } + /** - * send empty status list + * check if string is a known status item. + * + * \param item buffer containing the text to check * - * Send to each connected client the full status item list - * with empty values. + * \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. */ -void dump_empty_status(void) +int stat_item_valid(const char *item) { 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; + if (!item || !*item) { + PARA_ERROR_LOG("%s\n", "no item"); + return -E_UNKNOWN_STAT_ITEM; } -// PARA_DEBUG_LOG("%s: empty items: %s\n", __func__, empty_items); - 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; } /** @@ -217,7 +217,7 @@ int stat_line_valid(const char *line) if (!line || !*line) return -E_UNKNOWN_STAT_ITEM; line_len = strlen(line); - for (i = 0; i < NUM_STAT_ITEMS; i++) { + FOR_EACH_STAT_ITEM(i) { const char *s = status_item_list[i]; size_t item_len = strlen(s); @@ -234,28 +234,27 @@ int stat_line_valid(const char *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 - * \param num upper bound on calls to \a line_handler * * If \a line_handler is \p NULL, return number of complete lines in buf. - * Otherwise, call \a line_handler for each complete line, but no more than \a num - * times. If \a num is zero, there is no restriction on how often \a line_handler - * may be called. The rest of the buffer (last chunk containing incomplete line - * if \a num is zero) is moved to the beginning of the buffer. + * 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 *), int num) +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; - 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) { @@ -267,18 +266,16 @@ unsigned for_each_line(char *buf, int n, void (*line_handler)(char *), int num) num_lines++; if (line_handler) { *end = '\0'; +// PARA_INFO_LOG("calling line handler: %s\n", start); line_handler(start); - start = ++end; - if (num && num_lines >= num) - break; - } 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; }