projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
relayd: do not link lttng-relayd on liblttng-ctl
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
main.cpp
diff --git
a/src/bin/lttng-relayd/main.cpp
b/src/bin/lttng-relayd/main.cpp
index bc3c56f347a05b879c47b4a7a6d71cc31ef18e22..07d79adee6fa929642d17b46fe080a90e3708656 100644
(file)
--- a/
src/bin/lttng-relayd/main.cpp
+++ b/
src/bin/lttng-relayd/main.cpp
@@
-50,7
+50,7
@@
#include <common/uri.h>
#include <common/utils.h>
#include <common/align.h>
#include <common/uri.h>
#include <common/utils.h>
#include <common/align.h>
-#include <common/
config/session
-config.h>
+#include <common/
ini-config/ini
-config.h>
#include <common/dynamic-buffer.h>
#include <common/buffer-view.h>
#include <common/string-utils/format.h>
#include <common/dynamic-buffer.h>
#include <common/buffer-view.h>
#include <common/string-utils/format.h>
@@
-96,6
+96,11
@@
char *opt_output_path, *opt_working_directory;
static int opt_daemon, opt_background, opt_print_version, opt_allow_clear = 1;
enum relay_group_output_by opt_group_output_by = RELAYD_GROUP_OUTPUT_BY_UNKNOWN;
static int opt_daemon, opt_background, opt_print_version, opt_allow_clear = 1;
enum relay_group_output_by opt_group_output_by = RELAYD_GROUP_OUTPUT_BY_UNKNOWN;
+/* Argument variables */
+int lttng_opt_quiet; /* not static in error.h */
+int lttng_opt_verbose; /* not static in error.h */
+int lttng_opt_mi; /* not static in error.h */
+
/*
* We need to wait for listener and live listener threads, as well as
* health check thread, before being ready to signal readiness.
/*
* We need to wait for listener and live listener threads, as well as
* health check thread, before being ready to signal readiness.
@@
-3115,7
+3120,7
@@
static int relay_trace_chunk_exists(const struct lttcomm_relayd_hdr *recv_hdr,
bool chunk_exists;
if (!session || !conn->version_check_done) {
bool chunk_exists;
if (!session || !conn->version_check_done) {
- ERR("Trying to check for the
exista
nce of a trace chunk before version check");
+ ERR("Trying to check for the
prese
nce of a trace chunk before version check");
ret = -1;
goto end_no_reply;
}
ret = -1;
goto end_no_reply;
}
@@
-3629,7
+3634,7
@@
static enum relay_connection_status relay_process_data_receive_payload(
* - the on-stack data buffer
*/
while (left_to_receive > 0 && !partial_recv) {
* - the on-stack data buffer
*/
while (left_to_receive > 0 && !partial_recv) {
- size_t recv_size = std::min(left_to_receive, chunk_size);
+ size_t recv_size = std::min
<uint64_t>
(left_to_receive, chunk_size);
struct lttng_buffer_view packet_chunk;
ret = conn->sock->ops->recvmsg(conn->sock, data_buffer,
struct lttng_buffer_view packet_chunk;
ret = conn->sock->ops->recvmsg(conn->sock, data_buffer,
This page took
0.024983 seconds
and
4
git commands to generate.