From mboxrd@z Thu Jan  1 00:00:00 1970
From: laijs@cn.fujitsu.com (Lai Jiangshan)
Date: Tue, 13 Jan 2009 17:08:44 +0800
Subject: [ltt-dev] [PATCH 02/13] get name and fmt from permanent eID
Message-ID: <496C5A1C.4030004@cn.fujitsu.com>


struct marker_entry is permanent, we introduce two APIs for
getting name and fmt from eIDs.

Signed-off-by: Lai Jiangshan <laijs at cn.fujitsu.com>
---
 b/kernel/marker.c      |   34 ++++++++++++++++++++++++++++++++++
 include/linux/marker.h |    3 +++
 2 files changed, 37 insertions(+)
diff --git a/include/linux/marker.h b/include/linux/marker.h
index 32387e8..2fe8977 100644
--- a/include/linux/marker.h
+++ b/include/linux/marker.h
@@ -238,6 +238,9 @@ extern int marker_probe_unregister_private_data(marker_probe_func *probe,
 extern void *marker_get_private_data(const char *channel, const char *name,
 	marker_probe_func *probe, int num);
 
+const char *marker_get_name_form_id(u16 channel_id, u16 event_id);
+const char *marker_get_fmt_form_id(u16 channel_id, u16 event_id);
+
 /*
  * marker_synchronize_unregister must be called between the last marker probe
  * unregistration and the end of module exit to make sure there is no caller
diff --git a/kernel/marker.c b/kernel/marker.c
index b11a82a..6a918e2 100644
--- a/kernel/marker.c
+++ b/kernel/marker.c
@@ -997,6 +1010,40 @@ void *marker_get_private_data(const char *channel, const char *name,
 }
 EXPORT_SYMBOL_GPL(marker_get_private_data);
 
+static struct marker_entry *get_entry_from_id(u16 channel_id, u16 event_id)
+{
+	struct hlist_head *head;
+	struct hlist_node *node;
+	struct marker_entry *e, *found = NULL;
+	u32 hash = hash_32((channel_id << 16) | event_id, MARKER_HASH_BITS);
+
+	mutex_lock(&markers_mutex);
+	head = id_table + hash;
+	hlist_for_each_entry(e, node, head, id_list) {
+		if (e->channel_id == channel_id && e->event_id == event_id) {
+			found = e;
+			break;
+		}
+	}
+	mutex_unlock(&markers_mutex);
+	return found;
+}
+
+/* must call when ids/marker_entry are kept alive */
+const char *marker_get_name_form_id(u16 channel_id, u16 event_id)
+{
+	struct marker_entry *e = get_entry_from_id(channel_id, event_id);
+	return e ? e->name : NULL;
+}
+EXPORT_SYMBOL_GPL(marker_get_name_form_id);
+
+const char *marker_get_fmt_form_id(u16 channel_id, u16 event_id)
+{
+	struct marker_entry *e = get_entry_from_id(channel_id, event_id);
+	return e ? e->format : NULL;
+}
+EXPORT_SYMBOL_GPL(marker_get_fmt_form_id);
+
 /**
  * markers_compact_event_ids: Compact markers event IDs and reassign channels
  *