X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libustcomm%2Fustcomm.c;h=567c5d113f9785bc7b2f3cd09eb89809c48f03ef;hb=08b8805efffcad4e0f713272cac6f75390176396;hp=7dd12510612eac2b1502445f6d9cfd64e89c9102;hpb=5932431b3ef6217b50e6e9503826b94ee191edd7;p=ust.git diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c index 7dd1251..567c5d1 100644 --- 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 #include @@ -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; @@ -59,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) @@ -98,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; } @@ -187,7 +163,11 @@ int ustcomm_request_consumer(pid_t pid, const char *channel) return -1; } - asprintf(&msg, "collect %d %s", pid, channel); + if (asprintf(&msg, "collect %d %s", pid, channel) < 0) { + ERR("ustcomm_request_consumer : asprintf failed (collect %d/%s)", + pid, channel); + return -1; + } /* don't signal it because it's the daemon */ result = ustcomm_connect_path(path, &conn, -1); @@ -249,6 +229,7 @@ static int recv_message_fd(int fd, char **recv_buf, int *recv_buf_size, int *rec if(i == 0) { /* problem */ + WARN("received empty message"); } *msg = strndup(*recv_buf, i); @@ -275,9 +256,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; @@ -321,7 +306,7 @@ int ustcomm_close_all_connections(struct ustcomm_server *server) list_for_each_entry(conn, &server->connections, list) { free(deletable_conn); deletable_conn = conn; - close(conn->fd); + ustcomm_close_app(conn); list_del(&conn->list); } @@ -351,16 +336,17 @@ 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"); - return -1; + ERR("zmalloc returned NULL"); + retval = -1; + goto free_fds_return; } /* special idx 0 is for listening socket */ @@ -375,15 +361,21 @@ 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"); - return -1; + retval = -1; + goto free_conn_table_return; + } + else if(result == 0) { + retval = 0; + goto free_conn_table_return; } - - if(result == 0) - return 0; if(fds[0].revents) { struct ustcomm_connection *newconn; @@ -392,12 +384,13 @@ int ustcomm_recv_message(struct ustcomm_server *server, char **msg, struct ustco result = newfd = accept(server->listen_fd, NULL, NULL); if(result == -1) { PERROR("accept"); - return -1; + retval = -1; + 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; } @@ -415,24 +408,27 @@ int ustcomm_recv_message(struct ustcomm_server *server, char **msg, struct ustco if(retval == 0) { /* connection finished */ - close(fds[idx].fd); - list_for_each_entry(conn, &server->connections, list) { if(conn->fd == fds[idx].fd) { + ustcomm_close_app(conn); list_del(&conn->list); + free(conn); break; } } } else { - goto free_fds_return; + goto free_conn_table_return; } } } free(fds); + free(conn_table); } +free_conn_table_return: + free(conn_table); free_fds_return: free(fds); return retval; @@ -494,7 +490,7 @@ static int init_named_socket(const char *name, char **path_out) PERROR("unlink of socket file"); goto close_sock; } - WARN("socket already exists; overwriting"); + DBG("socket already exists; overwriting"); } result = bind(fd, (struct sockaddr *)&addr, sizeof(addr)); @@ -554,6 +550,11 @@ int ustcomm_send_request(struct ustcomm_connection *conn, const char *req, char return 1; } +/* Return value: + * 0: success + * -1: error + */ + int ustcomm_connect_path(const char *path, struct ustcomm_connection *conn, pid_t signalpid) { int fd; @@ -600,6 +601,13 @@ int ustcomm_disconnect(struct ustcomm_connection *conn) return close(conn->fd); } +/* Open a connection to a traceable app. + * + * Return value: + * 0: success + * -1: error + */ + int ustcomm_connect_app(pid_t pid, struct ustcomm_connection *conn) { int result; @@ -615,6 +623,19 @@ int ustcomm_connect_app(pid_t pid, struct ustcomm_connection *conn) return ustcomm_connect_path(path, conn, pid); } +/* Close a connection to a traceable app. It frees the + * resources. It however does not free the + * ustcomm_connection itself. + */ + +int ustcomm_close_app(struct ustcomm_connection *conn) +{ + close(conn->fd); + free(conn->recv_buf); + + return 0; +} + static int ensure_dir_exists(const char *dir) { struct stat st; @@ -631,7 +652,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; @@ -688,7 +710,11 @@ int ustcomm_init_ustd(struct ustcomm_ustd *handle, const char *sock_path) int retval = 0; if(sock_path) { - asprintf(&name, "%s", sock_path); + if (asprintf(&name, "%s", sock_path) < 0) { + ERR("ustcomm_init_ustd : asprintf failed (sock_path %s)", + sock_path); + return -1; + } } else { int result; @@ -700,7 +726,11 @@ int ustcomm_init_ustd(struct ustcomm_ustd *handle, const char *sock_path) return -1; } - asprintf(&name, "%s/%s", SOCK_DIR, "ustd"); + if (asprintf(&name, "%s/%s", SOCK_DIR, "ustd") < 0) { + ERR("ustcomm_init_ustd : asprintf failed (%s/ustd)", + SOCK_DIR); + return -1; + } } handle->server.listen_fd = init_named_socket(name, &handle->server.socketpath); @@ -718,31 +748,55 @@ free_name: return retval; } -void ustcomm_fini_app(struct ustcomm_app *handle) +static void ustcomm_fini_server(struct ustcomm_server *server, int keep_socket_file) { int result; struct stat st; - /* Destroy socket */ - result = stat(handle->server.socketpath, &st); - if(result == -1) { - PERROR("stat (%s)", handle->server.socketpath); - return; - } + if(!keep_socket_file) { + /* Destroy socket */ + result = stat(server->socketpath, &st); + if(result == -1) { + PERROR("stat (%s)", server->socketpath); + return; + } - /* Paranoid check before deleting. */ - result = S_ISSOCK(st.st_mode); - if(!result) { - ERR("The socket we are about to delete is not a socket."); - return; + /* Paranoid check before deleting. */ + result = S_ISSOCK(st.st_mode); + if(!result) { + ERR("The socket we are about to delete is not a socket."); + return; + } + + result = unlink(server->socketpath); + if(result == -1) { + PERROR("unlink"); + } } - result = unlink(handle->server.socketpath); + free(server->socketpath); + + result = close(server->listen_fd); if(result == -1) { - PERROR("unlink"); + PERROR("close"); + return; } } +/* Free a traceable application server */ + +void ustcomm_fini_app(struct ustcomm_app *handle, int keep_socket_file) +{ + ustcomm_fini_server(&handle->server, keep_socket_file); +} + +/* Free a ustd server */ + +void ustcomm_fini_ustd(struct ustcomm_ustd *handle) +{ + ustcomm_fini_server(&handle->server, 0); +} + static const char *find_tok(const char *str) { while(*str == ' ') { @@ -822,8 +876,97 @@ char *nth_token(const char *str, int tok_no) retval = NULL; } - asprintf(&retval, "%.*s", (int)(end-start), start); + if (asprintf(&retval, "%.*s", (int)(end-start), start) < 0) { + ERR("nth_token : asprintf failed (%.*s)", + (int)(end-start), start); + return NULL; + } 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 *) zmalloc(sizeof(struct ustcomm_connection)); + if(newconn == NULL) { + ERR("zmalloc 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 *) 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); + } +}