#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;
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);
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, int itemnum)
{
struct stat_client *sc, *tmp;
-// char *buf;
ssize_t len;
struct timeval tv = {0 , 0};
if (!initialized)
return;
-// buf = make_message("%s\n", msg);
len = strlen(msg);
list_for_each_entry_safe(sc, tmp, &client_list, node) {
int fd = sc->fd, ret;
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);
free(sc);
dump_stat_client_list();
}
-// free(buf);
PARA_DEBUG_LOG("%d client(s)\n", num_clients);
}
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