Remove useless kernel session counter

Signed-off-by: David Goulet <david.goulet@polymtl.ca>

diff --git a/ltt-sessiond/kernel-ctl.c b/ltt-sessiond/kernel-ctl.c
index 64a55084132245f8051e81fbd3820758339d111c..0b0fca836bd59b612b3ffbc4eda86f855b2f8954 100644 (file)
--- a/ltt-sessiond/kernel-ctl.c
+++ b/ltt-sessiond/kernel-ctl.c
@@ -124,7 +124,6 @@ int kernel_create_session(struct ltt_session *session, int tracer_fd)
 
        lks->kconsumer_fds_sent = 0;
        session->kernel_session = lks;
 
        lks->kconsumer_fds_sent = 0;
        session->kernel_session = lks;

-       session->kern_session_count++;

 
        DBG("Kernel session created (fd: %d)", lks->fd);
 
 
        DBG("Kernel session created (fd: %d)", lks->fd);
 

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 0effeb1f5ab51a0c91973505c7efd9629dee5a3c..10e13e3878aec4af25cbf8cba00b66639a436505 100644 (file)
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -108,8 +108,6 @@ static void teardown_kernel_session(struct ltt_session *session)
                trace_destroy_kernel_session(session->kernel_session);
                /* Extra precaution */
                session->kernel_session = NULL;
                trace_destroy_kernel_session(session->kernel_session);
                /* Extra precaution */
                session->kernel_session = NULL;

-               /* Decrement session count */
-               session->kern_session_count--;

        }
 }
 
        }
 }
 

diff --git a/ltt-sessiond/session.c b/ltt-sessiond/session.c
index f355303365590dc467ccc94f069f348527fc6f32..92111ffed981cc5f2593bc0770efc8c5f8e893aa 100644 (file)
--- a/ltt-sessiond/session.c
+++ b/ltt-sessiond/session.c
@@ -202,7 +202,6 @@ int create_session(char *name, char *path)
 
        /* Init kernel session */
        new_session->kernel_session = NULL;
 
        /* Init kernel session */
        new_session->kernel_session = NULL;

-       new_session->kern_session_count = 0;

 
        /* Init list */
        CDS_INIT_LIST_HEAD(&new_session->ust_traces);
 
        /* Init list */
        CDS_INIT_LIST_HEAD(&new_session->ust_traces);

diff --git a/ltt-sessiond/session.h b/ltt-sessiond/session.h
index 5845878cbb29533a484c8152d4fcc5eee0344c5f..4227f92441b736d0bc2f656ca71c93475bf7f919 100644 (file)
--- a/ltt-sessiond/session.h
+++ b/ltt-sessiond/session.h
@@ -39,7 +39,6 @@ struct ltt_session {
        struct cds_list_head ust_traces;
        struct ltt_kernel_session *kernel_session;
        unsigned int ust_trace_count;
        struct cds_list_head ust_traces;
        struct ltt_kernel_session *kernel_session;
        unsigned int ust_trace_count;

-       unsigned int kern_session_count;

        pid_t ust_consumer;
 };
 
        pid_t ust_consumer;
 };
 

diff --git a/ltt-sessiond/ust-ctl.c b/ltt-sessiond/ust-ctl.c
index 6f3a02a404db256465e1190b2de941acbbbd1ae0..781a6cca98f87866b14135a928e02c88e151eb8f 100644 (file)
--- a/ltt-sessiond/ust-ctl.c
+++ b/ltt-sessiond/ust-ctl.c
@@ -58,7 +58,7 @@ static struct ltt_ust_trace *find_session_ust_trace_by_pid(
  */
 int get_trace_count_per_session(struct ltt_session *session)
 {
  */
 int get_trace_count_per_session(struct ltt_session *session)
 {

-       return session->ust_trace_count + session->kern_session_count;
+       return session->ust_trace_count;

 }
 
 /*
 }
 
 /*