Fix: return value signedness

[lttng-tools.git] / src / bin / lttng-sessiond / trace-ust.c

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 0858f47d53b29ea598f94471b4271d029ba1a2bd..c8b3b72f91ca3343a9a507dd343d5447ea6eb323 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -1,18 +1,18 @@
 /*
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; only version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -85,8 +85,8 @@ error:
  *
  * Return pointer to structure or NULL.
  */
-struct ltt_ust_session *trace_ust_create_session(char *path, int session_id,
-               struct lttng_domain *domain)
+struct ltt_ust_session *trace_ust_create_session(char *path,
+               unsigned int session_id, struct lttng_domain *domain)
 {
        int ret;
        struct ltt_ust_session *lus;
@@ -121,6 +121,9 @@ struct ltt_ust_session *trace_ust_create_session(char *path, int session_id,
        return lus;
 
 error_free_session:
+       lttng_ht_destroy(lus->domain_global.channels);
+       lttng_ht_destroy(lus->domain_exec);
+       lttng_ht_destroy(lus->domain_pid);
        free(lus);
 error:
        return NULL;
@@ -139,7 +142,7 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
 
        luc = zmalloc(sizeof(struct ltt_ust_channel));
        if (luc == NULL) {
-               perror("ltt_ust_channel zmalloc");
+               PERROR("ltt_ust_channel zmalloc");
                goto error;
        }
 
@@ -171,7 +174,7 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
        /* Set trace output path */
        ret = snprintf(luc->pathname, PATH_MAX, "%s", path);
        if (ret < 0) {
-               perror("asprintf ust create channel");
+               PERROR("asprintf ust create channel");
                goto error_free_channel;
        }
 
@@ -180,6 +183,8 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
        return luc;
 
 error_free_channel:
+       lttng_ht_destroy(luc->ctx);
+       lttng_ht_destroy(luc->events);
        free(luc);
 error:
        return NULL;
@@ -213,9 +218,6 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
        case LTTNG_EVENT_TRACEPOINT:
                lue->attr.instrumentation = LTTNG_UST_TRACEPOINT;
                break;
-       case LTTNG_EVENT_TRACEPOINT_LOGLEVEL:
-               lue->attr.instrumentation = LTTNG_UST_TRACEPOINT_LOGLEVEL;
-               break;
        default:
                ERR("Unknown ust instrumentation type (%d)", ev->type);
                goto error_free_event;
@@ -225,16 +227,38 @@ struct ltt_ust_event *trace_ust_create_event(struct lttng_event *ev)
        strncpy(lue->attr.name, ev->name, LTTNG_UST_SYM_NAME_LEN);
        lue->attr.name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
 
+       switch (ev->loglevel_type) {
+       case LTTNG_EVENT_LOGLEVEL_ALL:
+               lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_ALL;
+               lue->attr.loglevel = -1;        /* Force to -1 */
+               break;
+       case LTTNG_EVENT_LOGLEVEL_RANGE:
+               lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_RANGE;
+               lue->attr.loglevel = ev->loglevel;
+               break;
+       case LTTNG_EVENT_LOGLEVEL_SINGLE:
+               lue->attr.loglevel_type = LTTNG_UST_LOGLEVEL_SINGLE;
+               lue->attr.loglevel = ev->loglevel;
+               break;
+       default:
+               ERR("Unknown ust loglevel type (%d)", ev->loglevel_type);
+               goto error_free_event;
+       }
+
+
        /* Init node */
        lttng_ht_node_init_str(&lue->node, lue->attr.name);
        /* Alloc context hash tables */
        lue->ctx = lttng_ht_new(0, LTTNG_HT_TYPE_ULONG);
 
-       DBG2("Trace UST event %s created", lue->attr.name);
+       DBG2("Trace UST event %s, loglevel (%d,%d) created",
+               lue->attr.name, lue->attr.loglevel_type,
+               lue->attr.loglevel);
 
        return lue;
 
 error_free_event:
+       lttng_ht_destroy(lue->ctx);
        free(lue);
 error:
        return NULL;
@@ -252,7 +276,7 @@ struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
 
        lum = zmalloc(sizeof(struct ltt_ust_metadata));
        if (lum == NULL) {
-               perror("ust metadata zmalloc");
+               PERROR("ust metadata zmalloc");
                goto error;
        }
 
@@ -268,7 +292,7 @@ struct ltt_ust_metadata *trace_ust_create_metadata(char *path)
        /* Set metadata trace path */
        ret = snprintf(lum->pathname, PATH_MAX, "%s/metadata", path);
        if (ret < 0) {
-               perror("asprintf ust metadata");
+               PERROR("asprintf ust metadata");
                goto error_free_metadata;
        }
 
@@ -435,8 +459,10 @@ static void destroy_channel_rcu(struct rcu_head *head)
  */
 void trace_ust_destroy_metadata(struct ltt_ust_metadata *metadata)
 {
+       if (!metadata->handle) {
+               return;
+       }
        DBG2("Trace UST destroy metadata %d", metadata->handle);
-
        free(metadata);
 }
 
@@ -518,7 +544,7 @@ void trace_ust_destroy_session(struct ltt_ust_session *session)
 
        rcu_read_lock();
 
-       DBG2("Trace UST destroy session %d", session->id);
+       DBG2("Trace UST destroy session %u", session->id);
 
        /* Cleaning up UST domain */
        destroy_domain_global(&session->domain_global);