X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=stat.c;h=b125529ae8f1788ee3c6dfa62f2ac3883ffd0342;hp=ed63ec36b36ff89b5dfc0767ddb6720a6b4a45bb;hb=fa578bf1d070161cafcbcc69ca7b810414ee1a4b;hpb=e1a71def2832a108ed081b4ad8981cc94e8a1412;ds=sidebyside diff --git a/stat.c b/stat.c index ed63ec36..b125529a 100644 --- a/stat.c +++ b/stat.c @@ -1,221 +1,81 @@ /* - * Copyright (C) 2005-2007 Andre Noll + * Copyright (C) 2005-2011 Andre Noll * * 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 + * \file stat.c Functions used for sending/receiving the status of para_server + * 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 - -/** - * 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 */ - long unsigned item_mask; - /** 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/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", +/** The minimal length of a status item buffer. */ +#define MIN_STAT_ITEM_LEN 9 /* 5 + 2 + 2, e.g. '0005 00:\n' */ - [SI_LENGTH] = "length", - [SI_STREAM_START] = "stream_start", - [SI_CURRENT_TIME] = "current_time", - - [SI_AUDIOD_UPTIME] = "audiod_uptime", - [SI_SELECTOR] = "dbtool" -}; - -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 + * Call a function for each complete status item of a buffer. * - * 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, long unsigned mask) -{ - 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_malloc(sizeof(struct stat_client)); - new_client->fd = fd; - 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 status clients + * \param item_buf The source buffer. + * \param num_bytes The length of \a buf. + * \param item_handler Function to call for each complete item. * - * \param msg a \p NULL terminated buffer - * \param itemnum The number of the status item of \a msg + * \return Negative on errors, the number of bytes _not_ passed to \a + * item_handler on success. * - * On write errors, remove the status client from the client list and close its - * file descriptor. + * Status items are expected in the format used by parser-friendly output mode + * of the stat command of para_client/para_audioc. */ -void stat_client_write(const char *msg, int itemnum) +int for_each_stat_item(char *item_buf, size_t num_bytes, + int (*item_handler)(int, char *)) { - 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) { - ret = write(fd, msg, len); - PARA_DEBUG_LOG("dumped %s to fd %d, ret = %d\n", msg, fd, ret); - if (ret == len ) + char *buf = item_buf; + int len = num_bytes; + + for (;;) { + int i, ret, item_len, item_num = 0; + if (len < MIN_STAT_ITEM_LEN) + break; + ret = read_size_header(buf); + if (ret < 0) + return ret; + item_len = ret; + if (item_len > len - 5) /* item not complete */ + break; + for (i = 0; i < 2; i++) { + unsigned char c = buf[5 + i]; + item_num <<= 4; + if (c >= '0' && c <= '9') { + item_num += c - '0'; continue; + } + if (c >= 'a' && c <= 'f') { + item_num += c - 'a' + 10; + continue; + } + return -E_STAT_ITEM_PARSE; } - /* 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(); - } - 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_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; -} - -/** - * check if line starts with known status item. - * - * \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, - * this function returns \p -E_UNKNOWN_STAT_ITEM. - */ -int stat_line_valid(const char *line) -{ - int i; - size_t line_len; - - if (!line || !*line) - return -E_UNKNOWN_STAT_ITEM; - line_len = strlen(line); - FOR_EACH_STAT_ITEM(i) { - const char *s = status_item_list[i]; - size_t item_len = strlen(s); - - if (line_len > item_len && line[item_len] == ':' && - !strncmp(line, s, item_len)) - return i; + if (buf[7] != ':' || buf[5 + item_len - 1] != '\n') + return -E_STAT_ITEM_PARSE; + buf[5 + item_len - 1] = '\0'; + if (item_num >= NUM_STAT_ITEMS) + PARA_WARNING_LOG("unknown status item %d: %s\n", + item_num, buf + 8); + else { + ret = item_handler(item_num, buf + 8); + if (ret < 0) + return ret; + } + buf += 5 + item_len; + len -= 5 + item_len; + assert(len >= 0 && buf <= item_buf + num_bytes); } - return -E_UNKNOWN_STAT_ITEM; + assert(len >= 0); + return len; } -