add info about what dirs/files are doing

[ust.git] / libustcomm / ustcomm.c

diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c
index cb72db65733eb5353c7d10a74018ff856874c648..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>
@@ -33,25 +35,10 @@
 #include "ustcomm.h"
 #include "usterr.h"
 #include "share.h"
+#include "multipoll.h"
 
 #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;
@@ -101,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;
@@ -276,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;
@@ -377,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;
                }
@@ -885,3 +865,88 @@ char *nth_token(const char *str, int tok_no)
        return retval;
 }
 
+/* Callback from multipoll.
+ * Receive a new connection on the listening socket.
+ */
+
+static int process_mp_incoming_conn(void *priv, int fd, short events)
+{
+       struct ustcomm_connection *newconn;
+       struct ustcomm_server *server = (struct ustcomm_server *) priv;
+       int newfd;
+       int result;
+
+       result = newfd = accept(server->listen_fd, NULL, NULL);
+       if(result == -1) {
+               PERROR("accept");
+               return -1;
+       }
+
+       newconn = (struct ustcomm_connection *) malloc(sizeof(struct ustcomm_connection));
+       if(newconn == NULL) {
+               ERR("malloc returned NULL");
+               return -1;
+       }
+
+       ustcomm_init_connection(newconn);
+       newconn->fd = newfd;
+
+       list_add(&newconn->list, &server->connections);
+
+       return 0;
+}
+
+/* Callback from multipoll.
+ * Receive a message on an existing connection.
+ */
+
+static int process_mp_conn_msg(void *priv, int fd, short revents)
+{
+       struct ustcomm_multipoll_conn_info *mpinfo = (struct ustcomm_multipoll_conn_info *) priv;
+       int result;
+       char *msg;
+       struct ustcomm_source src;
+
+       if(revents) {
+               src.fd = fd;
+
+               result = recv_message_conn(mpinfo->conn, &msg);
+               if(result == -1) {
+                       ERR("error in recv_message_conn");
+               }
+
+               else if(result == 0) {
+                       /* connection finished */
+                       ustcomm_close_app(mpinfo->conn);
+                       list_del(&mpinfo->conn->list);
+                       free(mpinfo->conn);
+               }
+               else {
+                       mpinfo->cb(msg, &src);
+                       free(msg);
+               }
+       }
+
+       return 0;
+}
+
+int free_ustcomm_client_poll(void *data)
+{
+       free(data);
+       return 0;
+}
+
+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;
+
+       /* add listener socket */
+       multipoll_add(ent, app->server.listen_fd, POLLIN, process_mp_incoming_conn, &app->server, NULL);
+
+       list_for_each_entry(conn, &app->server.connections, list) {
+               struct ustcomm_multipoll_conn_info *mpinfo = (struct ustcomm_multipoll_conn_info *) malloc(sizeof(struct ustcomm_multipoll_conn_info));
+               mpinfo->conn = conn;
+               mpinfo->cb = cb;
+               multipoll_add(ent, conn->fd, POLLIN, process_mp_conn_msg, mpinfo, free_ustcomm_client_poll);
+       }
+}