*/
if(unlikely(last_ret == TRUE ||
- count >= nb_events ||
+ ((count >= nb_events) && (nb_events != G_MAXULONG)) ||
(end_position!=NULL&<tv_traceset_context_ctx_pos_compare(self,
end_position) == 0)||
ltt_time_compare(end, tfc->timestamp) <= 0))
GArray *facilities;
- guint i, fac_id;
+ guint i, fac_id, ev_id;
LttvTraceHookByFacility *thf, *first_thf;
g_array_index(th->fac_list, LttvTraceHookByFacility*, 0)
= thf;
+ ev_id = ltt_eventtype_id(et);
+
thf->h = h;
- thf->id = ltt_eventtype_id(et);
+ 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 = &g_array_index(th->fac_index, LttvTraceHookByFacility, fac_id);
g_array_index(th->fac_list, LttvTraceHookByFacility*, i)
= thf;
+ ev_id = ltt_eventtype_id(et);
thf->h = h;
- thf->id = ltt_eventtype_id(et);
+ thf->id = GET_HOOK_ID(fac_id, ev_id);
thf->f1 = find_field(et, field1);
if(check_fields_compatibility(first_et, et,
first_thf->f1, thf->f1))