projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: no substitution needed for multi-trace intersection test
[babeltrace.git]
/
formats
/
lttng-live
/
lttng-live-comm.c
diff --git
a/formats/lttng-live/lttng-live-comm.c
b/formats/lttng-live/lttng-live-comm.c
index fdecf31c92eaa70238611a0b138fdcf6baf7b764..7b4711be06095bafdaf7d9ca3126fda5b4d34483 100644
(file)
--- a/
formats/lttng-live/lttng-live-comm.c
+++ b/
formats/lttng-live/lttng-live-comm.c
@@
-31,7
+31,6
@@
#include <errno.h>
#include <inttypes.h>
#include <fcntl.h>
#include <errno.h>
#include <inttypes.h>
#include <fcntl.h>
-#include <sys/mman.h>
#include <poll.h>
#include <babeltrace/ctf/ctf-index.h>
#include <poll.h>
#include <babeltrace/ctf/ctf-index.h>
@@
-53,6
+52,7
@@
#include <babeltrace/compat/memstream.h>
#include <babeltrace/compat/send.h>
#include <babeltrace/compat/string.h>
#include <babeltrace/compat/memstream.h>
#include <babeltrace/compat/send.h>
#include <babeltrace/compat/string.h>
+#include <babeltrace/compat/mman.h>
#include "lttng-live.h"
#include "lttng-viewer-abi.h"
#include "lttng-live.h"
#include "lttng-viewer-abi.h"
@@
-166,7
+166,7
@@
int lttng_live_establish_connection(struct lttng_live_ctx *ctx)
}
cmd.cmd = htobe32(LTTNG_VIEWER_CONNECT);
}
cmd.cmd = htobe32(LTTNG_VIEWER_CONNECT);
- cmd.data_size = htobe64(sizeof(connect));
+ cmd.data_size = htobe64(
(uint64_t)
sizeof(connect));
cmd.cmd_version = htobe32(0);
connect.viewer_session_id = -1ULL; /* will be set on recv */
cmd.cmd_version = htobe32(0);
connect.viewer_session_id = -1ULL; /* will be set on recv */
@@
-307,7
+307,7
@@
int lttng_live_list_sessions(struct lttng_live_ctx *ctx, const char *path)
}
cmd.cmd = htobe32(LTTNG_VIEWER_LIST_SESSIONS);
}
cmd.cmd = htobe32(LTTNG_VIEWER_LIST_SESSIONS);
- cmd.data_size = htobe64(0);
+ cmd.data_size = htobe64(
(uint64_t)
0);
cmd.cmd_version = htobe32(0);
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
cmd.cmd_version = htobe32(0);
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
@@
-432,7
+432,7
@@
int lttng_live_attach_session(struct lttng_live_ctx *ctx, uint64_t id)
}
cmd.cmd = htobe32(LTTNG_VIEWER_ATTACH_SESSION);
}
cmd.cmd = htobe32(LTTNG_VIEWER_ATTACH_SESSION);
- cmd.data_size = htobe64(sizeof(rq));
+ cmd.data_size = htobe64(
(uint64_t)
sizeof(rq));
cmd.cmd_version = htobe32(0);
memset(&rq, 0, sizeof(rq));
cmd.cmd_version = htobe32(0);
memset(&rq, 0, sizeof(rq));
@@
-662,7
+662,7
@@
retry:
}
cmd.cmd = htobe32(LTTNG_VIEWER_GET_PACKET);
}
cmd.cmd = htobe32(LTTNG_VIEWER_GET_PACKET);
- cmd.data_size = htobe64(sizeof(rq));
+ cmd.data_size = htobe64(
(uint64_t)
sizeof(rq));
cmd.cmd_version = htobe32(0);
memset(&rq, 0, sizeof(rq));
cmd.cmd_version = htobe32(0);
memset(&rq, 0, sizeof(rq));
@@
-814,7
+814,7
@@
int get_one_metadata_packet(struct lttng_live_ctx *ctx,
rq.stream_id = htobe64(metadata_stream->id);
cmd.cmd = htobe32(LTTNG_VIEWER_GET_METADATA);
rq.stream_id = htobe64(metadata_stream->id);
cmd.cmd = htobe32(LTTNG_VIEWER_GET_METADATA);
- cmd.data_size = htobe64(sizeof(rq));
+ cmd.data_size = htobe64(
(uint64_t)
sizeof(rq));
cmd.cmd_version = htobe32(0);
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
cmd.cmd_version = htobe32(0);
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
@@
-989,7
+989,7
@@
int get_next_index(struct lttng_live_ctx *ctx,
struct lttng_viewer_index *rp = &viewer_stream->current_index;
cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEXT_INDEX);
struct lttng_viewer_index *rp = &viewer_stream->current_index;
cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEXT_INDEX);
- cmd.data_size = htobe64(sizeof(rq));
+ cmd.data_size = htobe64(
(uint64_t)
sizeof(rq));
cmd.cmd_version = htobe32(0);
memset(&rq, 0, sizeof(rq));
cmd.cmd_version = htobe32(0);
memset(&rq, 0, sizeof(rq));
@@
-1332,7
+1332,7
@@
int lttng_live_create_viewer_session(struct lttng_live_ctx *ctx)
}
cmd.cmd = htobe32(LTTNG_VIEWER_CREATE_SESSION);
}
cmd.cmd = htobe32(LTTNG_VIEWER_CREATE_SESSION);
- cmd.data_size = htobe64(0);
+ cmd.data_size = htobe64(
(uint64_t)
0);
cmd.cmd_version = htobe32(0);
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
cmd.cmd_version = htobe32(0);
ret_len = lttng_live_send(ctx->control_sock, &cmd, sizeof(cmd));
@@
-1522,7
+1522,7
@@
int lttng_live_get_new_streams(struct lttng_live_ctx *ctx, uint64_t id)
}
cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEW_STREAMS);
}
cmd.cmd = htobe32(LTTNG_VIEWER_GET_NEW_STREAMS);
- cmd.data_size = htobe64(sizeof(rq));
+ cmd.data_size = htobe64(
(uint64_t)
sizeof(rq));
cmd.cmd_version = htobe32(0);
memset(&rq, 0, sizeof(rq));
cmd.cmd_version = htobe32(0);
memset(&rq, 0, sizeof(rq));
This page took
0.04346 seconds
and
4
git commands to generate.