Update version to 0.16

[ust.git] / libust / channels.c

diff --git a/libust/channels.c b/libust/channels.c
index 893070570f715196000ba6fbcec35a7f20a0eac6..ab6afd7706def12005b69b5e02bb8d8317bd94a4 100644 (file)
--- a/libust/channels.c
+++ b/libust/channels.c
@@ -25,8 +25,9 @@
 
 #include <stdlib.h>
 #include <ust/marker.h>
+#include <ust/marker-internal.h>
 #include "channels.h"
-#include "usterr.h"
+#include "usterr_signal_safe.h"
 
 /*
  * ltt_channel_mutex may be nested inside the LTT trace mutex.
@@ -133,7 +134,6 @@ end:
        pthread_mutex_unlock(&ltt_channel_mutex);
        return ret;
 }
-//ust// EXPORT_SYMBOL_GPL(ltt_channels_register);
 
 /**
  * ltt_channels_unregister - Unregister a trace channel.
@@ -157,7 +157,6 @@ end:
        pthread_mutex_unlock(&ltt_channel_mutex);
        return ret;
 }
-//ust// EXPORT_SYMBOL_GPL(ltt_channels_unregister);
 
 /**
  * ltt_channels_set_default - Set channel default behavior.
@@ -184,7 +183,6 @@ end:
        pthread_mutex_unlock(&ltt_channel_mutex);
        return ret;
 }
-//ust// EXPORT_SYMBOL_GPL(ltt_channels_set_default);
 
 /**
  * ltt_channels_get_name_from_index - get channel name from channel index
@@ -202,7 +200,6 @@ const char *ltt_channels_get_name_from_index(unsigned int index)
                        return iter->name;
        return NULL;
 }
-//ust// EXPORT_SYMBOL_GPL(ltt_channels_get_name_from_index);
 
 static struct ltt_channel_setting *
 ltt_channels_get_setting_from_name(const char *name)
@@ -234,7 +231,6 @@ int ltt_channels_get_index_from_name(const char *name)
        else
                return -1;
 }
-//ust// EXPORT_SYMBOL_GPL(ltt_channels_get_index_from_name);
 
 /**
  * ltt_channels_trace_alloc - Allocate channel structures for a trace
@@ -283,7 +279,6 @@ end:
        pthread_mutex_unlock(&ltt_channel_mutex);
        return channel;
 }
-//ust// EXPORT_SYMBOL_GPL(ltt_channels_trace_alloc);
 
 /**
  * ltt_channels_trace_free - Free one trace's channels
@@ -294,14 +289,13 @@ end:
  */
 void ltt_channels_trace_free(struct ust_channel *channels)
 {
-       lock_markers();
+       lock_ust_marker();
        pthread_mutex_lock(&ltt_channel_mutex);
        free(channels);
        urcu_ref_put(&index_urcu_ref, release_trace_channel);
        pthread_mutex_unlock(&ltt_channel_mutex);
-       unlock_markers();
+       unlock_ust_marker();
 }
-//ust// EXPORT_SYMBOL_GPL(ltt_channels_trace_free);
 
 /**
  * _ltt_channels_get_event_id - get next event ID for a marker
@@ -357,7 +351,3 @@ int ltt_channels_get_event_id(const char *channel, const char *name)
        pthread_mutex_unlock(&ltt_channel_mutex);
        return ret;
 }
-
-//ust// MODULE_LICENSE("GPL");
-//ust// MODULE_AUTHOR("Mathieu Desnoyers");
-//ust// MODULE_DESCRIPTION("Linux Trace Toolkit Next Generation Channel Management");