gengetopt improvements

[paraslash.git] / stat.c

diff --git a/stat.c b/stat.c
index 4259956f6ed5724d5afac014c170a1426b2e56db..9b73fcd9c9ce6e2e4d8e4ef7c0319ab5906cd728 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -43,6 +43,7 @@ struct stat_client {
  * the stat client's file descriptor
  */
 int fd;
+long unsigned item_mask;
 /**
  *
  * its entry in the list of stat clients
@@ -110,7 +111,7 @@ static void dump_stat_client_list(void)
  * \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)
+int stat_client_add(int fd, long unsigned mask)
 {
        struct stat_client *new_client;
 
@@ -126,6 +127,7 @@ 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;
+       new_client->item_mask = mask;
        add_close_on_fork_list(fd);
        list_add(&new_client->node, &client_list);
        dump_stat_client_list();
@@ -137,20 +139,23 @@ int stat_client_add(int fd)
  *
  * \param msg a \p NULL terminated buffer
  */
-void stat_client_write(char *msg)
+void stat_client_write(char *msg, int itemnum)
 {
        struct stat_client *sc, *tmp;
-       char *buf;
+//     char *buf;
        ssize_t len;
        struct timeval tv = {0 , 0};
 
        if (!initialized)
                return;
-       buf = make_message("%s\n", msg);
-       len = strlen(buf);
+//     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_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);
@@ -158,7 +163,7 @@ void stat_client_write(char *msg)
                        ret = select(fd + 1, NULL, &wfds, NULL, &tv);
                while (ret < 0 && errno == EINTR);
                if (ret) {
-                       ret = write(fd, buf, len);
+                       ret = write(fd, msg, len);
                        PARA_DEBUG_LOG("dumped %s to fd %d, ret = %d\n", msg, fd, ret);
                        if (ret == len )
                                continue;
@@ -172,7 +177,7 @@ void stat_client_write(char *msg)
                free(sc);
                dump_stat_client_list();
        }
-       free(buf);
+//     free(buf);
        PARA_DEBUG_LOG("%d client(s)\n", num_clients);
 }
 
@@ -185,19 +190,33 @@ void stat_client_write(char *msg)
 void dump_empty_status(void)
 {
        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;
+               char *tmp = make_message("%s:\n", status_item_list[i]);
+               stat_client_write(tmp, i);
+               free(tmp);
        }
-//     PARA_DEBUG_LOG("%s: empty items: %s\n", __func__, empty_items);
-       stat_client_write(empty_items);
-       free(empty_items);
+}
+
+/**
+ * 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)
+               return -E_UNKNOWN_STAT_ITEM;
+       FOR_EACH_STAT_ITEM(i)
+               if (!strcmp(status_item_list[i], item))
+                       return i;
+       return -E_UNKNOWN_STAT_ITEM;
 }
 
 /**
@@ -217,7 +236,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);