#include "../libmarkers/marker.h"
#include "usterr.h"
#include "tracer.h"
+#include "marker-control.h"
void probe(const struct marker *mdata,
void *probe_private, void *call_private,
return 0;
}
-DEFINE_MUTEX(probes_mutex);
-
-static LIST_HEAD(probes_registered_list);
-
-int ltt_marker_connect(const char *channel, const char *mname,
- const char *pname)
-
-{
- int ret;
- struct ltt_active_marker *pdata;
- struct ltt_available_probe *probe;
-
- ltt_lock_traces();
- mutex_lock(&probes_mutex);
- probe = get_probe_from_name(pname);
- if (!probe) {
- ret = -ENOENT;
- goto end;
- }
- pdata = marker_get_private_data(channel, mname, probe->probe_func, 0);
- if (pdata && !IS_ERR(pdata)) {
- ret = -EEXIST;
- goto end;
- }
- pdata = kmem_cache_zalloc(markers_loaded_cachep, GFP_KERNEL);
- if (!pdata) {
- ret = -ENOMEM;
- goto end;
- }
- pdata->probe = probe;
- /*
- * ID has priority over channel in case of conflict.
- */
- ret = marker_probe_register(channel, mname, NULL,
- probe->probe_func, pdata);
- if (ret)
- kmem_cache_free(markers_loaded_cachep, pdata);
- else
- list_add(&pdata->node, &markers_loaded_list);
-end:
- mutex_unlock(&probes_mutex);
- ltt_unlock_traces();
- return ret;
-}
-
-
-int ltt_probe_register(struct ltt_available_probe *pdata)
-{
- int ret = 0;
- int comparison;
- struct ltt_available_probe *iter;
-
- mutex_lock(&probes_mutex);
- list_for_each_entry_reverse(iter, &probes_registered_list, node) {
- comparison = strcmp(pdata->name, iter->name);
- if (!comparison) {
- ret = -EBUSY;
- goto end;
- } else if (comparison > 0) {
- /* We belong to the location right after iter. */
- list_add(&pdata->node, &iter->node);
- goto end;
- }
- }
- /* Should be added at the head of the list */
- list_add(&pdata->node, &probes_registered_list);
-end:
- mutex_unlock(&probes_mutex);
- return ret;
-}
-
-
-struct ltt_available_probe default_probe = {
- .name = "default",
- .format = NULL,
- .probe_func = ltt_vtrace,
- .callbacks[0] = ltt_serialize_data,
-};
+//ust// DEFINE_MUTEX(probes_mutex);
+//ust//
+//ust// static LIST_HEAD(probes_registered_list);
+//ust//
+//ust// int ltt_marker_connect(const char *channel, const char *mname,
+//ust// const char *pname)
+//ust//
+//ust// {
+//ust// int ret;
+//ust// struct ltt_active_marker *pdata;
+//ust// struct ltt_available_probe *probe;
+//ust//
+//ust// ltt_lock_traces();
+//ust// mutex_lock(&probes_mutex);
+//ust// probe = get_probe_from_name(pname);
+//ust// if (!probe) {
+//ust// ret = -ENOENT;
+//ust// goto end;
+//ust// }
+//ust// pdata = marker_get_private_data(channel, mname, probe->probe_func, 0);
+//ust// if (pdata && !IS_ERR(pdata)) {
+//ust// ret = -EEXIST;
+//ust// goto end;
+//ust// }
+//ust// pdata = kmem_cache_zalloc(markers_loaded_cachep, GFP_KERNEL);
+//ust// if (!pdata) {
+//ust// ret = -ENOMEM;
+//ust// goto end;
+//ust// }
+//ust// pdata->probe = probe;
+//ust// /*
+//ust// * ID has priority over channel in case of conflict.
+//ust// */
+//ust// ret = marker_probe_register(channel, mname, NULL,
+//ust// probe->probe_func, pdata);
+//ust// if (ret)
+//ust// kmem_cache_free(markers_loaded_cachep, pdata);
+//ust// else
+//ust// list_add(&pdata->node, &markers_loaded_list);
+//ust// end:
+//ust// mutex_unlock(&probes_mutex);
+//ust// ltt_unlock_traces();
+//ust// return ret;
+//ust// }
+//ust//
+//ust//
+//ust// int ltt_probe_register(struct ltt_available_probe *pdata)
+//ust// {
+//ust// int ret = 0;
+//ust// int comparison;
+//ust// struct ltt_available_probe *iter;
+//ust//
+//ust// mutex_lock(&probes_mutex);
+//ust// list_for_each_entry_reverse(iter, &probes_registered_list, node) {
+//ust// comparison = strcmp(pdata->name, iter->name);
+//ust// if (!comparison) {
+//ust// ret = -EBUSY;
+//ust// goto end;
+//ust// } else if (comparison > 0) {
+//ust// /* We belong to the location right after iter. */
+//ust// list_add(&pdata->node, &iter->node);
+//ust// goto end;
+//ust// }
+//ust// }
+//ust// /* Should be added at the head of the list */
+//ust// list_add(&pdata->node, &probes_registered_list);
+//ust// end:
+//ust// mutex_unlock(&probes_mutex);
+//ust// return ret;
+//ust// }
+//ust//
+//ust//
+//ust// struct ltt_available_probe default_probe = {
+//ust// .name = "default",
+//ust// .format = NULL,
+//ust// .probe_func = ltt_vtrace,
+//ust// .callbacks[0] = ltt_serialize_data,
+//ust// };
int main()
{
char trace_name[] = "theusttrace";
char trace_type[] = "ustrelay";
+ marker_control_init();
+
marker_probe_register("abc", "testmark", "", probe, NULL);
marker_probe_register("metadata", "core_marker_id", "channel %s name %s event_id %hu int #1u%zu long #1u%zu pointer #1u%zu size_t #1u%zu alignment #1u%u", probe, NULL);
- result = ltt_probe_register(&default_probe);
- if(result)
- ERR("ltt_probe_register");
+//ust// result = ltt_probe_register(&default_probe);
+//ust// if(result)
+//ust// ERR("ltt_probe_register");
result = ltt_marker_connect("abc", "testmark2", "default");
if(result)
projects / ust.git / blobdiff