X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Fust-comm.h;h=27743b2d8bf35ec39d12bb3cdaa2c85b65553b7b;hb=cd61d9bfa5fd334b086831dcbdec63da6c0d1a16;hp=c59003687e64601c565d86f738d82e0962a3ba45;hpb=8406222c45d29b23064d688e33be84894a51baac;p=lttng-ust.git diff --git a/include/ust-comm.h b/include/ust-comm.h index c5900368..27743b2d 100644 --- a/include/ust-comm.h +++ b/include/ust-comm.h @@ -1,24 +1,9 @@ -#ifndef _LTTNG_UST_COMM_H -#define _LTTNG_UST_COMM_H - /* - * Copyright (C) 2011 - David Goulet - * Julien Desfossez - * Mathieu Desnoyers - * - * 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; only - * version 2.1 of the License. + * SPDX-License-Identifier: LGPL-2.1-only * - * 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 + * Copyright (C) 2011 David Goulet + * Copyright (C) 2011 Julien Desfossez + * Copyright (C) 2011 Mathieu Desnoyers */ /* @@ -26,6 +11,9 @@ * These declarations should NOT be considered stable API. */ +#ifndef _LTTNG_UST_COMM_H +#define _LTTNG_UST_COMM_H + #include #include #include @@ -33,6 +21,7 @@ #include #include #include +#include "ust-helper.h" #ifndef LTTNG_PACKED #error "LTTNG_PACKED should be defined" @@ -210,37 +199,56 @@ struct ustcomm_notify_channel_reply { * struct lttng_ust_field_iter field. */ -extern int ustcomm_create_unix_sock(const char *pathname); -extern int ustcomm_connect_unix_sock(const char *pathname, - long timeout); -extern int ustcomm_accept_unix_sock(int sock); -extern int ustcomm_listen_unix_sock(int sock); -extern int ustcomm_close_unix_sock(int sock); +LTTNG_HIDDEN +int ustcomm_create_unix_sock(const char *pathname); +LTTNG_HIDDEN +int ustcomm_connect_unix_sock(const char *pathname, + long timeout); +LTTNG_HIDDEN +int ustcomm_accept_unix_sock(int sock); +LTTNG_HIDDEN +int ustcomm_listen_unix_sock(int sock); +LTTNG_HIDDEN +int ustcomm_close_unix_sock(int sock); -extern ssize_t ustcomm_recv_unix_sock(int sock, void *buf, size_t len); -extern ssize_t ustcomm_send_unix_sock(int sock, const void *buf, size_t len); -extern ssize_t ustcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd); -extern ssize_t ustcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd); +LTTNG_HIDDEN +ssize_t ustcomm_recv_unix_sock(int sock, void *buf, size_t len); +LTTNG_HIDDEN +ssize_t ustcomm_send_unix_sock(int sock, const void *buf, size_t len); +LTTNG_HIDDEN +ssize_t ustcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd); +LTTNG_HIDDEN +ssize_t ustcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd); -extern const char *ustcomm_get_readable_code(int code); -extern int ustcomm_send_app_msg(int sock, struct ustcomm_ust_msg *lum); -extern int ustcomm_recv_app_reply(int sock, struct ustcomm_ust_reply *lur, - uint32_t expected_handle, uint32_t expected_cmd); -extern int ustcomm_send_app_cmd(int sock, +LTTNG_HIDDEN +const char *ustcomm_get_readable_code(int code); +LTTNG_HIDDEN +int ustcomm_send_app_msg(int sock, struct ustcomm_ust_msg *lum); +LTTNG_HIDDEN +int ustcomm_recv_app_reply(int sock, struct ustcomm_ust_reply *lur, + uint32_t expected_handle, uint32_t expected_cmd); +LTTNG_HIDDEN +int ustcomm_send_app_cmd(int sock, struct ustcomm_ust_msg *lum, struct ustcomm_ust_reply *lur); +LTTNG_HIDDEN int ustcomm_recv_fd(int sock); +LTTNG_HIDDEN ssize_t ustcomm_recv_channel_from_sessiond(int sock, void **chan_data, uint64_t len, int *wakeup_fd); +LTTNG_HIDDEN int ustcomm_recv_stream_from_sessiond(int sock, uint64_t *memory_map_size, int *shm_fd, int *wakeup_fd); +LTTNG_HIDDEN ssize_t ustcomm_recv_event_notifier_notif_fd_from_sessiond(int sock, int *event_notifier_notif_fd); +LTTNG_HIDDEN ssize_t ustcomm_recv_counter_from_sessiond(int sock, void **counter_data, uint64_t len); +LTTNG_HIDDEN int ustcomm_recv_counter_shm_from_sessiond(int sock, int *shm_fd); @@ -248,6 +256,7 @@ int ustcomm_recv_counter_shm_from_sessiond(int sock, * Returns 0 on success, negative error value on error. * Returns -EPIPE or -ECONNRESET if other end has hung up. */ +LTTNG_HIDDEN int ustcomm_send_reg_msg(int sock, enum ustctl_socket_type type, uint32_t bits_per_long, @@ -261,6 +270,7 @@ int ustcomm_send_reg_msg(int sock, * Returns 0 on success, negative error value on error. * Returns -EPIPE or -ECONNRESET if other end has hung up. */ +LTTNG_HIDDEN int ustcomm_register_event(int sock, struct lttng_session *session, int session_objd, /* session descriptor */ @@ -277,6 +287,7 @@ int ustcomm_register_event(int sock, * Returns 0 on success, negative error value on error. * Returns -EPIPE or -ECONNRESET if other end has hung up. */ +LTTNG_HIDDEN int ustcomm_register_enum(int sock, int session_objd, /* session descriptor */ const char *enum_name, /* enum name (input) */ @@ -288,6 +299,7 @@ int ustcomm_register_enum(int sock, * Returns 0 on success, negative error value on error. * Returns -EPIPE or -ECONNRESET if other end has hung up. */ +LTTNG_HIDDEN int ustcomm_register_channel(int sock, struct lttng_session *session, int session_objd, /* session descriptor */ @@ -297,7 +309,9 @@ int ustcomm_register_channel(int sock, uint32_t *chan_id, /* channel id (output) */ int *header_type); /* header type (output) */ +LTTNG_HIDDEN int ustcomm_setsockopt_rcv_timeout(int sock, unsigned int msec); +LTTNG_HIDDEN int ustcomm_setsockopt_snd_timeout(int sock, unsigned int msec); #endif /* _LTTNG_UST_COMM_H */