*
*/
-/* This file contains a high-level API for activating and deactivating markers,
- * and making sure markers in a given library can be released when the library
+/* This file contains a high-level API for activating and deactivating ust_markers,
+ * and making sure ust_markers in a given library can be released when the library
* is unloaded.
*/
.callbacks[0] = ltt_serialize_data,
};
-//ust//static struct kmem_cache *markers_loaded_cachep;
-static CDS_LIST_HEAD(markers_loaded_list);
+//ust//static struct kmem_cache *ust_markers_loaded_cachep;
+static CDS_LIST_HEAD(ust_markers_loaded_list);
/*
* List sorted by name strcmp order.
*/
return buf;
}
-static void get_marker_string(char *buf, char **start,
+static void get_ust_marker_string(char *buf, char **start,
char **end)
{
*start = skip_spaces(buf);
int ltt_probe_unregister(struct ltt_available_probe *pdata)
{
int ret = 0;
- struct ltt_active_marker *amark, *tmp;
+ struct ltt_active_ust_marker *amark, *tmp;
pthread_mutex_lock(&probes_mutex);
- cds_list_for_each_entry_safe(amark, tmp, &markers_loaded_list, node) {
+ cds_list_for_each_entry_safe(amark, tmp, &ust_markers_loaded_list, node) {
if (amark->probe == pdata) {
- ret = marker_probe_unregister_private_data(
+ ret = ust_marker_probe_unregister_private_data(
pdata->probe_func, amark);
if (ret)
goto end;
}
/*
- * Connect marker "mname" to probe "pname".
- * Only allow _only_ probe instance to be connected to a marker.
+ * Connect ust_marker "mname" to probe "pname".
+ * Only allow _only_ probe instance to be connected to a ust_marker.
*/
-int ltt_marker_connect(const char *channel, const char *mname,
+int ltt_ust_marker_connect(const char *channel, const char *mname,
const char *pname)
{
int ret;
- struct ltt_active_marker *pdata;
+ struct ltt_active_ust_marker *pdata;
struct ltt_available_probe *probe;
ltt_lock_traces();
ret = -ENOENT;
goto end;
}
- pdata = marker_get_private_data(channel, mname, probe->probe_func, 0);
+ pdata = ust_marker_get_private_data(channel, mname, probe->probe_func, 0);
if (pdata && !IS_ERR(pdata)) {
ret = -EEXIST;
goto end;
}
- pdata = zmalloc(sizeof(struct ltt_active_marker));
+ pdata = zmalloc(sizeof(struct ltt_active_ust_marker));
if (!pdata) {
ret = -ENOMEM;
goto end;
/*
* ID has priority over channel in case of conflict.
*/
- ret = marker_probe_register(channel, mname, NULL,
+ ret = ust_marker_probe_register(channel, mname, NULL,
probe->probe_func, pdata);
if (ret)
free(pdata);
else
- cds_list_add(&pdata->node, &markers_loaded_list);
+ cds_list_add(&pdata->node, &ust_markers_loaded_list);
end:
pthread_mutex_unlock(&probes_mutex);
ltt_unlock_traces();
}
/*
- * Disconnect marker "mname", probe "pname".
+ * Disconnect ust_marker "mname", probe "pname".
*/
-int ltt_marker_disconnect(const char *channel, const char *mname,
+int ltt_ust_marker_disconnect(const char *channel, const char *mname,
const char *pname)
{
- struct ltt_active_marker *pdata;
+ struct ltt_active_ust_marker *pdata;
struct ltt_available_probe *probe;
int ret = 0;
ret = -ENOENT;
goto end;
}
- pdata = marker_get_private_data(channel, mname, probe->probe_func, 0);
+ pdata = ust_marker_get_private_data(channel, mname, probe->probe_func, 0);
if (IS_ERR(pdata)) {
ret = PTR_ERR(pdata);
goto end;
ret = -EPERM;
goto end;
}
- ret = marker_probe_unregister(channel, mname, probe->probe_func, pdata);
+ ret = ust_marker_probe_unregister(channel, mname, probe->probe_func, pdata);
if (ret)
goto end;
else {
/*
* function handling proc entry write.
*
- * connect <channel name> <marker name> [<probe name>]]
- * disconnect <channel name> <marker name> [<probe name>]
+ * connect <channel name> <
ust_marker name> [<probe name>]]
+ * disconnect <channel name> <
ust_marker name> [<probe name>]
*/
//ust// static ssize_t ltt_write(struct file *file, const char __user *buffer,
//ust// size_t count, loff_t *offset)
//ust// {
//ust// char *kbuf;
-//ust// char *iter, *marker_action, *arg[4];
+//ust// char *iter, *ust_marker_action, *arg[4];
//ust// ssize_t ret;
//ust// int i;
//ust//
//ust// ret = -EINVAL;
//ust// goto end;
//ust// }
-//ust// get_marker_string(kbuf, &marker_action, &iter);
-//ust// if (!marker_action || marker_action == iter) {
+//ust// get_ust_marker_string(kbuf, &ust_marker_action, &iter);
+//ust// if (!ust_marker_action || ust_marker_action == iter) {
//ust// ret = -EINVAL;
//ust// goto end;
//ust// }
//ust// arg[i] = NULL;
//ust// if (iter < kbuf + count) {
//ust// iter++; /* skip the added '\0' */
-//ust// get_marker_string(iter, &arg[i], &iter);
+//ust// get_ust_marker_string(iter, &arg[i], &iter);
//ust// if (arg[i] == iter)
//ust// arg[i] = NULL;
//ust// }
//ust// goto end;
//ust// }
//ust//
-//ust// if (!strcmp(marker_action, "connect")) {
-//ust// ret = ltt_marker_connect(arg[0], arg[1], arg[2]);
+//ust// if (!strcmp(ust_marker_action, "connect")) {
+//ust// ret = ltt_ust_marker_connect(arg[0], arg[1], arg[2]);
//ust// if (ret)
//ust// goto end;
-//ust// } else if (!strcmp(marker_action, "disconnect")) {
-//ust// ret = ltt_marker_disconnect(arg[0], arg[1], arg[2]);
+//ust// } else if (!strcmp(ust_marker_action, "disconnect")) {
+//ust// ret = ltt_ust_marker_disconnect(arg[0], arg[1], arg[2]);
//ust// if (ret)
//ust// goto end;
//ust// }
//ust//
//ust// static void *s_next(struct seq_file *m, void *p, loff_t *pos)
//ust// {
-//ust// struct marker_iter *iter = m->private;
+//ust// struct ust_marker_iter *iter = m->private;
//ust//
-//ust// marker_iter_next(iter);
-//ust// if (!iter->marker) {
+//ust// ust_marker_iter_next(iter);
+//ust// if (!iter->ust_marker) {
//ust// /*
//ust// * Setting the iter module to -1UL will make sure
-//ust// * that no module can possibly hold the current marker.
+//ust// * that no module can possibly hold the current ust_marker.
//ust// */
//ust// iter->module = (void *)-1UL;
//ust// return NULL;
//ust// }
-//ust// return iter->marker;
+//ust// return iter->ust_marker;
//ust// }
//ust//
//ust// static void *s_start(struct seq_file *m, loff_t *pos)
//ust// {
-//ust// struct marker_iter *iter = m->private;
+//ust// struct ust_marker_iter *iter = m->private;
//ust//
//ust// if (!*pos)
-//ust// marker_iter_reset(iter);
-//ust// marker_iter_start(iter);
-//ust// if (!iter->marker) {
+//ust// ust_marker_iter_reset(iter);
+//ust// ust_marker_iter_start(iter);
+//ust// if (!iter->ust_marker) {
//ust// /*
//ust// * Setting the iter module to -1UL will make sure
-//ust// * that no module can possibly hold the current marker.
+//ust// * that no module can possibly hold the current ust_marker.
//ust// */
//ust// iter->module = (void *)-1UL;
//ust// return NULL;
//ust// }
-//ust// return iter->marker;
+//ust// return iter->ust_marker;
//ust// }
//ust//
//ust// static void s_stop(struct seq_file *m, void *p)
//ust// {
-//ust// marker_iter_stop(m->private);
+//ust// ust_marker_iter_stop(m->private);
//ust// }
//ust//
//ust// static int s_show(struct seq_file *m, void *p)
//ust// {
-//ust// struct marker_iter *iter = m->private;
+//ust// struct ust_marker_iter *iter = m->private;
//ust//
-//ust// seq_printf(m, "channel: %s marker: %s format: \"%s\" state: %d "
+//ust// seq_printf(m, "channel: %s ust_marker: %s format: \"%s\" state: %d "
//ust// "event_id: %hu call: 0x%p probe %s : 0x%p\n",
-//ust// iter->marker->channel,
-//ust// iter->marker->name, iter->marker->format,
-//ust// _imv_read(iter->marker->state),
-//ust// iter->marker->event_id,
-//ust// iter->marker->call,
-//ust// iter->marker->ptype ? "multi" : "single",
-//ust// iter->marker->ptype ?
-//ust// (void*)iter->marker->multi : (void*)iter->marker->single.func);
+//ust// iter->ust_marker->channel,
+//ust// iter->ust_marker->name, iter->ust_marker->format,
+//ust// _imv_read(iter->ust_marker->state),
+//ust// iter->ust_marker->event_id,
+//ust// iter->ust_marker->call,
+//ust// iter->ust_marker->ptype ? "multi" : "single",
+//ust// iter->ust_marker->ptype ?
+//ust// (void*)iter->ust_marker->multi : (void*)iter->ust_marker->single.func);
//ust// return 0;
//ust// }
//ust//
//ust// * the module mutex between those.
//ust// */
//ust// int ret;
-//ust// struct marker_iter *iter;
+//ust// struct ust_marker_iter *iter;
//ust//
//ust// iter = kzalloc(sizeof(*iter), GFP_KERNEL);
//ust// if (!iter)
//ust// .release = seq_release_private,
//ust// };
-static void disconnect_all_markers(void)
+static void disconnect_all_ust_markers(void)
{
- struct ltt_active_marker *pdata, *tmp;
+ struct ltt_active_ust_marker *pdata, *tmp;
- cds_list_for_each_entry_safe(pdata, tmp, &markers_loaded_list, node) {
- marker_probe_unregister_private_data(pdata->probe->probe_func,
+ cds_list_for_each_entry_safe(pdata, tmp, &ust_markers_loaded_list, node) {
+ ust_marker_probe_unregister_private_data(pdata->probe->probe_func,
pdata);
cds_list_del(&pdata->node);
free(pdata);
static char initialized = 0;
-void __attribute__((constructor)) init_marker_control(void)
+void __attribute__((constructor)) init_ust_marker_control(void)
{
if(!initialized) {
int ret;
//ust// pentry = create_proc_entry("ltt", S_IRUSR|S_IWUSR, NULL);
//ust// if (!pentry)
//ust// return -EBUSY;
-//ust// markers_loaded_cachep = KMEM_CACHE(ltt_active_marker, 0);
+//ust// ust_markers_loaded_cachep = KMEM_CACHE(ltt_active_ust_marker, 0);
ret = ltt_probe_register(&default_probe);
BUG_ON(ret);
- ret = ltt_marker_connect("metadata", "core_marker_format",
+ ret = ltt_ust_marker_connect("metadata", "core_marker_format",
DEFAULT_PROBE);
BUG_ON(ret);
- ret = ltt_marker_connect("metadata", "core_marker_id", DEFAULT_PROBE);
+ ret = ltt_ust_marker_connect("metadata", "core_marker_id", DEFAULT_PROBE);
BUG_ON(ret);
//ust// pentry->proc_fops = <t_fops;
initialized = 1;
}
}
-//ust// module_init(marker_control_init);
+//ust// module_init(ust_marker_control_init);
-static void __attribute__((destructor)) marker_control_exit(void)
+static void __attribute__((destructor)) ust_marker_control_exit(void)
{
int ret;
//ust// remove_proc_entry("ltt", NULL);
- ret = ltt_marker_disconnect("metadata", "core_marker_format",
+ ret = ltt_ust_marker_disconnect("metadata", "core_marker_format",
DEFAULT_PROBE);
BUG_ON(ret);
- ret = ltt_marker_disconnect("metadata", "core_marker_id",
+ ret = ltt_ust_marker_disconnect("metadata", "core_marker_id",
DEFAULT_PROBE);
BUG_ON(ret);
ret = ltt_probe_unregister(&default_probe);
BUG_ON(ret);
- disconnect_all_markers();
-//ust// kmem_cache_destroy(markers_loaded_cachep);
-//ust// marker_synchronize_unregister();
+ disconnect_all_ust_markers();
+//ust// kmem_cache_destroy(ust_markers_loaded_cachep);
+//ust// ust_marker_synchronize_unregister();
}
-//ust// module_exit(marker_control_exit);
+//ust// module_exit(ust_marker_control_exit);
//ust// MODULE_LICENSE("GPL");
//ust// MODULE_AUTHOR("Mathieu Desnoyers");
projects / ust.git / blobdiff