X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Ftracecontext.c;h=085059b4a91d72c0a0bac8cda408c8f587dd64d3;hb=e1de4b54dd75cfe38d496cede2bb77c10cc77faf;hp=5ecdae22b4f0af9499cca9be71b1d9ea396e856c;hpb=f63ebe5196f36fcf40385d29cfc37288c4d70817;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/tracecontext.c b/ltt/branches/poly/lttv/lttv/tracecontext.c
index 5ecdae22..085059b4 100644
--- a/ltt/branches/poly/lttv/lttv/tracecontext.c
+++ b/ltt/branches/poly/lttv/lttv/tracecontext.c
@@ -975,11 +975,7 @@ LttvTraceHookByFacility *lttv_trace_hook_get_fac(LttvTraceHook *th,
   return &g_array_index(th->fac_index, LttvTraceHookByFacility, facility_id);
 }
 
-/* Get the first facility corresponding to the name. As the types must be
- * compatible, it is relevant to use the field name and sizes of the first
- * facility to create data structures and assume the data will be compatible
- * thorough the trace */
-LttvTraceHookByFacility *lttv_trace_hook_get_first(LttvTraceHook *th)
+struct marker_info *lttv_trace_hook_get_marker(LttvTraceHook *th)
 {
   g_assert(th->fac_list->len > 0);
   return g_array_index(th->fac_list, LttvTraceHookByFacility*, 0);
@@ -988,51 +984,29 @@ LttvTraceHookByFacility *lttv_trace_hook_get_first(LttvTraceHook *th)
 
 /* Returns 0 on success, -1 if fails. */
 gint
-lttv_trace_find_hook(LttTrace *t, GQuark facility, GQuark event, 
+lttv_trace_find_hook(LttTrace *t, GQuark event, 
     GQuark field1, GQuark field2, GQuark field3, LttvHook h, gpointer hook_data,
     LttvTraceHook *th)
 {
-  LttFacility *f;
-
   LttEventType *et, *first_et;
 
-  GArray *facilities;
-
-  guint i, fac_id, ev_id;
-
-  LttvTraceHookByFacility *thf, *first_thf;
-
-  facilities = ltt_trace_facility_get_by_name(t, facility);
+  struct marker_info *info;
 
-  if(unlikely(facilities == NULL)) goto facility_error;
+  guint i, ev_id;
 
-  th->fac_index = g_array_sized_new(FALSE, TRUE,
-             sizeof(LttvTraceHookByFacility),
-             NUM_FACILITIES);
-  th->fac_index = g_array_set_size(th->fac_index, NUM_FACILITIES);
+  head = marker_get_info_from_name(t, event);
 
-  th->fac_list = g_array_sized_new(FALSE, TRUE,
-             sizeof(LttvTraceHookByFacility*),
-             facilities->len);
-  th->fac_list = g_array_set_size(th->fac_list, facilities->len);
-  
-  fac_id = g_array_index(facilities, guint, 0);
-  f = ltt_trace_get_facility_by_num(t, fac_id);
-
-  et = ltt_facility_eventtype_get_by_name(f, event);
-  if(unlikely(et == NULL)) goto event_error;
-  
-  thf = &g_array_index(th->fac_index, LttvTraceHookByFacility, fac_id);
-  g_array_index(th->fac_list, LttvTraceHookByFacility*, 0) = thf;
+  if(unlikely(head == NULL))
+    goto facility_error;
 
-  ev_id = ltt_eventtype_id(et);
+  ev_id = marker_get_id_from_info(t, info);
   
-  thf->h = h;
-  thf->id = GET_HOOK_ID(fac_id, ev_id);
-  thf->f1 = find_field(et, field1);
-  thf->f2 = find_field(et, field2);
-  thf->f3 = find_field(et, field3);
-  thf->hook_data = hook_data;
+  th->h = h;
+  th->id = ev_id;
+  th->f1 = find_field(et, field1);
+  th->f2 = find_field(et, field2);
+  th->f3 = find_field(et, field3);
+  th->hook_data = hook_data;
   
   first_thf = thf;
   first_et = et;