add info about what dirs/files are doing

[ust.git] / libustcomm / ustcomm.c

diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c
index c76413861cb418cf142c75b14192d85e1216b5a5..d537eebf8a7164b0acf02c415889e6fb632e62fb 100644 (file)
--- a/libustcomm/ustcomm.c
+++ b/libustcomm/ustcomm.c
@@ -15,6 +15,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+/* API used by UST components to communicate with each other via sockets. */
+
 #define _GNU_SOURCE
 #include <sys/types.h>
 #include <signal.h>
@@ -37,22 +39,6 @@
 
 #define UNIX_PATH_MAX 108
 
-#define MSG_MAX 10000
-
-/* FIXME: ustcomm blocks on message sending, which might be problematic in
- * some cases. Fix the poll() usage so sends are buffered until they don't
- * block.
- */
-
-//static void bt(void)
-//{
-//     void *buffer[100];
-//     int result;
-//
-//     result = backtrace(&buffer, 100);
-//     backtrace_symbols_fd(buffer, result, STDERR_FILENO);
-//}
-
 static int mkdir_p(const char *path, mode_t mode)
 {
        const char *path_p;
@@ -102,20 +88,6 @@ static int mkdir_p(const char *path, mode_t mode)
        return retval;
 }
 
-char *strdup_malloc(const char *s)
-{
-       char *retval;
-
-       if(s == NULL)
-               return NULL;
-
-       retval = (char *) malloc(strlen(s)+1);
-
-       strcpy(retval, s);
-
-       return retval;
-}
-
 static int signal_process(pid_t pid)
 {
        return 0;
@@ -277,9 +249,13 @@ static int recv_message_fd(int fd, char **recv_buf, int *recv_buf_size, int *rec
                                *recv_buf_size = 0;
                                return 0;
                        }
-                       /* real error */
-                       PERROR("recv");
-                       return -1;
+                       else if(errno == EINTR) {
+                               return -1;
+                       }
+                       else {
+                               PERROR("recv");
+                               return -1;
+                       }
                }
                if(result == 0) {
                        return 0;
@@ -378,15 +354,18 @@ int ustcomm_recv_message(struct ustcomm_server *server, char **msg, struct ustco
                        idx++;
                }
 
-               while((result = poll(fds, n_fds, timeout)) == -1 && errno == EINTR)
-                       /* nothing */;
-               if(result == -1) {
+               result = poll(fds, n_fds, timeout);
+               if(result == -1 && errno == EINTR) {
+                       /* That's ok. ustd receives signals to notify it must shutdown. */
+                       retval = -1;
+                       goto free_conn_table_return;
+               }
+               else if(result == -1) {
                        PERROR("poll");
                        retval = -1;
                        goto free_conn_table_return;
                }
-
-               if(result == 0) {
+               else if(result == 0) {
                        retval = 0;
                        goto free_conn_table_return;
                }
@@ -957,7 +936,7 @@ int free_ustcomm_client_poll(void *data)
        return 0;
 }
 
-void ustcomm_mp_add_app_clients(struct mpentries *ent, struct ustcomm_app *app, int (*cb)(struct ustcomm_connection *conn, char *msg))
+void ustcomm_mp_add_app_clients(struct mpentries *ent, struct ustcomm_app *app, int (*cb)(char *recvbuf, struct ustcomm_source *src))
 {
        struct ustcomm_connection *conn;