Fix: remove unused session id map

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

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 9df0c484c9bfe4c0a29371ed473b07e846f93e77..27dfe32b8592487e6c5e881604a650085240f536 100644 (file)
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -63,21 +63,6 @@ volatile int consumer_quit;
 static struct lttng_ht *metadata_ht;
 static struct lttng_ht *data_ht;
 
 static struct lttng_ht *metadata_ht;
 static struct lttng_ht *data_ht;
 

-/*
- * This hash table contains the mapping between the session id of the sessiond
- * and the relayd session id. Element of the ht are indexed by sessiond session
- * id.
- *
- * Node can be added when a relayd communication is opened in the sessiond
- * thread.
- *
- * Note that a session id of the session daemon is unique to a tracing session
- * and not to a domain session. However, a domain session has one consumer
- * which forces the 1-1 mapping between a consumer and a domain session (ex:
- * UST). This means that we can't have duplicate in this ht.
- */
-static struct lttng_ht *relayd_session_id_ht;
-

 /*
  * Notify a thread pipe to poll back again. This usually means that some global
  * state has changed so we just send back the thread in a poll wait call.
 /*
  * Notify a thread pipe to poll back again. This usually means that some global
  * state has changed so we just send back the thread in a poll wait call.


@@ -231,7 +216,6 @@ static void destroy_relayd(struct consumer_relayd_sock_pair *relayd)
 {
        int ret;
        struct lttng_ht_iter iter;
 {
        int ret;
        struct lttng_ht_iter iter;

-       struct lttng_ht_node_ulong *node;

 
        if (relayd == NULL) {
                return;
 
        if (relayd == NULL) {
                return;


@@ -239,22 +223,6 @@ static void destroy_relayd(struct consumer_relayd_sock_pair *relayd)
 
        DBG("Consumer destroy and close relayd socket pair");
 
 
        DBG("Consumer destroy and close relayd socket pair");
 

-       /* Loockup for a relayd node in the session id map hash table. */
-       lttng_ht_lookup(relayd_session_id_ht,
-                       (void *)((unsigned long) relayd->sessiond_session_id), &iter);
-       node = lttng_ht_iter_get_node_ulong(&iter);
-       if (node == NULL) {
-               /* We assume the relayd is being or is destroyed */
-               return;
-       }
-
-       /*
-        * Try to delete it from the relayd session id ht. The return value is of
-        * no importance since either way we are going to try to delete the relayd
-        * from the global relayd_ht.
-        */
-       lttng_ht_del(relayd_session_id_ht, &iter);
-

        iter.iter.node = &relayd->node.node;
        ret = lttng_ht_del(consumer_data.relayd_ht, &iter);
        if (ret != 0) {
        iter.iter.node = &relayd->node.node;
        ret = lttng_ht_del(consumer_data.relayd_ht, &iter);
        if (ret != 0) {


@@ -283,8 +251,6 @@ static void cleanup_relayd_ht(void)
        }
 
        lttng_ht_destroy(consumer_data.relayd_ht);
        }
 
        lttng_ht_destroy(consumer_data.relayd_ht);

-       /* The destroy_relayd call makes sure that this ht is empty here. */
-       lttng_ht_destroy(relayd_session_id_ht);

 
        rcu_read_unlock();
 }
 
        rcu_read_unlock();
 }


@@ -2730,7 +2696,6 @@ void lttng_consumer_init(void)
        consumer_data.channel_ht = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
        consumer_data.relayd_ht = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
        consumer_data.stream_list_ht = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
        consumer_data.channel_ht = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
        consumer_data.relayd_ht = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
        consumer_data.stream_list_ht = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);

-       relayd_session_id_ht = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);

 }
 
 /*
 }
 
 /*


@@ -2747,7 +2712,6 @@ int consumer_add_relayd_socket(int net_seq_idx, int sock_type,
        int fd = -1, ret = -1, relayd_created = 0;
        enum lttng_error_code ret_code = LTTNG_OK;
        struct consumer_relayd_sock_pair *relayd;
        int fd = -1, ret = -1, relayd_created = 0;
        enum lttng_error_code ret_code = LTTNG_OK;
        struct consumer_relayd_sock_pair *relayd;

-       struct consumer_relayd_session_id *relayd_id_node;

 
        DBG("Consumer adding relayd socket (idx: %d)", net_seq_idx);
 
 
        DBG("Consumer adding relayd socket (idx: %d)", net_seq_idx);
 


@@ -2830,24 +2794,6 @@ int consumer_add_relayd_socket(int net_seq_idx, int sock_type,
                        goto error;
                }
 
                        goto error;
                }
 

-               /* Set up a relayd session id node. */
-               relayd_id_node = zmalloc(sizeof(struct consumer_relayd_session_id));
-               if (!relayd_id_node) {
-                       PERROR("zmalloc relayd id node");
-                       ret = -1;
-                       goto error;
-               }
-
-               relayd_id_node->relayd_id = relayd->relayd_session_id;
-               relayd_id_node->sessiond_id = (uint64_t) sessiond_id;
-
-               /* Indexed by session id of the sessiond. */
-               lttng_ht_node_init_ulong(&relayd_id_node->node,
-                               relayd_id_node->sessiond_id);
-               rcu_read_lock();
-               lttng_ht_add_unique_ulong(relayd_session_id_ht, &relayd_id_node->node);
-               rcu_read_unlock();
-

                break;
        case LTTNG_STREAM_DATA:
                /* Copy received lttcomm socket */
                break;
        case LTTNG_STREAM_DATA:
                /* Copy received lttcomm socket */

diff --git a/src/common/consumer.h b/src/common/consumer.h
index 7f0d0cc2134596ecf9a4debe2303add43579016c..193533e926e12ea9b392686b24ff5559fccd8efb 100644 (file)
--- a/src/common/consumer.h
+++ b/src/common/consumer.h
@@ -300,15 +300,6 @@ struct lttng_consumer_global_data {
        struct lttng_ht *stream_list_ht;
 };
 
        struct lttng_ht *stream_list_ht;
 };
 

-/*
- * Session id mapping structure storred in relayd_session_id_ht.
- */
-struct consumer_relayd_session_id {
-       uint64_t sessiond_id;
-       uint64_t relayd_id;
-       struct lttng_ht_node_ulong node;
-};
-

 /*
  * Init consumer data structures.
  */
 /*
  * Init consumer data structures.
  */