/*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
*
* 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
#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;
-long unsigned item_mask;
-/**
- *
- * 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;
[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)
{
/**
* 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)
{
new_client = para_malloc(sizeof(struct stat_client));
new_client->fd = fd;
new_client->item_mask = mask;
- add_close_on_fork_list(fd);
- list_add(&new_client->node, &client_list);
+ para_list_add(&new_client->node, &client_list);
dump_stat_client_list();
num_clients++;
return 1;
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 = 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 )
}
/* 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);
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.
int stat_item_valid(const char *item)
{
int i;
- if (!item || !*item)
+ 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;
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;
num_lines++;
if (line_handler) {
*end = '\0';
+// PARA_INFO_LOG("calling line handler: %s\n", start);
line_handler(start);
start = ++end;
} else