X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stat.c;h=d6312392ccbacc5bd21c0f15b635ddc0d10e42c9;hp=1062da360b3fe97090c67ebfd74363d5fa3035d9;hb=b55f405f8005821ffa369b929bc0b419da62683d;hpb=337d7784b0f8bc30b1fa9af56ace503acd97d40d diff --git a/stat.c b/stat.c index 1062da36..d6312392 100644 --- a/stat.c +++ b/stat.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2005-2009 Andre Noll + * Copyright (C) 2005-2012 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -9,168 +9,12 @@ * and para_audiod. */ - -#include -#include +#include #include "para.h" -#include "close_on_fork.h" -#include "list.h" #include "error.h" #include "string.h" -#include "fd.h" - -/** The maximal number of simultaneous connections. */ -#define MAX_STAT_CLIENTS 50 - -extern char *stat_item_values[NUM_STAT_ITEMS]; - -/** Flags used for the stat command of para_audiod. */ -enum stat_client_flags { - /** Enable parser-friendly output. */ - SCF_PARSER_FRIENDLY = 1, -}; - -/** - * 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; - /** Bitmask of those status items the client is interested in. */ - uint64_t item_mask; - /** See \ref stat_client flags. s*/ - unsigned flags; - /** Its entry in the list of stat clients. */ - struct list_head node; -}; - -static struct list_head client_list; -static int initialized; -static int num_clients; - -/** 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) -{ - struct stat_client *sc; - - if (!initialized) - return; - list_for_each_entry(sc, &client_list, node) - PARA_INFO_LOG("stat client on fd %d\n", sc->fd); -} -/** - * 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 parser_friendly Enable parser-friendly output mode. - * - * 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. - */ -int stat_client_add(int fd, uint64_t mask, int parser_friendly) -{ - struct stat_client *new_client; - - if (num_clients >= MAX_STAT_CLIENTS) { - PARA_ERROR_LOG("maximal number of stat clients (%d) exceeded\n", - MAX_STAT_CLIENTS); - return -E_TOO_MANY_CLIENTS; - } - if (!initialized) { - INIT_LIST_HEAD(&client_list); - initialized = 1; - } - PARA_INFO_LOG("adding client on fd %d\n", fd); - new_client = para_calloc(sizeof(struct stat_client)); - new_client->fd = fd; - new_client->item_mask = mask; - if (parser_friendly) - new_client->flags = SCF_PARSER_FRIENDLY; - para_list_add(&new_client->node, &client_list); - dump_stat_client_list(); - num_clients++; - return 1; -} -/** - * Write a message to all connected status clients. - * - * \param item_num 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_item(int item_num) -{ - struct stat_client *sc, *tmp; - struct para_buffer pb = {.flags = 0}; - struct para_buffer pfpb = {.flags = PBF_SIZE_PREFIX}; - const uint64_t one = 1; - - if (!initialized) - return; - list_for_each_entry_safe(sc, tmp, &client_list, node) { - int fd = sc->fd, ret; - - if (!((one << item_num) & sc->item_mask)) - continue; - if (write_ok(fd) > 0) { - struct para_buffer *b = - (sc->flags & SCF_PARSER_FRIENDLY)? &pfpb : &pb; - char *msg = stat_item_values[item_num]; - if (!b->buf) - WRITE_STATUS_ITEM(b, item_num, "%s\n", - msg? msg : ""); - ret = write(fd, b->buf, b->offset); - if (ret == b->offset) - continue; - } - /* write error or fd not ready for writing */ - close(fd); - num_clients--; - PARA_INFO_LOG("deleting client on fd %d\n", fd); - list_del(&sc->node); - free(sc); - dump_stat_client_list(); - } - free(pb.buf); - free(pfpb.buf); -// if (num_clients) -// PARA_DEBUG_LOG("%d client(s)\n", num_clients); -} - -/** - * Check if string is a known status item. - * - * \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. - */ -int stat_item_valid(const char *item) -{ - int i; - if (!item || !*item) { - PARA_ERROR_LOG("%s\n", "no item"); - return -E_UNKNOWN_STAT_ITEM; - } - FOR_EACH_STATUS_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; -} /** The minimal length of a status item buffer. */ #define MIN_STAT_ITEM_LEN 9 /* 5 + 2 + 2, e.g. '0005 00:\n' */ @@ -183,7 +27,7 @@ int stat_item_valid(const char *item) * \param item_handler Function to call for each complete item. * * \return Negative on errors, the number of bytes _not_ passed to \a - * item_handler. + * item_handler on success. * * Status items are expected in the format used by parser-friendly output mode * of the stat command of para_client/para_audioc. @@ -233,7 +77,5 @@ int for_each_stat_item(char *item_buf, size_t num_bytes, assert(len >= 0 && buf <= item_buf + num_bytes); } assert(len >= 0); - if (len && len != num_bytes) - memmove(item_buf, item_buf + num_bytes - len, len); return len; }