X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Flive%2Flive_test.cpp;h=9c9838ac7f337f6860ad4fb57519b5e83a6139c9;hb=cd9adb8b829564212158943a0d279bb35322ab30;hp=559b9a7b1e8298885ae574090a26683e6058eb82;hpb=f149493493fbd8a3efa4748832c03278c96c38ca;p=lttng-tools.git diff --git a/tests/regression/tools/live/live_test.cpp b/tests/regression/tools/live/live_test.cpp index 559b9a7b1..9c9838ac7 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 @@ -71,8 +68,7 @@ struct live_session { }; } /* 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; @@ -84,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; @@ -103,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; @@ -127,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; @@ -145,8 +138,7 @@ end: return ret; } -static -int establish_connection(void) +static int establish_connection() { struct lttng_viewer_cmd cmd; struct lttng_viewer_connect connect; @@ -190,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; @@ -238,8 +229,7 @@ error: return -1; } -static -int create_viewer_session(void) +static int create_viewer_session() { struct lttng_viewer_cmd cmd; struct lttng_viewer_create_session_response resp; @@ -277,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; @@ -348,9 +337,12 @@ 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(nullptr, + 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; @@ -366,8 +358,7 @@ error: return -1; } -static -int get_metadata(void) +static int get_metadata() { struct lttng_viewer_cmd cmd; struct lttng_viewer_get_metadata rq; @@ -375,7 +366,7 @@ int get_metadata(void) ssize_t ret_len; int ret; uint64_t i; - char *data = NULL; + char *data = nullptr; uint64_t len = 0; int metadata_stream_id = -1; @@ -462,8 +453,7 @@ error: return -1; } -static -int get_next_index(void) +static int get_next_index() { struct lttng_viewer_cmd cmd; struct lttng_viewer_get_next_index rq; @@ -482,7 +472,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"); @@ -524,7 +514,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) { @@ -536,7 +527,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; @@ -545,9 +537,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; @@ -628,8 +618,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; @@ -676,7 +665,7 @@ error: return ret; } -int main(void) +int main() { int ret; uint64_t session_id; @@ -689,8 +678,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); @@ -710,12 +701,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");