projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup unused health state reference
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-consumer.c
diff --git
a/src/bin/lttng-sessiond/ust-consumer.c
b/src/bin/lttng-sessiond/ust-consumer.c
index e804f4b5ac74284c1c3b0b9ea23a9317b505649f..f108e99bd0b1379bd751432bee5276394d97b054 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-consumer.c
+++ b/
src/bin/lttng-sessiond/ust-consumer.c
@@
-57,14
+57,14
@@
static int send_channel(struct consumer_socket *sock,
uchan->name,
uchan->streams.count);
uchan->name,
uchan->streams.count);
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
ret = consumer_send_channel(sock, &msg);
if (ret < 0) {
goto error;
}
ret = consumer_send_channel(sock, &msg);
if (ret < 0) {
goto error;
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
fd = uchan->obj->shm_fd;
ret = consumer_send_fds(sock, &fd, 1);
fd = uchan->obj->shm_fd;
ret = consumer_send_fds(sock, &fd, 1);
@@
-72,7
+72,7
@@
static int send_channel(struct consumer_socket *sock,
goto error;
}
goto error;
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
error:
return ret;
error:
return ret;
@@
-83,7
+83,7
@@
error:
*/
static int send_channel_stream(struct consumer_socket *sock,
struct ust_app_channel *uchan, struct ust_app_session *usess,
*/
static int send_channel_stream(struct consumer_socket *sock,
struct ust_app_channel *uchan, struct ust_app_session *usess,
- struct
ltt_ust
_stream *stream, struct consumer_output *consumer,
+ struct
ust_app
_stream *stream, struct consumer_output *consumer,
const char *pathname)
{
int ret, fds[2];
const char *pathname)
{
int ret, fds[2];
@@
-114,7
+114,7
@@
static int send_channel_stream(struct consumer_socket *sock,
pathname,
usess->id);
pathname,
usess->id);
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
/* Send stream and file descriptor */
fds[0] = stream->obj->shm_fd;
/* Send stream and file descriptor */
fds[0] = stream->obj->shm_fd;
@@
-124,7
+124,7
@@
static int send_channel_stream(struct consumer_socket *sock,
goto error;
}
goto error;
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
error:
return ret;
error:
return ret;
@@
-140,7
+140,7
@@
static int send_channel_streams(struct consumer_socket *sock,
int ret;
char tmp_path[PATH_MAX];
const char *pathname;
int ret;
char tmp_path[PATH_MAX];
const char *pathname;
- struct
ltt_ust
_stream *stream, *tmp;
+ struct
ust_app
_stream *stream, *tmp;
assert(sock);
assert(sock);
@@
-227,17
+227,17
@@
static int send_metadata(struct consumer_socket *sock,
usess->metadata->obj->shm_fd,
usess->metadata->attr.subbuf_size,
usess->metadata->obj->memory_map_size,
usess->metadata->obj->shm_fd,
usess->metadata->attr.subbuf_size,
usess->metadata->obj->memory_map_size,
-
"metadata"
,
+
DEFAULT_METADATA_NAME
,
1);
1);
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
ret = consumer_send_channel(sock, &msg);
if (ret < 0) {
goto error;
}
ret = consumer_send_channel(sock, &msg);
if (ret < 0) {
goto error;
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
/* Sending metadata shared memory fd */
fd = usess->metadata->obj->shm_fd;
/* Sending metadata shared memory fd */
fd = usess->metadata->obj->shm_fd;
@@
-246,7
+246,7
@@
static int send_metadata(struct consumer_socket *sock,
goto error;
}
goto error;
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
/* Get correct path name destination */
if (consumer->type == CONSUMER_DST_LOCAL) {
/* Get correct path name destination */
if (consumer->type == CONSUMER_DST_LOCAL) {
@@
-289,11
+289,11
@@
static int send_metadata(struct consumer_socket *sock,
usess->gid,
consumer->net_seq_index,
1, /* Flag metadata set */
usess->gid,
consumer->net_seq_index,
1, /* Flag metadata set */
-
"metadata"
,
+
DEFAULT_METADATA_NAME
,
pathname,
usess->id);
pathname,
usess->id);
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
/* Send stream and file descriptor */
fds[0] = usess->metadata->stream_obj->shm_fd;
/* Send stream and file descriptor */
fds[0] = usess->metadata->stream_obj->shm_fd;
@@
-303,7
+303,7
@@
static int send_metadata(struct consumer_socket *sock,
goto error;
}
goto error;
}
- health_code_update(
&health_thread_cmd
);
+ health_code_update();
error:
return ret;
error:
return ret;
This page took
0.026715 seconds
and
4
git commands to generate.