Changes malloc to zmalloc

[ust.git] / libustcomm / ustcomm.c

diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c
index 5dfd2a8c946183649dd529f67057c3e3ef74c063..f2b7a03b9ea67f8daee033099d0dc2faea9ead1b 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>
@@ -44,14 +46,16 @@ static int mkdir_p(const char *path, mode_t mode)
 
        int retval = 0;
        int result;
+       mode_t old_umask;
 
-       tmp = malloc(strlen(path) + 1);
+       tmp = zmalloc(strlen(path) + 1);
        if (tmp == NULL)
                return -1;
 
        /* skip first / */
        path_p = path+1;
 
+       old_umask = umask(0);
        for(;;) {
                while (*path_p != '/') {
                        if(*path_p == 0)
@@ -83,20 +87,7 @@ static int mkdir_p(const char *path, mode_t mode)
        }
 
        free(tmp);
-       return retval;
-}
-
-char *strdup_malloc(const char *s)
-{
-       char *retval;
-
-       if(s == NULL)
-               return NULL;
-
-       retval = (char *) malloc(strlen(s)+1);
-
-       strcpy(retval, s);
-
+       umask(old_umask);
        return retval;
 }
 
@@ -261,9 +252,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;
@@ -337,15 +332,15 @@ int ustcomm_recv_message(struct ustcomm_server *server, char **msg, struct ustco
                        n_fds++;
                }
 
-               fds = (struct pollfd *) malloc(n_fds * sizeof(struct pollfd));
+               fds = (struct pollfd *) zmalloc(n_fds * sizeof(struct pollfd));
                if(fds == NULL) {
-                       ERR("malloc returned NULL");
+                       ERR("zmalloc returned NULL");
                        return -1;
                }
 
-               conn_table = (struct ustcomm_connection **) malloc(n_fds * sizeof(struct ustcomm_connection *));
+               conn_table = (struct ustcomm_connection **) zmalloc(n_fds * sizeof(struct ustcomm_connection *));
                if(conn_table == NULL) {
-                       ERR("malloc returned NULL");
+                       ERR("zmalloc returned NULL");
                        retval = -1;
                        goto free_fds_return;
                }
@@ -362,15 +357,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;
                }
@@ -386,9 +384,9 @@ int ustcomm_recv_message(struct ustcomm_server *server, char **msg, struct ustco
                                goto free_conn_table_return;
                        }
 
-                       newconn = (struct ustcomm_connection *) malloc(sizeof(struct ustcomm_connection));
+                       newconn = (struct ustcomm_connection *) zmalloc(sizeof(struct ustcomm_connection));
                        if(newconn == NULL) {
-                               ERR("malloc returned NULL");
+                               ERR("zmalloc returned NULL");
                                return -1;
                        }
 
@@ -650,7 +648,8 @@ static int ensure_dir_exists(const char *dir)
                /* ENOENT */
                int result;
 
-               result = mkdir_p(dir, 0777);
+               /* mkdir mode to 0777 */
+               result = mkdir_p(dir, S_IRWXU | S_IRWXG | S_IRWXO);
                if(result != 0) {
                        ERR("executing in recursive creation of directory %s", dir);
                        return -1;
@@ -887,9 +886,9 @@ static int process_mp_incoming_conn(void *priv, int fd, short events)
                return -1;
        }
 
-       newconn = (struct ustcomm_connection *) malloc(sizeof(struct ustcomm_connection));
+       newconn = (struct ustcomm_connection *) zmalloc(sizeof(struct ustcomm_connection));
        if(newconn == NULL) {
-               ERR("malloc returned NULL");
+               ERR("zmalloc returned NULL");
                return -1;
        }
 
@@ -941,7 +940,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;
 
@@ -949,7 +948,7 @@ void ustcomm_mp_add_app_clients(struct mpentries *ent, struct ustcomm_app *app,
        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));
+               struct ustcomm_multipoll_conn_info *mpinfo = (struct ustcomm_multipoll_conn_info *) zmalloc(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);