X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Flive%2Flive_test.c;h=5d10d228b7d8f6f29614acbb42d966555b7a8115;hp=aa96fc6c3f7ec9ef5b93119bee5928309915324d;hb=1831ae68b70dece8e9b847081526495adbbf05e5;hpb=e22ba966d8a88a0d7ee447121b85b0c265504921 diff --git a/tests/regression/tools/live/live_test.c b/tests/regression/tools/live/live_test.c index aa96fc6c3..5d10d228b 100644 --- a/tests/regression/tools/live/live_test.c +++ b/tests/regression/tools/live/live_test.c @@ -1,18 +1,8 @@ /* - * Copyright (c) - 2013 Julien Desfossez + * Copyright (C) 2013 Julien Desfossez * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by as - * published by the Free Software Foundation; only version 2 of the License. + * SPDX-License-Identifier: GPL-2.0-only * - * This program 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 General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 51 - * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include @@ -21,7 +11,7 @@ #include #include #include -#include +#include #include #include #include @@ -36,7 +26,6 @@ #include #include -#include #include #include @@ -52,9 +41,6 @@ #define NUM_TESTS 11 #define mmap_size 524288 -int ust_consumerd32_fd; -int ust_consumerd64_fd; - static int control_sock; struct live_session *session; @@ -111,7 +97,7 @@ ssize_t lttng_live_send(int fd, const void *buf, size_t len) } static -int connect_viewer(char *hostname) +int connect_viewer(const char *hostname) { struct hostent *host; struct sockaddr_in server_addr; @@ -152,15 +138,15 @@ end: return ret; } -int establish_connection(void) +static int establish_connection(void) { struct lttng_viewer_cmd cmd; struct lttng_viewer_connect connect; ssize_t ret_len; cmd.cmd = htobe32(LTTNG_VIEWER_CONNECT); - cmd.data_size = sizeof(connect); - cmd.cmd_version = 0; + cmd.data_size = htobe64(sizeof(connect)); + cmd.cmd_version = htobe32(0); memset(&connect, 0, sizeof(connect)); connect.major = htobe32(VERSION_MAJOR); @@ -196,7 +182,7 @@ error: /* * Returns the number of sessions, should be 1 during the unit test. */ -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; @@ -206,8 +192,8 @@ int list_sessions(uint64_t *session_id) int first_session = 0; cmd.cmd = htobe32(LTTNG_VIEWER_LIST_SESSIONS); - cmd.data_size = 0; - cmd.cmd_version = 0; + cmd.data_size = htobe64(0); + cmd.cmd_version = htobe32(0); ret_len = lttng_live_send(control_sock, &cmd, sizeof(cmd)); if (ret_len < 0) { @@ -243,15 +229,15 @@ error: return -1; } -int create_viewer_session(void) +static int create_viewer_session(void) { struct lttng_viewer_cmd cmd; struct lttng_viewer_create_session_response resp; ssize_t ret_len; cmd.cmd = htobe32(LTTNG_VIEWER_CREATE_SESSION); - cmd.data_size = 0; - cmd.cmd_version = 0; + cmd.data_size = htobe64(0); + cmd.cmd_version = htobe32(0); ret_len = lttng_live_send(control_sock, &cmd, sizeof(cmd)); if (ret_len < 0) { @@ -281,7 +267,7 @@ error: return -1; } -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; @@ -296,8 +282,8 @@ int attach_session(uint64_t id) } cmd.cmd = htobe32(LTTNG_VIEWER_ATTACH_SESSION); - cmd.data_size = sizeof(rq); - cmd.cmd_version = 0; + cmd.data_size = htobe64(sizeof(rq)); + cmd.cmd_version = htobe32(0); memset(&rq, 0, sizeof(rq)); rq.session_id = htobe64(id); @@ -370,7 +356,7 @@ error: return -1; } -int get_metadata(void) +static int get_metadata(void) { struct lttng_viewer_cmd cmd; struct lttng_viewer_get_metadata rq; @@ -383,8 +369,8 @@ int get_metadata(void) int metadata_stream_id = -1; cmd.cmd = htobe32(LTTNG_VIEWER_GET_METADATA); - cmd.data_size = sizeof(rq); - cmd.cmd_version = 0; + cmd.data_size = htobe64(sizeof(rq)); + cmd.cmd_version = htobe32(0); for (i = 0; i < session->stream_count; i++) { if (session->streams[i].metadata_flag) { @@ -400,6 +386,7 @@ int get_metadata(void) rq.stream_id = htobe64(session->streams[metadata_stream_id].id); +retry: ret_len = lttng_live_send(control_sock, &cmd, sizeof(cmd)); if (ret_len < 0) { diag("Error sending cmd"); @@ -424,8 +411,8 @@ int get_metadata(void) break; case LTTNG_VIEWER_NO_NEW_METADATA: diag("Got LTTNG_VIEWER_NO_NEW_METADATA:"); - ret = 0; - goto end; + usleep(50); + goto retry; case LTTNG_VIEWER_METADATA_ERR: diag("Got LTTNG_VIEWER_METADATA_ERR:"); goto error; @@ -455,7 +442,7 @@ int get_metadata(void) } free(data); ret = len; -end: + return ret; error_free_data: @@ -464,7 +451,7 @@ error: return -1; } -int get_next_index(void) +static int get_next_index(void) { struct lttng_viewer_cmd cmd; struct lttng_viewer_get_next_index rq; @@ -473,8 +460,8 @@ int get_next_index(void) int id; cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEXT_INDEX); - cmd.data_size = sizeof(rq); - cmd.cmd_version = 0; + cmd.data_size = htobe64(sizeof(rq)); + cmd.cmd_version = htobe32(0); for (id = 0; id < session->stream_count; id++) { if (session->streams[id].metadata_flag) { @@ -556,8 +543,8 @@ int get_data_packet(int id, uint64_t offset, ssize_t ret_len; cmd.cmd = htobe32(LTTNG_VIEWER_GET_PACKET); - cmd.data_size = sizeof(rq); - cmd.cmd_version = 0; + cmd.data_size = htobe64(sizeof(rq)); + cmd.cmd_version = htobe32(0); memset(&rq, 0, sizeof(rq)); rq.stream_id = htobe64(session->streams[id].id); @@ -629,7 +616,7 @@ error: return -1; } -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; @@ -638,8 +625,8 @@ int detach_viewer_session(uint64_t id) ssize_t ret_len; cmd.cmd = htobe32(LTTNG_VIEWER_DETACH_SESSION); - cmd.data_size = sizeof(rq); - cmd.cmd_version = 0; + cmd.data_size = htobe64(sizeof(rq)); + cmd.cmd_version = htobe32(0); memset(&rq, 0, sizeof(rq)); rq.session_id = htobe64(id); @@ -694,6 +681,9 @@ int main(int argc, char **argv) ret = list_sessions(&session_id); ok(ret > 0, "List sessions : %d session(s)", ret); + if (ret < 0) { + goto end; + } ret = create_viewer_session(); ok(ret == 0, "Create viewer session"); @@ -722,6 +712,6 @@ int main(int argc, char **argv) ret = attach_session(session_id); ok(ret > 0, "Attach to session, %d streams received", ret); - +end: return exit_status(); }