audiod: kill close_writer()

[paraslash.git] / stat.c

diff --git a/stat.c b/stat.c
index 9b73fcd9c9ce6e2e4d8e4ef7c0319ab5906cd728..9def50759cf22706860b9d0ddea4e488247a839b 100644 (file)
--- a/stat.c
+++ b/stat.c
@@ -25,6 +25,7 @@
 #include "list.h"
 #include "error.h"
 #include "string.h"
 #include "list.h"
 #include "error.h"
 #include "string.h"

+#include "fd.h"

 
 /** the maximal number of simultaneous connections */
 #define MAX_STAT_CLIENTS 50
 
 /** the maximal number of simultaneous connections */
 #define MAX_STAT_CLIENTS 50


@@ -135,20 +136,22 @@ int stat_client_add(int fd, long unsigned mask)
        return 1;
 }
 /**
        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 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;
  */
 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;
        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;
        len = strlen(msg);
        list_for_each_entry_safe(sc, tmp, &client_list, node) {
                int fd = sc->fd, ret;


@@ -159,10 +162,8 @@ void stat_client_write(char *msg, int itemnum)
                FD_ZERO(&wfds);
                FD_SET(fd, &wfds);
 //             PARA_DEBUG_LOG("%s: p=%lx\n", __func__, (long)p);
                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 )
                        ret = write(fd, msg, len);
                        PARA_DEBUG_LOG("dumped %s to fd %d, ret = %d\n", msg, fd, ret);
                        if (ret == len )


@@ -177,7 +178,6 @@ void stat_client_write(char *msg, int itemnum)
                free(sc);
                dump_stat_client_list();
        }
                free(sc);
                dump_stat_client_list();
        }

-//     free(buf);

        PARA_DEBUG_LOG("%d client(s)\n", num_clients);
 }
 
        PARA_DEBUG_LOG("%d client(s)\n", num_clients);
 }
 


@@ -211,8 +211,10 @@ void dump_empty_status(void)
 int stat_item_valid(const char *item)
 {
        int i;
 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;
                return -E_UNKNOWN_STAT_ITEM;

+       }

        FOR_EACH_STAT_ITEM(i)
                if (!strcmp(status_item_list[i], item))
                        return i;
        FOR_EACH_STAT_ITEM(i)
                if (!strcmp(status_item_list[i], item))
                        return i;


@@ -267,6 +269,7 @@ unsigned for_each_line(char *buf, int n, void (*line_handler)(char *))
        char *start = buf, *end;
        int i, num_lines = 0;
 
        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;
        while (start < buf + n) {
                char *next_null;
                char *next_cr;


@@ -284,6 +287,7 @@ unsigned for_each_line(char *buf, int n, void (*line_handler)(char *))
                num_lines++;
                if (line_handler) {
                        *end = '\0';
                num_lines++;
                if (line_handler) {
                        *end = '\0';

+//                     PARA_INFO_LOG("calling line handler: %s\n", start);

                        line_handler(start);
                        start = ++end;
                } else
                        line_handler(start);
                        start = ++end;
                } else