X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Flive%2Flive_test.cpp;h=ab95135e4753d19cea1f5e1e8d9c4d97b54bc56b;hb=28ab034a2c3582d07d3423d2d746731f87d3969f;hp=76d801e9b024ee3fcbcd78e6722dbe0e762fd361;hpb=f46376a14da2eb796690cb4e718e8b213839d6ea;p=lttng-tools.git diff --git a/tests/regression/tools/live/live_test.cpp b/tests/regression/tools/live/live_test.cpp index 76d801e9b..ab95135e4 100644 --- a/tests/regression/tools/live/live_test.cpp +++ b/tests/regression/tools/live/live_test.cpp @@ -5,34 +5,31 @@ * */ +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include #include - +#include #include -#include - +#include #include -#include - -#include -#include -#include -#include - -#define SESSION1 "test1" +#define SESSION1 "test1" #define RELAYD_URL "net://localhost" #define LIVE_TIMER 2000000 @@ -46,12 +43,13 @@ LTTNG_EXPORT DEFINE_LTTNG_UST_SIGBUS_STATE(); #endif -static int control_sock; +namespace { struct live_session *session; +int control_sock; -static int first_packet_offset; -static int first_packet_len; -static int first_packet_stream_id = -1; +int first_packet_offset; +int first_packet_len; +int first_packet_stream_id = -1; struct viewer_stream { uint64_t id; @@ -68,9 +66,9 @@ struct live_session { uint64_t live_timer_interval; uint64_t stream_count; }; +} /* namespace */ -static -ssize_t lttng_live_recv(int fd, void *buf, size_t len) +static ssize_t lttng_live_recv(int fd, void *buf, size_t len) { ssize_t ret; size_t copied = 0, to_copy = len; @@ -82,16 +80,14 @@ ssize_t lttng_live_recv(int fd, void *buf, size_t len) copied += ret; to_copy -= ret; } - } while ((ret > 0 && to_copy > 0) - || (ret < 0 && errno == EINTR)); + } while ((ret > 0 && to_copy > 0) || (ret < 0 && errno == EINTR)); if (ret > 0) ret = copied; /* ret = 0 means orderly shutdown, ret < 0 is error. */ return ret; } -static -ssize_t lttng_live_send(int fd, const void *buf, size_t len) +static ssize_t lttng_live_send(int fd, const void *buf, size_t len) { ssize_t ret; @@ -101,8 +97,7 @@ ssize_t lttng_live_send(int fd, const void *buf, size_t len) return ret; } -static -int connect_viewer(const char *hostname) +static int connect_viewer(const char *hostname) { struct hostent *host; struct sockaddr_in server_addr; @@ -125,8 +120,8 @@ int connect_viewer(const char *hostname) server_addr.sin_addr = *((struct in_addr *) host->h_addr); bzero(&(server_addr.sin_zero), 8); - if (connect(control_sock, (struct sockaddr *) &server_addr, - sizeof(struct sockaddr)) == -1) { + if (connect(control_sock, (struct sockaddr *) &server_addr, sizeof(struct sockaddr)) == + -1) { PERROR("Connect"); ret = -1; goto end; @@ -143,8 +138,7 @@ end: return ret; } -static -int establish_connection(void) +static int establish_connection(void) { struct lttng_viewer_cmd cmd; struct lttng_viewer_connect connect; @@ -188,8 +182,7 @@ error: /* * Returns the number of sessions, should be 1 during the unit test. */ -static -int list_sessions(uint64_t *session_id) +static int list_sessions(uint64_t *session_id) { struct lttng_viewer_cmd cmd; struct lttng_viewer_list_sessions list; @@ -236,8 +229,7 @@ error: return -1; } -static -int create_viewer_session(void) +static int create_viewer_session(void) { struct lttng_viewer_cmd cmd; struct lttng_viewer_create_session_response resp; @@ -275,8 +267,7 @@ error: return -1; } -static -int attach_session(uint64_t id) +static int attach_session(uint64_t id) { struct lttng_viewer_cmd cmd; struct lttng_viewer_attach_session_request rq; @@ -285,7 +276,7 @@ int attach_session(uint64_t id) int i; ssize_t ret_len; - session = (live_session *) zmalloc(sizeof(struct live_session)); + session = zmalloc(); if (!session) { goto error; } @@ -327,8 +318,7 @@ int attach_session(uint64_t id) diag("Got session stream count == 0"); goto error; } - session->streams = (viewer_stream *) zmalloc(session->stream_count * - sizeof(struct viewer_stream)); + session->streams = calloc(session->stream_count); if (!session->streams) { goto error; } @@ -347,9 +337,8 @@ int attach_session(uint64_t id) session->streams[i].ctf_trace_id = be64toh(stream.ctf_trace_id); session->streams[i].first_read = 1; - session->streams[i].mmap_base = mmap(NULL, mmap_size, - PROT_READ | PROT_WRITE, - MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); + session->streams[i].mmap_base = mmap( + NULL, mmap_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); if (session->streams[i].mmap_base == MAP_FAILED) { diag("mmap error"); goto error; @@ -365,8 +354,7 @@ error: return -1; } -static -int get_metadata(void) +static int get_metadata(void) { struct lttng_viewer_cmd cmd; struct lttng_viewer_get_metadata rq; @@ -436,7 +424,7 @@ retry: goto error; } - data = (char *) zmalloc(len); + data = calloc(len); if (!data) { PERROR("relay data zmalloc"); goto error; @@ -461,8 +449,7 @@ error: return -1; } -static -int get_next_index(void) +static int get_next_index(void) { struct lttng_viewer_cmd cmd; struct lttng_viewer_get_next_index rq; @@ -481,7 +468,7 @@ int get_next_index(void) memset(&rq, 0, sizeof(rq)); rq.stream_id = htobe64(session->streams[id].id); -retry: + retry: ret_len = lttng_live_send(control_sock, &cmd, sizeof(cmd)); if (ret_len < 0) { diag("Error sending cmd"); @@ -523,7 +510,8 @@ retry: diag("Got LTTNG_VIEWER_INDEX_ERR"); goto error; default: - diag("Unknown reply status during LTTNG_VIEWER_GET_NEXT_INDEX (%d)", be32toh(rp.status)); + diag("Unknown reply status during LTTNG_VIEWER_GET_NEXT_INDEX (%d)", + be32toh(rp.status)); goto error; } if (first_packet_stream_id < 0) { @@ -535,7 +523,8 @@ retry: first_packet_len = be64toh(rp.packet_size) / CHAR_BIT; first_packet_stream_id = id; diag("Got first packet index with offset %d and len %d", - first_packet_offset, first_packet_len); + first_packet_offset, + first_packet_len); } } return 0; @@ -544,9 +533,7 @@ error: return -1; } -static -int get_data_packet(int id, uint64_t offset, - uint64_t len) +static int get_data_packet(int id, uint64_t offset, uint64_t len) { struct lttng_viewer_cmd cmd; struct lttng_viewer_get_packet rq; @@ -627,8 +614,7 @@ error: return -1; } -static -int detach_viewer_session(uint64_t id) +static int detach_viewer_session(uint64_t id) { struct lttng_viewer_cmd cmd; struct lttng_viewer_detach_session_response resp; @@ -688,8 +674,10 @@ int main(void) ok(ret == 0, "Connect viewer to relayd"); ret = establish_connection(); - ok(ret == 0, "Established connection and version check with %d.%d", - VERSION_MAJOR, VERSION_MINOR); + ok(ret == 0, + "Established connection and version check with %d.%d", + VERSION_MAJOR, + VERSION_MINOR); ret = list_sessions(&session_id); ok(ret > 0, "List sessions : %d session(s)", ret); @@ -709,12 +697,12 @@ int main(void) ret = get_next_index(); ok(ret == 0, "Get one index per stream"); - ret = get_data_packet(first_packet_stream_id, first_packet_offset, - first_packet_len); + ret = get_data_packet(first_packet_stream_id, first_packet_offset, first_packet_len); ok(ret == 0, - "Get one data packet for stream %d, offset %d, len %d", - first_packet_stream_id, first_packet_offset, - first_packet_len); + "Get one data packet for stream %d, offset %d, len %d", + first_packet_stream_id, + first_packet_offset, + first_packet_len); ret = detach_viewer_session(session_id); ok(ret == 0, "Detach viewer session");