X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libustcomm%2Fustcomm.c;h=5468ad4f9eebe74df02ece68166520de3bb52f06;hb=3bb568630e172fd8d2a05f85b6f44218c18ce139;hp=2773b1a0a4fc7c299a95e3a6897a993c5eefbb60;hpb=aca1ad90ac68780598f7bcce7b475670f2a48cb0;p=ust.git diff --git a/libustcomm/ustcomm.c b/libustcomm/ustcomm.c index 2773b1a..5468ad4 100644 --- a/libustcomm/ustcomm.c +++ b/libustcomm/ustcomm.c @@ -35,6 +35,20 @@ // backtrace_symbols_fd(buffer, result, STDERR_FILENO); //} +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 void signal_process(pid_t pid) { int result; @@ -45,10 +59,41 @@ static void signal_process(pid_t pid) return; } + /* FIXME: should wait in a better way */ sleep(1); } -int send_message_path(const char *path, const char *msg, char **reply, int signalpid) +static int send_message_fd(int fd, const char *msg) +{ + int result; + + result = send(fd, msg, strlen(msg), 0); + if(result == -1) { + PERROR("send"); + return -1; + } + else if(result == 0) { + return 0; + } + + return 1; + +// *reply = (char *) malloc(MSG_MAX+1); +// result = recv(fd, *reply, MSG_MAX, 0); +// if(result == -1) { +// PERROR("recv"); +// return -1; +// } +// else if(result == 0) { +// return 0; +// } +// +// (*reply)[result] = '\0'; +// +// return 1; +} + +static int send_message_path(const char *path, const char *msg, int signalpid) { int fd; int result; @@ -77,48 +122,30 @@ int send_message_path(const char *path, const char *msg, char **reply, int signa return -1; } - result = send(fd, msg, strlen(msg), 0); - if(result == -1) { - PERROR("send"); - return -1; - } - - if(!reply) - return 0; - - *reply = (char *) malloc(MSG_MAX+1); - result = recvfrom(fd, *reply, MSG_MAX, 0, NULL, NULL); - if(result == -1) { - PERROR("recvfrom"); - return -1; - } - - (*reply)[result] = '\0'; - - return 0; + return send_message_fd(fd, msg); } -/* pid: the pid of the trace process that must receive the msg - msg: pointer to a null-terminated message to send - reply: location where to put the null-terminated string of the reply; - it must be free'd after usage - */ - -int send_message(pid_t pid, const char *msg, char **reply) -{ - int result; - char path[UNIX_PATH_MAX]; - - result = snprintf(path, UNIX_PATH_MAX, "%s/%d", SOCK_DIR, pid); - if(result >= UNIX_PATH_MAX) { - fprintf(stderr, "string overflow allocating socket name"); - return -1; - } - - send_message_path(path, msg, reply, pid); - - return 0; -} +///* pid: the pid of the trace process that must receive the msg +// msg: pointer to a null-terminated message to send +// reply: location where to put the null-terminated string of the reply; +// it must be free'd after usage +// */ +// +//int send_message_pid(pid_t pid, const char *msg, char **reply) +//{ +// int result; +// char path[UNIX_PATH_MAX]; +// +// result = snprintf(path, UNIX_PATH_MAX, "%s/%d", SOCK_DIR, pid); +// if(result >= UNIX_PATH_MAX) { +// fprintf(stderr, "string overflow allocating socket name"); +// return -1; +// } +// +// send_message_path(path, msg, reply, pid); +// +// return 0; +//} /* Called by an app to ask the consumer daemon to connect to it. */ @@ -136,12 +163,17 @@ int ustcomm_request_consumer(pid_t pid, const char *channel) asprintf(&msg, "collect %d %s", pid, channel); - send_message_path(path, msg, NULL, -1); + send_message_path(path, msg, -1); free(msg); return 0; } +/* returns 1 to indicate a message was received + * returns 0 to indicate no message was received (cannot happen) + * returns -1 to indicate an error + */ + static int recv_message_fd(int fd, char **msg, struct ustcomm_source *src) { int result; @@ -150,7 +182,7 @@ static int recv_message_fd(int fd, char **msg, struct ustcomm_source *src) result = recv(fd, *msg, MSG_MAX, 0); if(result == -1) { - PERROR("recvfrom"); + PERROR("recv"); return -1; } @@ -158,10 +190,33 @@ static int recv_message_fd(int fd, char **msg, struct ustcomm_source *src) DBG("ustcomm_app_recv_message: result is %d, message is %s", result, (*msg)); - return 0; + if(src) + src->fd = fd; + + return 1; } -int ustcomm_ustd_recv_message(struct ustcomm_ustd *ustd, char **msg, struct ustcomm_source *src) +int ustcomm_send_reply(struct ustcomm_server *server, char *msg, struct ustcomm_source *src) +{ + int result; + + result = send_message_fd(src->fd, msg); + if(result < 0) { + ERR("error in send_message_fd"); + return -1; + } + + return 0; +} + +/* @timeout: max blocking time in milliseconds, -1 means infinity + * + * returns 1 to indicate a message was received + * returns 0 to indicate no message was received + * returns -1 to indicate an error + */ + +int ustcomm_recv_message(struct ustcomm_server *server, char **msg, struct ustcomm_source *src, int timeout) { struct pollfd *fds; struct ustcomm_connection *conn; @@ -172,7 +227,7 @@ int ustcomm_ustd_recv_message(struct ustcomm_ustd *ustd, char **msg, struct ustc int idx = 0; int n_fds = 1; - list_for_each_entry(conn, &ustd->connections, list) { + list_for_each_entry(conn, &server->connections, list) { n_fds++; } @@ -183,27 +238,30 @@ int ustcomm_ustd_recv_message(struct ustcomm_ustd *ustd, char **msg, struct ustc } /* special idx 0 is for listening socket */ - fds[idx].fd = ustd->listen_fd; + fds[idx].fd = server->listen_fd; fds[idx].events = POLLIN; idx++; - list_for_each_entry(conn, &ustd->connections, list) { + list_for_each_entry(conn, &server->connections, list) { fds[idx].fd = conn->fd; fds[idx].events = POLLIN; idx++; } - result = poll(fds, n_fds, -1); + result = poll(fds, n_fds, timeout); if(result == -1) { PERROR("poll"); return -1; } + if(result == 0) + return 0; + if(fds[0].revents) { struct ustcomm_connection *newconn; int newfd; - result = newfd = accept(ustd->listen_fd, NULL, NULL); + result = newfd = accept(server->listen_fd, NULL, NULL); if(result == -1) { PERROR("accept"); return -1; @@ -217,7 +275,7 @@ int ustcomm_ustd_recv_message(struct ustcomm_ustd *ustd, char **msg, struct ustc newconn->fd = newfd; - list_add(&newconn->list, &ustd->connections); + list_add(&newconn->list, &server->connections); } for(idx=1; idxconnections, list) { + list_for_each_entry(conn, &server->connections, list) { if(conn->fd == fds[idx].fd) { list_del(&conn->list); break; @@ -248,9 +306,34 @@ free_fds_return: return retval; } -int ustcomm_app_recv_message(struct ustcomm_app *app, char **msg, struct ustcomm_source *src) +int ustcomm_ustd_recv_message(struct ustcomm_ustd *ustd, char **msg, struct ustcomm_source *src, int timeout) +{ + return ustcomm_recv_message(&ustd->server, msg, src, timeout); +} + +int ustcomm_app_recv_message(struct ustcomm_app *app, char **msg, struct ustcomm_source *src, int timeout) { - return ustcomm_ustd_recv_message((struct ustcomm_ustd *)app, msg, src); + return ustcomm_recv_message(&app->server, msg, src, timeout); +} + +/* This removes src from the list of active connections of app. + */ + +int ustcomm_app_detach_client(struct ustcomm_app *app, struct ustcomm_source *src) +{ + struct ustcomm_server *server = (struct ustcomm_server *)app; + struct ustcomm_connection *conn; + + list_for_each_entry(conn, &server->connections, list) { + if(conn->fd == src->fd) { + list_del(&conn->list); + goto found; + } + } + + return -1; +found: + return src->fd; } static int init_named_socket(char *name, char **path_out) @@ -307,6 +390,97 @@ static int init_named_socket(char *name, char **path_out) return -1; } +int ustcomm_send_request(struct ustcomm_connection *conn, char *req, char **reply) +{ + int result; + + result = send(conn->fd, req, strlen(req), 0); + if(result == -1) { + PERROR("send"); + return -1; + } + else if(result == 0) { + return 0; + } + + if(!reply) + return 1; + + *reply = (char *) malloc(MSG_MAX+1); + result = recv(conn->fd, *reply, MSG_MAX, 0); + if(result == -1) { + PERROR("recv"); + return -1; + } + else if(result == 0) { + return 0; + } + + (*reply)[result] = '\0'; + + return 1; +} + +int ustcomm_connect_path(char *path, struct ustcomm_connection *conn, pid_t signalpid) +{ + int fd; + int result; + struct sockaddr_un addr; + + result = fd = socket(PF_UNIX, SOCK_STREAM, 0); + if(result == -1) { + PERROR("socket"); + return -1; + } + + addr.sun_family = AF_UNIX; + + result = snprintf(addr.sun_path, UNIX_PATH_MAX, "%s", path); + if(result >= UNIX_PATH_MAX) { + ERR("string overflow allocating socket name"); + return -1; + } + + if(signalpid >= 0) + signal_process(signalpid); + + result = connect(fd, (struct sockaddr *)&addr, sizeof(addr)); + if(result == -1) { + PERROR("connect"); + return -1; + } + + conn->fd = fd; + + return 0; +} + +int ustcomm_disconnect(struct ustcomm_connection *conn) +{ + return close(conn->fd); +} + +int ustcomm_connect_app(pid_t pid, struct ustcomm_connection *conn) +{ + int result; + char path[UNIX_PATH_MAX]; + + + result = snprintf(path, UNIX_PATH_MAX, "%s/%d", SOCK_DIR, pid); + if(result >= UNIX_PATH_MAX) { + fprintf(stderr, "string overflow allocating socket name"); + return -1; + } + + return ustcomm_connect_path(path, conn, pid); +} + +int ustcomm_disconnect_app(struct ustcomm_connection *conn) +{ + close(conn->fd); + return 0; +} + int ustcomm_init_app(pid_t pid, struct ustcomm_app *handle) { int result; @@ -318,14 +492,14 @@ int ustcomm_init_app(pid_t pid, struct ustcomm_app *handle) return -1; } - handle->listen_fd = init_named_socket(name, &(handle->socketpath)); - if(handle->listen_fd < 0) { + handle->server.listen_fd = init_named_socket(name, &(handle->server.socketpath)); + if(handle->server.listen_fd < 0) { ERR("error initializing named socket"); goto free_name; } free(name); - INIT_LIST_HEAD(&handle->connections); + INIT_LIST_HEAD(&handle->server.connections); return 0; @@ -345,14 +519,14 @@ int ustcomm_init_ustd(struct ustcomm_ustd *handle) return -1; } - handle->listen_fd = init_named_socket(name, &handle->socketpath); - if(handle->listen_fd < 0) { + handle->server.listen_fd = init_named_socket(name, &handle->server.socketpath); + if(handle->server.listen_fd < 0) { ERR("error initializing named socket"); goto free_name; } free(name); - INIT_LIST_HEAD(&handle->connections); + INIT_LIST_HEAD(&handle->server.connections); return 0;