@@ -4326,7 +4326,6 @@ int perf_session__read_header(struct perf_session *session)
43264326int perf_event__process_feature (struct perf_session * session ,
43274327 union perf_event * event )
43284328{
4329- const struct perf_tool * tool = session -> tool ;
43304329 struct feat_fd ff = { .fd = 0 };
43314330 struct perf_record_header_feature * fe = (struct perf_record_header_feature * )event ;
43324331 int type = fe -> header .type ;
@@ -4342,28 +4341,23 @@ int perf_event__process_feature(struct perf_session *session,
43424341 return -1 ;
43434342 }
43444343
4345- if (!feat_ops [feat ].process )
4346- return 0 ;
4347-
43484344 ff .buf = (void * )fe -> data ;
43494345 ff .size = event -> header .size - sizeof (* fe );
43504346 ff .ph = & session -> header ;
43514347
4352- if (feat_ops [feat ].process (& ff , NULL )) {
4348+ if (feat_ops [feat ].process && feat_ops [ feat ]. process (& ff , NULL )) {
43534349 ret = -1 ;
43544350 goto out ;
43554351 }
43564352
4357- if (!feat_ops [feat ].print || !tool -> show_feat_hdr )
4358- goto out ;
4359-
4360- if (!feat_ops [feat ].full_only ||
4361- tool -> show_feat_hdr >= SHOW_FEAT_HEADER_FULL_INFO ) {
4362- feat_ops [feat ].print (& ff , stdout );
4363- } else {
4364- fprintf (stdout , "# %s info available, use -I to display\n" ,
4365- feat_ops [feat ].name );
4353+ if (dump_trace ) {
4354+ printf (", " );
4355+ if (feat_ops [feat ].print )
4356+ feat_ops [feat ].print (& ff , stdout );
4357+ else
4358+ printf ("# %s" , feat_ops [feat ].name );
43664359 }
4360+
43674361out :
43684362 free_event_desc (ff .events );
43694363 return ret ;
0 commit comments