| .. | .. |
|---|
| 6 | 6 | #include <linux/seq_file.h> |
|---|
| 7 | 7 | #include <linux/poll.h> |
|---|
| 8 | 8 | |
|---|
| 9 | | -struct ring_buffer; |
|---|
| 9 | +struct trace_buffer; |
|---|
| 10 | 10 | struct ring_buffer_iter; |
|---|
| 11 | 11 | |
|---|
| 12 | 12 | /* |
|---|
| .. | .. |
|---|
| 77 | 77 | * else |
|---|
| 78 | 78 | * ring_buffer_unlock_commit(buffer, event); |
|---|
| 79 | 79 | */ |
|---|
| 80 | | -void ring_buffer_discard_commit(struct ring_buffer *buffer, |
|---|
| 80 | +void ring_buffer_discard_commit(struct trace_buffer *buffer, |
|---|
| 81 | 81 | struct ring_buffer_event *event); |
|---|
| 82 | 82 | |
|---|
| 83 | 83 | /* |
|---|
| 84 | 84 | * size is in bytes for each per CPU buffer. |
|---|
| 85 | 85 | */ |
|---|
| 86 | | -struct ring_buffer * |
|---|
| 86 | +struct trace_buffer * |
|---|
| 87 | 87 | __ring_buffer_alloc(unsigned long size, unsigned flags, struct lock_class_key *key); |
|---|
| 88 | 88 | |
|---|
| 89 | 89 | /* |
|---|
| .. | .. |
|---|
| 97 | 97 | __ring_buffer_alloc((size), (flags), &__key); \ |
|---|
| 98 | 98 | }) |
|---|
| 99 | 99 | |
|---|
| 100 | | -int ring_buffer_wait(struct ring_buffer *buffer, int cpu, bool full); |
|---|
| 101 | | -__poll_t ring_buffer_poll_wait(struct ring_buffer *buffer, int cpu, |
|---|
| 102 | | - struct file *filp, poll_table *poll_table); |
|---|
| 103 | | - |
|---|
| 100 | +int ring_buffer_wait(struct trace_buffer *buffer, int cpu, int full); |
|---|
| 101 | +__poll_t ring_buffer_poll_wait(struct trace_buffer *buffer, int cpu, |
|---|
| 102 | + struct file *filp, poll_table *poll_table, int full); |
|---|
| 103 | +void ring_buffer_wake_waiters(struct trace_buffer *buffer, int cpu); |
|---|
| 104 | 104 | |
|---|
| 105 | 105 | #define RING_BUFFER_ALL_CPUS -1 |
|---|
| 106 | 106 | |
|---|
| 107 | | -void ring_buffer_free(struct ring_buffer *buffer); |
|---|
| 107 | +void ring_buffer_free(struct trace_buffer *buffer); |
|---|
| 108 | 108 | |
|---|
| 109 | | -int ring_buffer_resize(struct ring_buffer *buffer, unsigned long size, int cpu); |
|---|
| 109 | +int ring_buffer_resize(struct trace_buffer *buffer, unsigned long size, int cpu); |
|---|
| 110 | 110 | |
|---|
| 111 | | -void ring_buffer_change_overwrite(struct ring_buffer *buffer, int val); |
|---|
| 111 | +void ring_buffer_change_overwrite(struct trace_buffer *buffer, int val); |
|---|
| 112 | 112 | |
|---|
| 113 | | -struct ring_buffer_event *ring_buffer_lock_reserve(struct ring_buffer *buffer, |
|---|
| 113 | +struct ring_buffer_event *ring_buffer_lock_reserve(struct trace_buffer *buffer, |
|---|
| 114 | 114 | unsigned long length); |
|---|
| 115 | | -int ring_buffer_unlock_commit(struct ring_buffer *buffer, |
|---|
| 115 | +int ring_buffer_unlock_commit(struct trace_buffer *buffer, |
|---|
| 116 | 116 | struct ring_buffer_event *event); |
|---|
| 117 | | -int ring_buffer_write(struct ring_buffer *buffer, |
|---|
| 117 | +int ring_buffer_write(struct trace_buffer *buffer, |
|---|
| 118 | 118 | unsigned long length, void *data); |
|---|
| 119 | 119 | |
|---|
| 120 | | -void ring_buffer_nest_start(struct ring_buffer *buffer); |
|---|
| 121 | | -void ring_buffer_nest_end(struct ring_buffer *buffer); |
|---|
| 120 | +void ring_buffer_nest_start(struct trace_buffer *buffer); |
|---|
| 121 | +void ring_buffer_nest_end(struct trace_buffer *buffer); |
|---|
| 122 | 122 | |
|---|
| 123 | 123 | struct ring_buffer_event * |
|---|
| 124 | | -ring_buffer_peek(struct ring_buffer *buffer, int cpu, u64 *ts, |
|---|
| 124 | +ring_buffer_peek(struct trace_buffer *buffer, int cpu, u64 *ts, |
|---|
| 125 | 125 | unsigned long *lost_events); |
|---|
| 126 | 126 | struct ring_buffer_event * |
|---|
| 127 | | -ring_buffer_consume(struct ring_buffer *buffer, int cpu, u64 *ts, |
|---|
| 127 | +ring_buffer_consume(struct trace_buffer *buffer, int cpu, u64 *ts, |
|---|
| 128 | 128 | unsigned long *lost_events); |
|---|
| 129 | 129 | |
|---|
| 130 | 130 | struct ring_buffer_iter * |
|---|
| 131 | | -ring_buffer_read_prepare(struct ring_buffer *buffer, int cpu, gfp_t flags); |
|---|
| 131 | +ring_buffer_read_prepare(struct trace_buffer *buffer, int cpu, gfp_t flags); |
|---|
| 132 | 132 | void ring_buffer_read_prepare_sync(void); |
|---|
| 133 | 133 | void ring_buffer_read_start(struct ring_buffer_iter *iter); |
|---|
| 134 | 134 | void ring_buffer_read_finish(struct ring_buffer_iter *iter); |
|---|
| 135 | 135 | |
|---|
| 136 | 136 | struct ring_buffer_event * |
|---|
| 137 | 137 | ring_buffer_iter_peek(struct ring_buffer_iter *iter, u64 *ts); |
|---|
| 138 | | -struct ring_buffer_event * |
|---|
| 139 | | -ring_buffer_read(struct ring_buffer_iter *iter, u64 *ts); |
|---|
| 138 | +void ring_buffer_iter_advance(struct ring_buffer_iter *iter); |
|---|
| 140 | 139 | void ring_buffer_iter_reset(struct ring_buffer_iter *iter); |
|---|
| 141 | 140 | int ring_buffer_iter_empty(struct ring_buffer_iter *iter); |
|---|
| 141 | +bool ring_buffer_iter_dropped(struct ring_buffer_iter *iter); |
|---|
| 142 | 142 | |
|---|
| 143 | | -unsigned long ring_buffer_size(struct ring_buffer *buffer, int cpu); |
|---|
| 143 | +unsigned long ring_buffer_size(struct trace_buffer *buffer, int cpu); |
|---|
| 144 | 144 | |
|---|
| 145 | | -void ring_buffer_reset_cpu(struct ring_buffer *buffer, int cpu); |
|---|
| 146 | | -void ring_buffer_reset(struct ring_buffer *buffer); |
|---|
| 145 | +void ring_buffer_reset_cpu(struct trace_buffer *buffer, int cpu); |
|---|
| 146 | +void ring_buffer_reset_online_cpus(struct trace_buffer *buffer); |
|---|
| 147 | +void ring_buffer_reset(struct trace_buffer *buffer); |
|---|
| 147 | 148 | |
|---|
| 148 | 149 | #ifdef CONFIG_RING_BUFFER_ALLOW_SWAP |
|---|
| 149 | | -int ring_buffer_swap_cpu(struct ring_buffer *buffer_a, |
|---|
| 150 | | - struct ring_buffer *buffer_b, int cpu); |
|---|
| 150 | +int ring_buffer_swap_cpu(struct trace_buffer *buffer_a, |
|---|
| 151 | + struct trace_buffer *buffer_b, int cpu); |
|---|
| 151 | 152 | #else |
|---|
| 152 | 153 | static inline int |
|---|
| 153 | | -ring_buffer_swap_cpu(struct ring_buffer *buffer_a, |
|---|
| 154 | | - struct ring_buffer *buffer_b, int cpu) |
|---|
| 154 | +ring_buffer_swap_cpu(struct trace_buffer *buffer_a, |
|---|
| 155 | + struct trace_buffer *buffer_b, int cpu) |
|---|
| 155 | 156 | { |
|---|
| 156 | 157 | return -ENODEV; |
|---|
| 157 | 158 | } |
|---|
| 158 | 159 | #endif |
|---|
| 159 | 160 | |
|---|
| 160 | | -bool ring_buffer_empty(struct ring_buffer *buffer); |
|---|
| 161 | | -bool ring_buffer_empty_cpu(struct ring_buffer *buffer, int cpu); |
|---|
| 161 | +bool ring_buffer_empty(struct trace_buffer *buffer); |
|---|
| 162 | +bool ring_buffer_empty_cpu(struct trace_buffer *buffer, int cpu); |
|---|
| 162 | 163 | |
|---|
| 163 | | -void ring_buffer_record_disable(struct ring_buffer *buffer); |
|---|
| 164 | | -void ring_buffer_record_enable(struct ring_buffer *buffer); |
|---|
| 165 | | -void ring_buffer_record_off(struct ring_buffer *buffer); |
|---|
| 166 | | -void ring_buffer_record_on(struct ring_buffer *buffer); |
|---|
| 167 | | -bool ring_buffer_record_is_on(struct ring_buffer *buffer); |
|---|
| 168 | | -bool ring_buffer_record_is_set_on(struct ring_buffer *buffer); |
|---|
| 169 | | -void ring_buffer_record_disable_cpu(struct ring_buffer *buffer, int cpu); |
|---|
| 170 | | -void ring_buffer_record_enable_cpu(struct ring_buffer *buffer, int cpu); |
|---|
| 164 | +void ring_buffer_record_disable(struct trace_buffer *buffer); |
|---|
| 165 | +void ring_buffer_record_enable(struct trace_buffer *buffer); |
|---|
| 166 | +void ring_buffer_record_off(struct trace_buffer *buffer); |
|---|
| 167 | +void ring_buffer_record_on(struct trace_buffer *buffer); |
|---|
| 168 | +bool ring_buffer_record_is_on(struct trace_buffer *buffer); |
|---|
| 169 | +bool ring_buffer_record_is_set_on(struct trace_buffer *buffer); |
|---|
| 170 | +void ring_buffer_record_disable_cpu(struct trace_buffer *buffer, int cpu); |
|---|
| 171 | +void ring_buffer_record_enable_cpu(struct trace_buffer *buffer, int cpu); |
|---|
| 171 | 172 | |
|---|
| 172 | | -u64 ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu); |
|---|
| 173 | | -unsigned long ring_buffer_bytes_cpu(struct ring_buffer *buffer, int cpu); |
|---|
| 174 | | -unsigned long ring_buffer_entries(struct ring_buffer *buffer); |
|---|
| 175 | | -unsigned long ring_buffer_overruns(struct ring_buffer *buffer); |
|---|
| 176 | | -unsigned long ring_buffer_entries_cpu(struct ring_buffer *buffer, int cpu); |
|---|
| 177 | | -unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu); |
|---|
| 178 | | -unsigned long ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu); |
|---|
| 179 | | -unsigned long ring_buffer_dropped_events_cpu(struct ring_buffer *buffer, int cpu); |
|---|
| 180 | | -unsigned long ring_buffer_read_events_cpu(struct ring_buffer *buffer, int cpu); |
|---|
| 173 | +u64 ring_buffer_oldest_event_ts(struct trace_buffer *buffer, int cpu); |
|---|
| 174 | +unsigned long ring_buffer_bytes_cpu(struct trace_buffer *buffer, int cpu); |
|---|
| 175 | +unsigned long ring_buffer_entries(struct trace_buffer *buffer); |
|---|
| 176 | +unsigned long ring_buffer_overruns(struct trace_buffer *buffer); |
|---|
| 177 | +unsigned long ring_buffer_entries_cpu(struct trace_buffer *buffer, int cpu); |
|---|
| 178 | +unsigned long ring_buffer_overrun_cpu(struct trace_buffer *buffer, int cpu); |
|---|
| 179 | +unsigned long ring_buffer_commit_overrun_cpu(struct trace_buffer *buffer, int cpu); |
|---|
| 180 | +unsigned long ring_buffer_dropped_events_cpu(struct trace_buffer *buffer, int cpu); |
|---|
| 181 | +unsigned long ring_buffer_read_events_cpu(struct trace_buffer *buffer, int cpu); |
|---|
| 181 | 182 | |
|---|
| 182 | | -u64 ring_buffer_time_stamp(struct ring_buffer *buffer, int cpu); |
|---|
| 183 | | -void ring_buffer_normalize_time_stamp(struct ring_buffer *buffer, |
|---|
| 183 | +u64 ring_buffer_time_stamp(struct trace_buffer *buffer, int cpu); |
|---|
| 184 | +void ring_buffer_normalize_time_stamp(struct trace_buffer *buffer, |
|---|
| 184 | 185 | int cpu, u64 *ts); |
|---|
| 185 | | -void ring_buffer_set_clock(struct ring_buffer *buffer, |
|---|
| 186 | +void ring_buffer_set_clock(struct trace_buffer *buffer, |
|---|
| 186 | 187 | u64 (*clock)(void)); |
|---|
| 187 | | -void ring_buffer_set_time_stamp_abs(struct ring_buffer *buffer, bool abs); |
|---|
| 188 | | -bool ring_buffer_time_stamp_abs(struct ring_buffer *buffer); |
|---|
| 188 | +void ring_buffer_set_time_stamp_abs(struct trace_buffer *buffer, bool abs); |
|---|
| 189 | +bool ring_buffer_time_stamp_abs(struct trace_buffer *buffer); |
|---|
| 189 | 190 | |
|---|
| 190 | | -size_t ring_buffer_page_len(void *page); |
|---|
| 191 | +size_t ring_buffer_nr_pages(struct trace_buffer *buffer, int cpu); |
|---|
| 192 | +size_t ring_buffer_nr_dirty_pages(struct trace_buffer *buffer, int cpu); |
|---|
| 191 | 193 | |
|---|
| 192 | | - |
|---|
| 193 | | -void *ring_buffer_alloc_read_page(struct ring_buffer *buffer, int cpu); |
|---|
| 194 | | -void ring_buffer_free_read_page(struct ring_buffer *buffer, int cpu, void *data); |
|---|
| 195 | | -int ring_buffer_read_page(struct ring_buffer *buffer, void **data_page, |
|---|
| 194 | +void *ring_buffer_alloc_read_page(struct trace_buffer *buffer, int cpu); |
|---|
| 195 | +void ring_buffer_free_read_page(struct trace_buffer *buffer, int cpu, void *data); |
|---|
| 196 | +int ring_buffer_read_page(struct trace_buffer *buffer, void **data_page, |
|---|
| 196 | 197 | size_t len, int cpu, int full); |
|---|
| 197 | 198 | |
|---|
| 198 | 199 | struct trace_seq; |
|---|