Merge branch 'master' into ust/callsite

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --combined liblttng-ust/ltt-events.c
index 0b6e61c41a44f855f26a3724d174b101477b1fcb,7a7fd7efc07ba54b5baca467f3c82e6d0c23bf2c..2109b8c21823a868bf49396fdb5d9fce29cc5343
--- 1/liblttng-ust/ltt-events.c
--- 2/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@@ -98,14 -98,6 +98,14 @@@ struct ust_pending_probe 
        char name[];
  };
  
 +/*
 + * Callsite hash table, containing the registered callsites.
 + * Protected by the sessions mutex.
 + */
 +#define CALLSITE_HASH_BITS            6
 +#define CALLSITE_HASH_SIZE            (1 << CALLSITE_HASH_BITS)
 +static struct cds_hlist_head callsite_table[CALLSITE_HASH_SIZE];
 +
  static void _ltt_event_destroy(struct ltt_event *event);
  static void _ltt_wildcard_destroy(struct session_wildcard *sw);
  static void _ltt_channel_destroy(struct ltt_channel *chan);
@@@ -115,10 -107,6 +115,10 @@@ int _ltt_event_metadata_statedump(struc
                                  struct ltt_channel *chan,
                                  struct ltt_event *event);
  static
 +int _ltt_callsite_metadata_statedump(struct ltt_session *session,
 +                                struct lttng_callsite *callsite);
 +
 +static
  int _ltt_session_metadata_statedump(struct ltt_session *session);
  
  int ltt_loglevel_match(const struct lttng_event_desc *desc,
@@@ -258,9 -246,10 +258,10 @@@ int pending_probe_fix_events(const stru
  
                                memcpy(&event_param, &sw->event_param,
                                                sizeof(event_param));
-                               memcpy(event_param.name,
+                               strncpy(event_param.name,
                                        desc->name,
                                        sizeof(event_param.name));
+                               event_param.name[sizeof(event_param.name) - 1] = '\0';
                                /* create event */
                                ret = ltt_event_create(sw->chan,
                                        &event_param, &ev);
@@@ -314,104 -303,6 +315,104 @@@
        return ret;
  }
  
 +/*
 + * Called at library load: add callsite information.
 + * Takes the session mutex.
 + * Should _not_ be called with tracepoint mutex held (would cause
 + * deadlock with session mutex).
 + */
 +int lttng_callsite_add(const struct tracepoint_callsite *tp_cs)
 +{
 +      struct cds_hlist_head *head;
 +      struct lttng_callsite *cs_node;
 +      struct ltt_session *session;
 +      uint32_t hash;
 +      int ret;
 +
 +      ust_lock();
 +      /* hash by pointer value */
 +      hash = jhash(&tp_cs, sizeof(tp_cs), 0);
 +      head = &callsite_table[hash & (CALLSITE_HASH_SIZE - 1)];
 +      cs_node = zmalloc(sizeof(struct lttng_callsite));
 +      if (!cs_node)
 +              goto error_mem;
 +      cds_hlist_add_head(&cs_node->node, head);
 +      cs_node->tp_cs = tp_cs;
 +
 +      /* print metadata for each session */
 +      cds_list_for_each_entry(session, &sessions, list) {
 +              ret = _ltt_callsite_metadata_statedump(session, cs_node);
 +              assert(!ret);
 +      }
 +      ust_unlock();
 +      return 0;
 +
 +error_mem:
 +      ust_unlock();
 +      return -ENOMEM;
 +}
 +
 +/*
 + * Called at library unload: remove callsite information.
 + * Takes the session mutex.
 + * Should _not_ be called with tracepoint mutex held (would cause
 + * deadlock with session mutex).
 + */
 +int lttng_callsite_remove(const struct tracepoint_callsite *tp_cs)
 +{
 +      struct cds_hlist_head *head;
 +      struct cds_hlist_node *node;
 +      struct lttng_callsite *cs_node;
 +      uint32_t hash;
 +      int found = 0;
 +
 +      ust_lock();
 +      /* hash by pointer value */
 +      hash = jhash(&tp_cs, sizeof(tp_cs), 0);
 +      head = &callsite_table[hash & (CALLSITE_HASH_SIZE - 1)];
 +      cds_hlist_for_each_entry(cs_node, node, head, node) {
 +              if (cs_node->tp_cs == tp_cs) {
 +                      found = 1;
 +                      break;
 +              }
 +      }
 +      if (!found)
 +              goto error;
 +      cds_hlist_del(&cs_node->node);
 +      free(cs_node);
 +      ust_unlock();
 +      return 0;
 +
 +error:
 +      ust_unlock();
 +      return -ENOENT;
 +}
 +
 +/*
 + * Called with ust mutex held.
 + */
 +static
 +int _callsite_session_metadata_statedump(struct ltt_session *session)
 +{
 +      int ret = 0;
 +      unsigned int i;
 +
 +      for (i = 0; i < CALLSITE_HASH_SIZE; i++) {
 +              struct cds_hlist_head *head;
 +              struct cds_hlist_node *node;
 +              struct lttng_callsite *cs_node;
 +
 +              head = &callsite_table[i];
 +              cds_hlist_for_each_entry(cs_node, node, head, node) {
 +                      ret = _ltt_callsite_metadata_statedump(session,
 +                                                      cs_node);
 +                      if (ret)
 +                              return ret;
 +              }
 +      }
 +      return ret;
 +}
 +
  void synchronize_trace(void)
  {
        synchronize_rcu();
@@@ -1002,32 -893,6 +1003,32 @@@ int _ltt_fields_metadata_statedump(stru
        return ret;
  }
  
 +static
 +int _ltt_callsite_metadata_statedump(struct ltt_session *session,
 +                                struct lttng_callsite *callsite)
 +{
 +      int ret = 0;
 +
 +      if (!CMM_ACCESS_ONCE(session->active))
 +              return 0;
 +
 +      ret = lttng_metadata_printf(session,
 +              "callsite {\n"
 +              "       name = \"%s\";\n"
 +              "       func = \"%s\";\n"
 +              "       file = \"%s\";\n"
 +              "       line = %u;\n"
 +              "};\n\n",
 +              callsite->tp_cs->tp->name,
 +              callsite->tp_cs->func,
 +              callsite->tp_cs->file,
 +              callsite->tp_cs->lineno);
 +      if (ret)
 +              goto end;
 +end:
 +      return ret;
 +}
 +
  static
  int _ltt_event_metadata_statedump(struct ltt_session *session,
                                  struct ltt_channel *chan,
@@@ -1400,9 -1265,6 +1401,9 @@@ int _ltt_session_metadata_statedump(str
        ret = _ltt_event_header_declare(session);
        if (ret)
                goto end;
 +      ret = _callsite_session_metadata_statedump(session);
 +      if (ret)
 +              goto end;
  
  skip_session:
        cds_list_for_each_entry(chan, &session->chan, list) {