/*
- * Copyright (c) - 2013 Julien Desfossez <jdesfossez@efficios.com>
+ * Copyright (C) 2013 Julien Desfossez <jdesfossez@efficios.com>
*
- * 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.
*/
-#define _GNU_SOURCE
#include <assert.h>
-#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include <time.h>
+#include <common/compat/time.h>
#include <sys/types.h>
#include <inttypes.h>
#include <stdlib.h>
#include <lttng/lttng.h>
#include <urcu/list.h>
-#include <bin/lttng-sessiond/session.h>
#include <common/common.h>
#include <bin/lttng-relayd/lttng-viewer-abi.h>
#include <common/index/ctf-index.h>
+#include <common/compat/errno.h>
#include <common/compat/endian.h>
#define SESSION1 "test1"
#define LIVE_TIMER 2000000
/* Number of TAP tests in this file */
-#define NUM_TESTS 8
+#define NUM_TESTS 11
#define mmap_size 524288
-int ust_consumerd32_fd;
-int ust_consumerd64_fd;
-
static int control_sock;
struct live_session *session;
}
static
-int connect_viewer(char *hostname)
+int connect_viewer(const char *hostname)
{
struct hostent *host;
struct sockaddr_in server_addr;
return ret;
}
+static
int establish_connection(void)
{
struct lttng_viewer_cmd cmd;
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);
/*
* Returns the number of sessions, should be 1 during the unit test.
*/
+static
int list_sessions(uint64_t *session_id)
{
struct lttng_viewer_cmd cmd;
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) {
return -1;
}
+static
int create_viewer_session(void)
{
struct lttng_viewer_cmd cmd;
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) {
return -1;
}
+static
int attach_session(uint64_t id)
{
struct lttng_viewer_cmd cmd;
}
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);
return -1;
}
+static
int get_metadata(void)
{
struct lttng_viewer_cmd cmd;
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) {
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");
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;
}
free(data);
ret = len;
-end:
+
return ret;
error_free_data:
return -1;
}
+static
int get_next_index(void)
{
struct lttng_viewer_cmd cmd;
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) {
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);
return -1;
}
+static
+int detach_viewer_session(uint64_t id)
+{
+ struct lttng_viewer_cmd cmd;
+ struct lttng_viewer_detach_session_response resp;
+ struct lttng_viewer_detach_session_request rq;
+ int ret;
+ ssize_t ret_len;
+
+ cmd.cmd = htobe32(LTTNG_VIEWER_DETACH_SESSION);
+ cmd.data_size = htobe64(sizeof(rq));
+ cmd.cmd_version = htobe32(0);
+
+ memset(&rq, 0, sizeof(rq));
+ rq.session_id = htobe64(id);
+
+ ret_len = lttng_live_send(control_sock, &cmd, sizeof(cmd));
+ if (ret_len < 0) {
+ fprintf(stderr, "[error] Error sending cmd\n");
+ ret = ret_len;
+ goto error;
+ }
+
+ ret_len = lttng_live_send(control_sock, &rq, sizeof(rq));
+ if (ret_len < 0) {
+ fprintf(stderr, "Error sending attach request\n");
+ ret = ret_len;
+ goto error;
+ }
+
+ ret_len = lttng_live_recv(control_sock, &resp, sizeof(resp));
+ if (ret_len < 0) {
+ fprintf(stderr, "[error] Error receiving detach session reply\n");
+ ret = ret_len;
+ goto error;
+ }
+
+ if (be32toh(resp.status) != LTTNG_VIEWER_DETACH_SESSION_OK) {
+ fprintf(stderr, "[error] Error detaching viewer session\n");
+ ret = -1;
+ goto error;
+ }
+ ret = 0;
+
+error:
+ return ret;
+}
+
int main(int argc, char **argv)
{
int ret;
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");
first_packet_stream_id, first_packet_offset,
first_packet_len);
+ ret = detach_viewer_session(session_id);
+ ok(ret == 0, "Detach viewer session");
+
+ ret = list_sessions(&session_id);
+ ok(ret > 0, "List sessions : %d session(s)", ret);
+
+ ret = attach_session(session_id);
+ ok(ret > 0, "Attach to session, %d streams received", ret);
+end:
return exit_status();
}
projects / lttng-tools.git / blobdiff