Remove unused variables in trace-kernel/ust.c

In trace-kernel.c, the path is not used anymore on channel creation.
Same goes for trace-ust.c for session creation, the domain pointer is
not used.

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index e11d6d11fbcffa74d813d0722dcc7a4e65bc10aa..7ebe4b16eb49a467dda2420892685283eaf3375b 100644 (file)
--- a/src/bin/lttng-sessiond/channel.c
+++ b/src/bin/lttng-sessiond/channel.c
@@ -164,7 +164,7 @@ int channel_kernel_create(struct ltt_kernel_session *ksession,
        }
 
        /* Channel not found, creating it */
        }
 
        /* Channel not found, creating it */

-       ret = kernel_create_channel(ksession, attr, ksession->trace_path);
+       ret = kernel_create_channel(ksession, attr);

        if (ret < 0) {
                ret = LTTNG_ERR_KERN_CHAN_FAIL;
                goto error;
        if (ret < 0) {
                ret = LTTNG_ERR_KERN_CHAN_FAIL;
                goto error;

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 32c40531d21b3e50f4d7b1851594b2ad1090ea4f..d3a64537546406a8a30bb161e244b45858897c78 100644 (file)
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -118,23 +118,22 @@ error:
  * kernel session.
  */
 int kernel_create_channel(struct ltt_kernel_session *session,
  * kernel session.
  */
 int kernel_create_channel(struct ltt_kernel_session *session,

-               struct lttng_channel *chan, char *path)
+               struct lttng_channel *chan)

 {
        int ret;
        struct ltt_kernel_channel *lkc;
 
        assert(session);
        assert(chan);
 {
        int ret;
        struct ltt_kernel_channel *lkc;
 
        assert(session);
        assert(chan);

-       assert(path);

 
        /* Allocate kernel channel */
 
        /* Allocate kernel channel */

-       lkc = trace_kernel_create_channel(chan, path);
+       lkc = trace_kernel_create_channel(chan);

        if (lkc == NULL) {
                goto error;
        }
 
        if (lkc == NULL) {
                goto error;
        }
 

-       DBG3("Kernel create channel %s in %s with attr: %d, %" PRIu64 ", %" PRIu64 ", %u, %u, %d",
-                       chan->name, path, lkc->channel->attr.overwrite,
+       DBG3("Kernel create channel %s with attr: %d, %" PRIu64 ", %" PRIu64 ", %u, %u, %d",
+                       chan->name, lkc->channel->attr.overwrite,

                        lkc->channel->attr.subbuf_size, lkc->channel->attr.num_subbuf,
                        lkc->channel->attr.switch_timer_interval, lkc->channel->attr.read_timer_interval,
                        lkc->channel->attr.output);
                        lkc->channel->attr.subbuf_size, lkc->channel->attr.num_subbuf,
                        lkc->channel->attr.switch_timer_interval, lkc->channel->attr.read_timer_interval,
                        lkc->channel->attr.output);

diff --git a/src/bin/lttng-sessiond/kernel.h b/src/bin/lttng-sessiond/kernel.h
index 4813c931dadda4a86f2781cd1014d22a859e8851..c0fe201d6720e68c70e1f3624c51b296a125fa52 100644 (file)
--- a/src/bin/lttng-sessiond/kernel.h
+++ b/src/bin/lttng-sessiond/kernel.h
@@ -34,7 +34,7 @@ int kernel_add_channel_context(struct ltt_kernel_channel *chan,
                struct lttng_kernel_context *ctx);
 int kernel_create_session(struct ltt_session *session, int tracer_fd);
 int kernel_create_channel(struct ltt_kernel_session *session,
                struct lttng_kernel_context *ctx);
 int kernel_create_session(struct ltt_session *session, int tracer_fd);
 int kernel_create_channel(struct ltt_kernel_session *session,

-               struct lttng_channel *chan, char *path);
+               struct lttng_channel *chan);

 int kernel_create_event(struct lttng_event *ev, struct ltt_kernel_channel *channel);
 int kernel_disable_channel(struct ltt_kernel_channel *chan);
 int kernel_disable_event(struct ltt_kernel_event *event);
 int kernel_create_event(struct lttng_event *ev, struct ltt_kernel_channel *channel);
 int kernel_disable_channel(struct ltt_kernel_channel *chan);
 int kernel_disable_event(struct ltt_kernel_event *event);

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 339b20d3ee433be2d17f33d3462b104ab6266448..a63593d18030c0c1f88c34f4f331c6de2fdf2f47 100644 (file)
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -2104,7 +2104,7 @@ static int create_ust_session(struct ltt_session *session,
 
        DBG("Creating UST session");
 
 
        DBG("Creating UST session");
 

-       lus = trace_ust_create_session(session->path, session->id, domain);
+       lus = trace_ust_create_session(session->path, session->id);

        if (lus == NULL) {
                ret = LTTNG_ERR_UST_SESS_FAIL;
                goto error;
        if (lus == NULL) {
                ret = LTTNG_ERR_UST_SESS_FAIL;
                goto error;

diff --git a/src/bin/lttng-sessiond/trace-kernel.c b/src/bin/lttng-sessiond/trace-kernel.c
index 12189b9ea7929695576f27a33a13b46fa9a6b3dd..d3742be16e944c55adac4ab339bb021854b5ef96 100644 (file)
--- a/src/bin/lttng-sessiond/trace-kernel.c
+++ b/src/bin/lttng-sessiond/trace-kernel.c
@@ -143,7 +143,7 @@ alloc_error:
  * Return pointer to structure or NULL.
  */
 struct ltt_kernel_channel *trace_kernel_create_channel(
  * Return pointer to structure or NULL.
  */
 struct ltt_kernel_channel *trace_kernel_create_channel(

-               struct lttng_channel *chan, char *path)
+               struct lttng_channel *chan)

 {
        struct ltt_kernel_channel *lkc;
 
 {
        struct ltt_kernel_channel *lkc;
 

diff --git a/src/bin/lttng-sessiond/trace-kernel.h b/src/bin/lttng-sessiond/trace-kernel.h
index 8bd1ffe321b1075460ba53ef5bf3de79b69d92f9..9050c4d044dad7185572bdec2f09430e41b15f2f 100644 (file)
--- a/src/bin/lttng-sessiond/trace-kernel.h
+++ b/src/bin/lttng-sessiond/trace-kernel.h
@@ -123,7 +123,8 @@ struct ltt_kernel_channel *trace_kernel_get_channel_by_name(
  * Create functions malloc() the data structure.
  */
 struct ltt_kernel_session *trace_kernel_create_session(char *path);
  * Create functions malloc() the data structure.
  */
 struct ltt_kernel_session *trace_kernel_create_session(char *path);

-struct ltt_kernel_channel *trace_kernel_create_channel(struct lttng_channel *chan, char *path);
+struct ltt_kernel_channel *trace_kernel_create_channel(
+               struct lttng_channel *chan);

 struct ltt_kernel_event *trace_kernel_create_event(struct lttng_event *ev);
 struct ltt_kernel_metadata *trace_kernel_create_metadata(void);
 struct ltt_kernel_stream *trace_kernel_create_stream(const char *name,
 struct ltt_kernel_event *trace_kernel_create_event(struct lttng_event *ev);
 struct ltt_kernel_metadata *trace_kernel_create_metadata(void);
 struct ltt_kernel_stream *trace_kernel_create_stream(const char *name,

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 1830763b1b6a88d3c1ac7ba528d5512b3e7444a3..81cb4db63180216b76d42ab3f628788525c06d89 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -181,7 +181,7 @@ error:
  * Return pointer to structure or NULL.
  */
 struct ltt_ust_session *trace_ust_create_session(char *path,
  * Return pointer to structure or NULL.
  */
 struct ltt_ust_session *trace_ust_create_session(char *path,

-               unsigned int session_id, struct lttng_domain *domain)
+               unsigned int session_id)

 {
        struct ltt_ust_session *lus;
 
 {
        struct ltt_ust_session *lus;
 

diff --git a/src/bin/lttng-sessiond/trace-ust.h b/src/bin/lttng-sessiond/trace-ust.h
index ab8fbe10576f7a1bb8951627cbe6682f38e8a445..97f3135a2063adcf621d300faf139c60cd54fcdc 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.h
+++ b/src/bin/lttng-sessiond/trace-ust.h
@@ -134,7 +134,7 @@ struct ltt_ust_channel *trace_ust_find_channel_by_name(struct lttng_ht *ht,
  * Create functions malloc() the data structure.
  */
 struct ltt_ust_session *trace_ust_create_session(char *path,
  * Create functions malloc() the data structure.
  */
 struct ltt_ust_session *trace_ust_create_session(char *path,

-               unsigned int session_id, struct lttng_domain *domain);
+               unsigned int session_id);

 struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr,
                char *path);
 struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,
 struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *attr,
                char *path);
 struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev,

diff --git a/tests/tools/test_kernel_data_trace.c b/tests/tools/test_kernel_data_trace.c
index ed70f0ffb20118e1f00a3c1e72d37c7f98b3ef73..70d71cadb2e280185a0eafdc3e1323c26609434c 100644 (file)
--- a/tests/tools/test_kernel_data_trace.c
+++ b/tests/tools/test_kernel_data_trace.c
@@ -121,7 +121,7 @@ static void create_kernel_channel(void)
        memset(&attr, 0, sizeof(attr));
 
        printf("Creating kernel channel: ");
        memset(&attr, 0, sizeof(attr));
 
        printf("Creating kernel channel: ");

-       chan = trace_kernel_create_channel(&attr, PATH1);
+       chan = trace_kernel_create_channel(&attr);

        assert(chan != NULL);
        PRINT_OK();
 
        assert(chan != NULL);
        PRINT_OK();
 

diff --git a/tests/tools/test_ust_data_trace.c b/tests/tools/test_ust_data_trace.c
index a9f4bb952def5e0999d3875555e8e88f0e17e8a9..74f282bbb85c8497d3ee302ac9ac706dbb148db8 100644 (file)
--- a/tests/tools/test_ust_data_trace.c
+++ b/tests/tools/test_ust_data_trace.c
@@ -73,7 +73,7 @@ static void create_one_ust_session(void)
 
        dom.type = LTTNG_DOMAIN_UST;
 
 
        dom.type = LTTNG_DOMAIN_UST;
 

-       usess = trace_ust_create_session(PATH1, 42, &dom);
+       usess = trace_ust_create_session(PATH1, 42);

        assert(usess != NULL);
        PRINT_OK();
 
        assert(usess != NULL);
        PRINT_OK();