Accept uid and gid parameters in utils_mkdir()/utils_mkdir_recursive()

[lttng-tools.git] / src / bin / lttng-relayd / stream.c

diff --git a/src/bin/lttng-relayd/stream.c b/src/bin/lttng-relayd/stream.c
index fff8065b0da3d269eee76a11b73115f36602effe..17a5bcd4f791f508fd2b349635af904e2cf7f057 100644 (file)
--- a/src/bin/lttng-relayd/stream.c
+++ b/src/bin/lttng-relayd/stream.c
@@ -17,22 +17,13 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <common/common.h>
 
 #include "index.h"
 #include "stream.h"
 #include "viewer-stream.h"
 
-static void rcu_destroy_stream(struct rcu_head *head)
-{
-       struct relay_stream *stream =
-               caa_container_of(head, struct relay_stream, rcu_node);
-
-       free(stream->path_name);
-       free(stream->channel_name);
-       free(stream);
-}
-
 /*
  * Get stream from stream id from the given hash table. Return stream if found
  * else NULL.
@@ -122,6 +113,7 @@ int stream_close(struct relay_session *session, struct relay_stream *stream)
        assert(ctf_trace);
        ctf_trace_put_ref(ctf_trace);
 
+       stream->close_flag = 1;
        stream->terminated_flag = 1;
        ret = 0;
 
@@ -148,6 +140,7 @@ void stream_delete(struct lttng_ht *ht, struct relay_stream *stream)
 void stream_destroy(struct relay_stream *stream)
 {
        assert(stream);
-
-       call_rcu(&stream->rcu_node, rcu_destroy_stream);
+       free(stream->path_name);
+       free(stream->channel_name);
+       free(stream);
 }