X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libustcomm%2Fustcomm.h;h=f3c07b691d128a96515a5cd8218c38593c4c7971;hb=4723ca096d740ff93da400df304c9902e9834e5f;hp=7d845920fe0d0b57dd438b24f1ef0d0a8827af2b;hpb=aca1ad90ac68780598f7bcce7b475670f2a48cb0;p=ust.git diff --git a/libustcomm/ustcomm.h b/libustcomm/ustcomm.h index 7d84592..f3c07b6 100644 --- a/libustcomm/ustcomm.h +++ b/libustcomm/ustcomm.h @@ -1,47 +1,84 @@ +/* Copyright (C) 2009 Pierre-Marc Fournier + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + #ifndef USTCOMM_H #define USTCOMM_H #include #include +#include + +#include -#include "kcompat.h" +#define SOCK_DIR "/tmp/ust-app-socks" +#define UST_SIGNAL SIGIO -struct ustcomm_connection { +struct ustcomm_sock { struct list_head list; int fd; + int epoll_fd; }; -struct ustcomm_app { - /* the "server" socket for serving the external requests */ - int listen_fd; - char *socketpath; - - struct list_head connections; +struct ustcomm_header { + int type; + long size; + int command; + int response; + int fd_included; }; -struct ustcomm_ustd { - /* the "server" socket for serving the external requests */ - int listen_fd; - char *socketpath; - struct list_head connections; -}; +//int send_message_pid(pid_t pid, const char *msg, char **reply); -struct ustcomm_source { - struct sockaddr_un addr; -}; +/* Ensure directory existence, usefull for unix sockets */ +extern int ensure_dir_exists(const char *dir); + +/* Create and delete sockets */ +extern struct ustcomm_sock * ustcomm_init_sock(int fd, int epoll_fd, + struct list_head *list); +extern void ustcomm_del_sock(struct ustcomm_sock *sock, int keep_in_epoll); -int send_message(pid_t pid, const char *msg, char **reply); +/* Create and delete named sockets */ +extern struct ustcomm_sock * ustcomm_init_named_socket(const char *name, + int epoll_fd); +extern void ustcomm_del_named_sock(struct ustcomm_sock *sock, + int keep_socket_file); -int ustcomm_ustd_recv_message(struct ustcomm_ustd *ustd, char **msg, struct ustcomm_source *src); -int ustcomm_app_recv_message(struct ustcomm_app *app, char **msg, struct ustcomm_source *src); +/* Send and receive functions for file descriptors */ +extern int ustcomm_send_fd(int sock, const struct ustcomm_header *header, + const char *data, int *fd); +extern int ustcomm_recv_fd(int sock, struct ustcomm_header *header, + char **data, int *fd); -int ustcomm_init_app(pid_t pid, struct ustcomm_app *handle); +/* Normal send and receive functions */ +extern int ustcomm_send(int sock, const struct ustcomm_header *header, + const char *data); +extern int ustcomm_recv(int sock, struct ustcomm_header *header, + char **data); -int ustcomm_init_ustd(struct ustcomm_ustd *handle); -int nth_token_is(char *str, char *token, int tok_no); +extern int ustcomm_request_consumer(pid_t pid, const char *channel); +extern int ustcomm_connect_app(pid_t pid, int *app_fd); +extern int ustcomm_connect_path(const char *path, int *connection_fd); +extern int ustcomm_send_request(int sock, const char *req, char **reply); +extern int ustcomm_send_reply(char *msg, int sock); +extern int recv_message_conn(int sock, char **msg); +extern int nth_token_is(const char *str, const char *token, int tok_no); -char *nth_token(char *str, int tok_no); +extern char *nth_token(const char *str, int tok_no); #endif /* USTCOMM_H */