@@ -2351,6 +2351,11 @@ event_filter_match(struct perf_event *event)
2351
2351
perf_cgroup_match (event );
2352
2352
}
2353
2353
2354
+ static inline bool is_event_in_freq_mode (struct perf_event * event )
2355
+ {
2356
+ return event -> attr .freq && event -> attr .sample_freq ;
2357
+ }
2358
+
2354
2359
static void
2355
2360
event_sched_out (struct perf_event * event , struct perf_event_context * ctx )
2356
2361
{
@@ -2388,7 +2393,7 @@ event_sched_out(struct perf_event *event, struct perf_event_context *ctx)
2388
2393
2389
2394
if (!is_software_event (event ))
2390
2395
cpc -> active_oncpu -- ;
2391
- if (event -> attr . freq && event -> attr . sample_freq ) {
2396
+ if (is_event_in_freq_mode ( event ) ) {
2392
2397
ctx -> nr_freq -- ;
2393
2398
epc -> nr_freq -- ;
2394
2399
}
@@ -2686,7 +2691,7 @@ event_sched_in(struct perf_event *event, struct perf_event_context *ctx)
2686
2691
2687
2692
if (!is_software_event (event ))
2688
2693
cpc -> active_oncpu ++ ;
2689
- if (event -> attr . freq && event -> attr . sample_freq ) {
2694
+ if (is_event_in_freq_mode ( event ) ) {
2690
2695
ctx -> nr_freq ++ ;
2691
2696
epc -> nr_freq ++ ;
2692
2697
}
@@ -4252,11 +4257,11 @@ static void perf_adjust_freq_unthr_events(struct list_head *event_list)
4252
4257
if (hwc -> interrupts == MAX_INTERRUPTS ) {
4253
4258
hwc -> interrupts = 0 ;
4254
4259
perf_log_throttle (event , 1 );
4255
- if (!event -> attr . freq || ! event -> attr . sample_freq )
4260
+ if (!is_event_in_freq_mode ( event ) )
4256
4261
event -> pmu -> start (event , 0 );
4257
4262
}
4258
4263
4259
- if (!event -> attr . freq || ! event -> attr . sample_freq )
4264
+ if (!is_event_in_freq_mode ( event ) )
4260
4265
continue ;
4261
4266
4262
4267
/*
@@ -12848,7 +12853,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
12848
12853
12849
12854
hwc = & event -> hw ;
12850
12855
hwc -> sample_period = attr -> sample_period ;
12851
- if (attr -> freq && attr -> sample_freq )
12856
+ if (is_event_in_freq_mode ( event ) )
12852
12857
hwc -> sample_period = 1 ;
12853
12858
hwc -> last_period = hwc -> sample_period ;
12854
12859
0 commit comments