projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sessiond: rename syscall.h so it does not conflict with system
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
cmd.c
diff --git
a/src/bin/lttng-sessiond/cmd.c
b/src/bin/lttng-sessiond/cmd.c
index 534f191a8b447d0763d56ec62d4aba42a0c3af70..a1eb961ee544331f961202ee2b69d36ffbe87868 100644
(file)
--- a/
src/bin/lttng-sessiond/cmd.c
+++ b/
src/bin/lttng-sessiond/cmd.c
@@
-47,7
+47,7
@@
#include "kernel-consumer.h"
#include "lttng-sessiond.h"
#include "utils.h"
#include "kernel-consumer.h"
#include "lttng-sessiond.h"
#include "utils.h"
-#include "syscall.h"
+#include "
lttng-
syscall.h"
#include "agent.h"
#include "buffer-registry.h"
#include "notification-thread.h"
#include "agent.h"
#include "buffer-registry.h"
#include "notification-thread.h"
@@
-3671,10
+3671,12
@@
static
int clear_metadata_file(int fd)
{
int ret;
int clear_metadata_file(int fd)
{
int ret;
+ off_t lseek_ret;
- ret = lseek(fd, 0, SEEK_SET);
- if (ret < 0) {
+
lseek_
ret = lseek(fd, 0, SEEK_SET);
+ if (
lseek_
ret < 0) {
PERROR("lseek");
PERROR("lseek");
+ ret = -1;
goto end;
}
goto end;
}
@@
-4646,7
+4648,7
@@
int cmd_rotate_get_info(struct ltt_session *session,
current_tracing_path_reply_len =
sizeof(info_return->location.local.absolute_path);
info_return->location_type =
current_tracing_path_reply_len =
sizeof(info_return->location.local.absolute_path);
info_return->location_type =
- (
u
int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL;
+ (int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL;
break;
case CONSUMER_DST_NET:
current_tracing_path_reply =
break;
case CONSUMER_DST_NET:
current_tracing_path_reply =
@@
-4655,7
+4657,7
@@
int cmd_rotate_get_info(struct ltt_session *session,
sizeof(info_return->location.relay.relative_path);
/* Currently the only supported relay protocol. */
info_return->location.relay.protocol =
sizeof(info_return->location.relay.relative_path);
/* Currently the only supported relay protocol. */
info_return->location.relay.protocol =
- (
u
int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_RELAY_PROTOCOL_TYPE_TCP;
+ (int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_RELAY_PROTOCOL_TYPE_TCP;
ret = lttng_strncpy(info_return->location.relay.host,
session_get_net_consumer_hostname(session),
ret = lttng_strncpy(info_return->location.relay.host,
session_get_net_consumer_hostname(session),
@@
-4671,7
+4673,7
@@
int cmd_rotate_get_info(struct ltt_session *session,
&info_return->location.relay.ports.control,
&info_return->location.relay.ports.data);
info_return->location_type =
&info_return->location.relay.ports.control,
&info_return->location.relay.ports.data);
info_return->location_type =
- (
u
int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_RELAY;
+ (int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_RELAY;
break;
default:
abort();
break;
default:
abort();
This page took
0.02489 seconds
and
4
git commands to generate.