X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Flive%2Flive_test.c;h=a38eeee9002ca1545bff669c97c186e0b2a6739b;hp=aff897724e6a23f3a10b0424571e072146583767;hb=890d8fe47755c3bad936389cf48ffa141cff41c9;hpb=25b50f8fb2a2e9bdd1866dd22c1b2d72929d293f diff --git a/tests/regression/tools/live/live_test.c b/tests/regression/tools/live/live_test.c index aff897724..a38eeee90 100644 --- a/tests/regression/tools/live/live_test.c +++ b/tests/regression/tools/live/live_test.c @@ -15,7 +15,6 @@ * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE #include #include #include @@ -43,6 +42,8 @@ #include #include +#include + #define SESSION1 "test1" #define RELAYD_URL "net://localhost" #define LIVE_TIMER 2000000 @@ -59,7 +60,7 @@ struct live_session *session; static int first_packet_offset; static int first_packet_len; -static int first_packet_stream_id; +static int first_packet_stream_id = -1; struct viewer_stream { uint64_t id; @@ -77,6 +78,38 @@ struct live_session { uint64_t stream_count; }; +static +ssize_t lttng_live_recv(int fd, void *buf, size_t len) +{ + ssize_t ret; + size_t copied = 0, to_copy = len; + + do { + ret = recv(fd, buf + copied, to_copy, 0); + if (ret > 0) { + assert(ret <= to_copy); + copied += ret; + to_copy -= ret; + } + } 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) +{ + ssize_t ret; + + do { + ret = send(fd, buf, len, MSG_NOSIGNAL); + } while (ret < 0 && errno == EINTR); + return ret; +} + static int connect_viewer(char *hostname) { @@ -91,7 +124,7 @@ int connect_viewer(char *hostname) } if ((control_sock = socket(AF_INET, SOCK_STREAM, 0)) == -1) { - perror("Socket"); + PERROR("Socket"); ret = -1; goto end; } @@ -103,7 +136,7 @@ int connect_viewer(char *hostname) if (connect(control_sock, (struct sockaddr *) &server_addr, sizeof(struct sockaddr)) == -1) { - perror("Connect"); + PERROR("Connect"); ret = -1; goto end; } @@ -123,7 +156,7 @@ int establish_connection(void) { struct lttng_viewer_cmd cmd; struct lttng_viewer_connect connect; - int ret; + ssize_t ret_len; cmd.cmd = htobe32(LTTNG_VIEWER_CONNECT); cmd.data_size = sizeof(connect); @@ -134,71 +167,68 @@ int establish_connection(void) connect.minor = htobe32(VERSION_MINOR); connect.type = htobe32(LTTNG_VIEWER_CLIENT_COMMAND); - do { - ret = send(control_sock, &cmd, sizeof(cmd), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error sending cmd\n"); + ret_len = lttng_live_send(control_sock, &cmd, sizeof(cmd)); + if (ret_len < 0) { + diag("Error sending cmd"); goto error; } - do { - ret = send(control_sock, &connect, sizeof(connect), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error sending version\n"); + ret_len = lttng_live_send(control_sock, &connect, sizeof(connect)); + if (ret_len < 0) { + diag("Error sending version"); goto error; } - do { - ret = recv(control_sock, &connect, sizeof(connect), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error receiving version\n"); + ret_len = lttng_live_recv(control_sock, &connect, sizeof(connect)); + if (ret_len == 0) { + diag("[error] Remote side has closed connection"); goto error; } - ret = 0; + if (ret_len < 0) { + diag("Error receiving version"); + goto error; + } + return 0; error: - return ret; + return -1; } /* * Returns the number of sessions, should be 1 during the unit test. */ -int list_sessions(int *session_id) +int list_sessions(uint64_t *session_id) { struct lttng_viewer_cmd cmd; struct lttng_viewer_list_sessions list; struct lttng_viewer_session lsession; - int i, ret; + int i; + ssize_t ret_len; int first_session = 0; cmd.cmd = htobe32(LTTNG_VIEWER_LIST_SESSIONS); cmd.data_size = 0; cmd.cmd_version = 0; - do { - ret = send(control_sock, &cmd, sizeof(cmd), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error sending cmd\n"); + ret_len = lttng_live_send(control_sock, &cmd, sizeof(cmd)); + if (ret_len < 0) { + diag("Error sending cmd"); goto error; } - do { - ret = recv(control_sock, &list, sizeof(list), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error receiving session list\n"); + ret_len = lttng_live_recv(control_sock, &list, sizeof(list)); + if (ret_len == 0) { + diag("[error] Remote side has closed connection"); + goto error; + } + if (ret_len < 0) { + diag("Error receiving session list"); goto error; } for (i = 0; i < be32toh(list.sessions_count); i++) { - do { - ret = recv(control_sock, &lsession, sizeof(lsession), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error receiving session\n"); + ret_len = lttng_live_recv(control_sock, &lsession, sizeof(lsession)); + if (ret_len < 0) { + diag("Error receiving session"); goto error; } if (lsession.streams > 0 && first_session <= 0) { @@ -207,65 +237,61 @@ int list_sessions(int *session_id) } } - ret = be32toh(list.sessions_count); + return be32toh(list.sessions_count); error: - return ret; + return -1; } -int create_viewer_session() +int create_viewer_session(void) { struct lttng_viewer_cmd cmd; struct lttng_viewer_create_session_response resp; - int ret; ssize_t ret_len; cmd.cmd = htobe32(LTTNG_VIEWER_CREATE_SESSION); cmd.data_size = 0; cmd.cmd_version = 0; - do { - ret_len = send(control_sock, &cmd, sizeof(cmd), 0); - } while (ret_len < 0 && errno == EINTR); + ret_len = lttng_live_send(control_sock, &cmd, sizeof(cmd)); if (ret_len < 0) { - fprintf(stderr, "[error] Error sending cmd\n"); - ret = ret_len; + diag("[error] Error sending cmd"); goto error; } assert(ret_len == sizeof(cmd)); - do { - ret_len = recv(control_sock, &resp, sizeof(resp), 0); - } while (ret_len < 0 && errno == EINTR); + ret_len = lttng_live_recv(control_sock, &resp, sizeof(resp)); + if (ret_len == 0) { + diag("[error] Remote side has closed connection"); + goto error; + } if (ret_len < 0) { - fprintf(stderr, "[error] Error receiving create session reply\n"); - ret = ret_len; + diag("[error] Error receiving create session reply"); goto error; } assert(ret_len == sizeof(resp)); if (be32toh(resp.status) != LTTNG_VIEWER_CREATE_SESSION_OK) { - fprintf(stderr, "[error] Error creating viewer session\n"); - ret = -1; + diag("[error] Error creating viewer session"); goto error; } - ret = 0; + return 0; error: - return ret; + return -1; } -int attach_session(int id) +int attach_session(uint64_t id) { struct lttng_viewer_cmd cmd; struct lttng_viewer_attach_session_request rq; struct lttng_viewer_attach_session_response rp; struct lttng_viewer_stream stream; - int ret, i; + int i; + ssize_t ret_len; session = zmalloc(sizeof(struct live_session)); if (!session) { - ret = -1; goto error; } @@ -277,58 +303,60 @@ int attach_session(int id) rq.session_id = htobe64(id); rq.seek = htobe32(LTTNG_VIEWER_SEEK_BEGINNING); - do { - ret = send(control_sock, &cmd, sizeof(cmd), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error sending cmd\n"); + ret_len = lttng_live_send(control_sock, &cmd, sizeof(cmd)); + if (ret_len < 0) { + diag("Error sending cmd LTTNG_VIEWER_ATTACH_SESSION"); goto error; } - do { - ret = send(control_sock, &rq, sizeof(rq), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error sending attach request\n"); + ret_len = lttng_live_send(control_sock, &rq, sizeof(rq)); + if (ret_len < 0) { + diag("Error sending attach request"); goto error; } - do { - ret = recv(control_sock, &rp, sizeof(rp), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error receiving attach response\n"); + ret_len = lttng_live_recv(control_sock, &rp, sizeof(rp)); + if (ret_len == 0) { + diag("[error] Remote side has closed connection"); + goto error; + } + if (ret_len < 0) { + diag("Error receiving attach response"); goto error; } if (be32toh(rp.status) != LTTNG_VIEWER_ATTACH_OK) { - ret = -1; - goto end; + goto error; } session->stream_count = be32toh(rp.streams_count); + if (session->stream_count == 0) { + diag("Got session stream count == 0"); + goto error; + } session->streams = zmalloc(session->stream_count * sizeof(struct viewer_stream)); if (!session->streams) { - ret = -1; goto error; } for (i = 0; i < be32toh(rp.streams_count); i++) { - do { - ret = recv(control_sock, &stream, sizeof(stream), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error receiving stream\n"); + ret_len = lttng_live_recv(control_sock, &stream, sizeof(stream)); + if (ret_len == 0) { + diag("[error] Remote side has closed connection"); + goto error; + } + if (ret_len < 0) { + diag("Error receiving stream"); goto error; } session->streams[i].id = be64toh(stream.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, + 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) { - fprintf(stderr, "mmap error\n"); - ret = -1; + diag("mmap error"); goto error; } @@ -336,11 +364,10 @@ int attach_session(int id) session->streams[i].metadata_flag = 1; } } - ret = session->stream_count; + return session->stream_count; -end: error: - return ret; + return -1; } int get_metadata(void) @@ -348,6 +375,7 @@ int get_metadata(void) struct lttng_viewer_cmd cmd; struct lttng_viewer_get_metadata rq; struct lttng_viewer_metadata_packet rp; + ssize_t ret_len; int ret; uint64_t i; char *data = NULL; @@ -366,75 +394,74 @@ int get_metadata(void) } if (metadata_stream_id < 0) { - fprintf(stderr, "No metadata stream found\n"); - ret = -1; + diag("No metadata stream found"); goto error; } rq.stream_id = htobe64(session->streams[metadata_stream_id].id); - do { - ret = send(control_sock, &cmd, sizeof(cmd), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error sending cmd\n"); + ret_len = lttng_live_send(control_sock, &cmd, sizeof(cmd)); + if (ret_len < 0) { + diag("Error sending cmd"); goto error; } - do { - ret = send(control_sock, &rq, sizeof(rq), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error sending get_metadata request\n"); + ret_len = lttng_live_send(control_sock, &rq, sizeof(rq)); + if (ret_len < 0) { + diag("Error sending get_metadata request"); goto error; } - do { - ret = recv(control_sock, &rp, sizeof(rp), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error receiving metadata response\n"); + ret_len = lttng_live_recv(control_sock, &rp, sizeof(rp)); + if (ret_len == 0) { + diag("[error] Remote side has closed connection"); + goto error; + } + if (ret_len < 0) { + diag("Error receiving metadata response"); goto error; } switch (be32toh(rp.status)) { - case LTTNG_VIEWER_METADATA_OK: - break; - case LTTNG_VIEWER_NO_NEW_METADATA: - fprintf(stderr, "NO NEW\n"); - ret = -1; - goto end; - case LTTNG_VIEWER_METADATA_ERR: - fprintf(stderr, "ERR\n"); - ret = -1; - goto end; - default: - fprintf(stderr, "UNKNOWN\n"); - ret = -1; - goto end; + case LTTNG_VIEWER_METADATA_OK: + break; + case LTTNG_VIEWER_NO_NEW_METADATA: + diag("Got LTTNG_VIEWER_NO_NEW_METADATA:"); + ret = 0; + goto end; + case LTTNG_VIEWER_METADATA_ERR: + diag("Got LTTNG_VIEWER_METADATA_ERR:"); + goto error; + default: + diag("Got unknown status during LTTNG_VIEWER_GET_METADATA"); + goto error; } len = be64toh(rp.len); if (len <= 0) { - goto end; + goto error; } data = zmalloc(len); if (!data) { - perror("relay data zmalloc"); + PERROR("relay data zmalloc"); goto error; } - do { - ret = recv(control_sock, data, len, MSG_WAITALL); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error receiving trace packet\n"); - free(data); - goto error; + ret_len = lttng_live_recv(control_sock, data, len); + if (ret_len == 0) { + diag("[error] Remote side has closed connection"); + goto error_free_data; + } + if (ret_len < 0) { + diag("Error receiving trace packet"); + goto error_free_data; } free(data); - - ret = (int) len; + ret = len; end: -error: return ret; + +error_free_data: + free(data); +error: + return -1; } int get_next_index(void) @@ -442,7 +469,7 @@ int get_next_index(void) struct lttng_viewer_cmd cmd; struct lttng_viewer_get_next_index rq; struct lttng_viewer_index rp; - int ret; + ssize_t ret_len; int id; cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEXT_INDEX); @@ -453,66 +480,70 @@ int get_next_index(void) if (session->streams[id].metadata_flag) { continue; } + memset(&rq, 0, sizeof(rq)); rq.stream_id = htobe64(session->streams[id].id); retry: - do { - ret = send(control_sock, &cmd, sizeof(cmd), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error sending cmd\n"); + ret_len = lttng_live_send(control_sock, &cmd, sizeof(cmd)); + if (ret_len < 0) { + diag("Error sending cmd"); + goto error; + } + ret_len = lttng_live_send(control_sock, &rq, sizeof(rq)); + if (ret_len < 0) { + diag("Error sending get_next_index request"); goto error; } - do { - ret = send(control_sock, &rq, sizeof(rq), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error sending get_next_index request\n"); + ret_len = lttng_live_recv(control_sock, &rp, sizeof(rp)); + if (ret_len == 0) { + diag("[error] Remote side has closed connection"); goto error; } - do { - ret = recv(control_sock, &rp, sizeof(rp), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error receiving index response\n"); + if (ret_len < 0) { + diag("Error receiving index response"); goto error; } rp.flags = be32toh(rp.flags); switch (be32toh(rp.status)) { - case LTTNG_VIEWER_INDEX_INACTIVE: - fprintf(stderr, "(INACTIVE)\n"); - break; - case LTTNG_VIEWER_INDEX_OK: - break; - case LTTNG_VIEWER_INDEX_RETRY: - sleep(1); - goto retry; - case LTTNG_VIEWER_INDEX_HUP: - fprintf(stderr, "(HUP)\n"); - session->streams[id].id = -1ULL; - session->streams[id].fd = -1; - break; - case LTTNG_VIEWER_INDEX_ERR: - fprintf(stderr, "(ERR)\n"); - ret = -1; - goto error; - default: - fprintf(stderr, "SHOULD NOT HAPPEN\n"); - ret = -1; - goto error; + case LTTNG_VIEWER_INDEX_INACTIVE: + /* Skip this stream. */ + diag("Got LTTNG_VIEWER_INDEX_INACTIVE"); + continue; + case LTTNG_VIEWER_INDEX_OK: + break; + case LTTNG_VIEWER_INDEX_RETRY: + sleep(1); + goto retry; + case LTTNG_VIEWER_INDEX_HUP: + diag("Got LTTNG_VIEWER_INDEX_HUP"); + session->streams[id].id = -1ULL; + session->streams[id].fd = -1; + goto error; + case LTTNG_VIEWER_INDEX_ERR: + diag("Got LTTNG_VIEWER_INDEX_ERR"); + goto error; + default: + diag("Unknown reply status during LTTNG_VIEWER_GET_NEXT_INDEX (%d)", be32toh(rp.status)); + goto error; } - if (!first_packet_stream_id) { + if (first_packet_stream_id < 0) { + /* + * Initialize the first packet stream id. That is, + * the first active stream encoutered. + */ first_packet_offset = be64toh(rp.offset); 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); } } - ret = 0; + return 0; error: - return ret; + return -1; } static @@ -522,91 +553,86 @@ int get_data_packet(int id, uint64_t offset, struct lttng_viewer_cmd cmd; struct lttng_viewer_get_packet rq; struct lttng_viewer_trace_packet rp; - int ret; + ssize_t ret_len; cmd.cmd = htobe32(LTTNG_VIEWER_GET_PACKET); cmd.data_size = sizeof(rq); cmd.cmd_version = 0; + memset(&rq, 0, sizeof(rq)); rq.stream_id = htobe64(session->streams[id].id); /* Already in big endian. */ rq.offset = offset; rq.len = htobe32(len); - do { - ret = send(control_sock, &cmd, sizeof(cmd), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error sending cmd\n"); + ret_len = lttng_live_send(control_sock, &cmd, sizeof(cmd)); + if (ret_len < 0) { + diag("Error sending cmd"); goto error; } - do { - ret = send(control_sock, &rq, sizeof(rq), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error sending get_data_packet request\n"); + ret_len = lttng_live_send(control_sock, &rq, sizeof(rq)); + if (ret_len < 0) { + diag("Error sending get_data_packet request"); goto error; } - do { - ret = recv(control_sock, &rp, sizeof(rp), 0); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error receiving data response\n"); + ret_len = lttng_live_recv(control_sock, &rp, sizeof(rp)); + if (ret_len == 0) { + diag("[error] Remote side has closed connection"); + goto error; + } + if (ret_len < 0) { + diag("Error receiving data response"); goto error; } rp.flags = be32toh(rp.flags); switch (be32toh(rp.status)) { case LTTNG_VIEWER_GET_PACKET_OK: + len = be32toh(rp.len); + if (len == 0) { + diag("Got LTTNG_VIEWER_GET_PACKET_OK, but len == 0"); + goto error; + } break; case LTTNG_VIEWER_GET_PACKET_RETRY: - fprintf(stderr, "RETRY\n"); - ret = -1; - goto end; + diag("Got LTTNG_VIEWER_GET_PACKET_RETRY:"); + goto error; case LTTNG_VIEWER_GET_PACKET_ERR: if (rp.flags & LTTNG_VIEWER_FLAG_NEW_METADATA) { - fprintf(stderr, "NEW_METADATA\n"); - ret = 0; + diag("Got LTTNG_VIEWER_GET_PACKET_ERR with NEW_METADATA flag"); goto end; } - fprintf(stderr, "ERR\n"); - ret = -1; - goto end; + diag("Got LTTNG_VIEWER_GET_PACKET_ERR:"); + goto error; default: - fprintf(stderr, "UNKNOWN\n"); - ret = -1; - goto end; - } - - len = be32toh(rp.len); - if (len <= 0) { - goto end; + diag("Got unknown status code during LTTNG_VIEWER_GET_PACKET"); + goto error; } if (len > mmap_size) { - fprintf(stderr, "mmap_size not big enough\n"); - ret = -1; + diag("mmap_size not big enough"); goto error; } - do { - ret = recv(control_sock, session->streams[id].mmap_base, len, MSG_WAITALL); - } while (ret < 0 && errno == EINTR); - if (ret < 0) { - fprintf(stderr, "Error receiving trace packet\n"); + ret_len = lttng_live_recv(control_sock, session->streams[id].mmap_base, len); + if (ret_len == 0) { + diag("[error] Remote side has closed connection"); + goto error; + } + if (ret_len < 0) { + diag("Error receiving trace packet"); goto error; } - ret = len; - end: + return 0; error: - return ret; + return -1; } int main(int argc, char **argv) { int ret; - int session_id; + uint64_t session_id; plan_tests(NUM_TESTS); @@ -626,7 +652,7 @@ int main(int argc, char **argv) ok(ret == 0, "Create viewer session"); ret = attach_session(session_id); - ok(ret > 0, "Attach to session, %d streams received", ret); + ok(ret > 0, "Attach to session, %d stream(s) received", ret); ret = get_metadata(); ok(ret > 0, "Get metadata, received %d bytes", ret); @@ -636,7 +662,7 @@ int main(int argc, char **argv) ret = get_data_packet(first_packet_stream_id, first_packet_offset, first_packet_len); - ok(ret == 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);