diff options
Diffstat (limited to 'include/trace/events')
-rw-r--r-- | include/trace/events/asoc.h | 80 | ||||
-rw-r--r-- | include/trace/events/ext3.h | 4 | ||||
-rw-r--r-- | include/trace/events/ext4.h | 4 | ||||
-rw-r--r-- | include/trace/events/jbd.h | 39 | ||||
-rw-r--r-- | include/trace/events/power.h | 34 | ||||
-rw-r--r-- | include/trace/events/rcu.h | 2 | ||||
-rw-r--r-- | include/trace/events/workqueue.h | 2 |
7 files changed, 136 insertions, 29 deletions
diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h index ab26f8aa3c78..5fc2dcdd21cd 100644 --- a/include/trace/events/asoc.h +++ b/include/trace/events/asoc.h | |||
@@ -7,6 +7,8 @@ | |||
7 | #include <linux/ktime.h> | 7 | #include <linux/ktime.h> |
8 | #include <linux/tracepoint.h> | 8 | #include <linux/tracepoint.h> |
9 | 9 | ||
10 | #define DAPM_DIRECT "(direct)" | ||
11 | |||
10 | struct snd_soc_jack; | 12 | struct snd_soc_jack; |
11 | struct snd_soc_codec; | 13 | struct snd_soc_codec; |
12 | struct snd_soc_platform; | 14 | struct snd_soc_platform; |
@@ -241,6 +243,84 @@ TRACE_EVENT(snd_soc_dapm_walk_done, | |||
241 | (int)__entry->path_checks, (int)__entry->neighbour_checks) | 243 | (int)__entry->path_checks, (int)__entry->neighbour_checks) |
242 | ); | 244 | ); |
243 | 245 | ||
246 | TRACE_EVENT(snd_soc_dapm_output_path, | ||
247 | |||
248 | TP_PROTO(struct snd_soc_dapm_widget *widget, | ||
249 | struct snd_soc_dapm_path *path), | ||
250 | |||
251 | TP_ARGS(widget, path), | ||
252 | |||
253 | TP_STRUCT__entry( | ||
254 | __string( wname, widget->name ) | ||
255 | __string( pname, path->name ? path->name : DAPM_DIRECT) | ||
256 | __string( psname, path->sink->name ) | ||
257 | __field( int, path_sink ) | ||
258 | __field( int, path_connect ) | ||
259 | ), | ||
260 | |||
261 | TP_fast_assign( | ||
262 | __assign_str(wname, widget->name); | ||
263 | __assign_str(pname, path->name ? path->name : DAPM_DIRECT); | ||
264 | __assign_str(psname, path->sink->name); | ||
265 | __entry->path_connect = path->connect; | ||
266 | __entry->path_sink = (long)path->sink; | ||
267 | ), | ||
268 | |||
269 | TP_printk("%c%s -> %s -> %s\n", | ||
270 | (int) __entry->path_sink && | ||
271 | (int) __entry->path_connect ? '*' : ' ', | ||
272 | __get_str(wname), __get_str(pname), __get_str(psname)) | ||
273 | ); | ||
274 | |||
275 | TRACE_EVENT(snd_soc_dapm_input_path, | ||
276 | |||
277 | TP_PROTO(struct snd_soc_dapm_widget *widget, | ||
278 | struct snd_soc_dapm_path *path), | ||
279 | |||
280 | TP_ARGS(widget, path), | ||
281 | |||
282 | TP_STRUCT__entry( | ||
283 | __string( wname, widget->name ) | ||
284 | __string( pname, path->name ? path->name : DAPM_DIRECT) | ||
285 | __string( psname, path->source->name ) | ||
286 | __field( int, path_source ) | ||
287 | __field( int, path_connect ) | ||
288 | ), | ||
289 | |||
290 | TP_fast_assign( | ||
291 | __assign_str(wname, widget->name); | ||
292 | __assign_str(pname, path->name ? path->name : DAPM_DIRECT); | ||
293 | __assign_str(psname, path->source->name); | ||
294 | __entry->path_connect = path->connect; | ||
295 | __entry->path_source = (long)path->source; | ||
296 | ), | ||
297 | |||
298 | TP_printk("%c%s <- %s <- %s\n", | ||
299 | (int) __entry->path_source && | ||
300 | (int) __entry->path_connect ? '*' : ' ', | ||
301 | __get_str(wname), __get_str(pname), __get_str(psname)) | ||
302 | ); | ||
303 | |||
304 | TRACE_EVENT(snd_soc_dapm_connected, | ||
305 | |||
306 | TP_PROTO(int paths, int stream), | ||
307 | |||
308 | TP_ARGS(paths, stream), | ||
309 | |||
310 | TP_STRUCT__entry( | ||
311 | __field( int, paths ) | ||
312 | __field( int, stream ) | ||
313 | ), | ||
314 | |||
315 | TP_fast_assign( | ||
316 | __entry->paths = paths; | ||
317 | __entry->stream = stream; | ||
318 | ), | ||
319 | |||
320 | TP_printk("%s: found %d paths\n", | ||
321 | __entry->stream ? "capture" : "playback", __entry->paths) | ||
322 | ); | ||
323 | |||
244 | TRACE_EVENT(snd_soc_jack_irq, | 324 | TRACE_EVENT(snd_soc_jack_irq, |
245 | 325 | ||
246 | TP_PROTO(const char *name), | 326 | TP_PROTO(const char *name), |
diff --git a/include/trace/events/ext3.h b/include/trace/events/ext3.h index 7b53c0573dc9..15d11a39be47 100644 --- a/include/trace/events/ext3.h +++ b/include/trace/events/ext3.h | |||
@@ -24,8 +24,8 @@ TRACE_EVENT(ext3_free_inode, | |||
24 | __entry->dev = inode->i_sb->s_dev; | 24 | __entry->dev = inode->i_sb->s_dev; |
25 | __entry->ino = inode->i_ino; | 25 | __entry->ino = inode->i_ino; |
26 | __entry->mode = inode->i_mode; | 26 | __entry->mode = inode->i_mode; |
27 | __entry->uid = inode->i_uid; | 27 | __entry->uid = i_uid_read(inode); |
28 | __entry->gid = inode->i_gid; | 28 | __entry->gid = i_gid_read(inode); |
29 | __entry->blocks = inode->i_blocks; | 29 | __entry->blocks = inode->i_blocks; |
30 | ), | 30 | ), |
31 | 31 | ||
diff --git a/include/trace/events/ext4.h b/include/trace/events/ext4.h index 319538bf17d2..69d8a69ea831 100644 --- a/include/trace/events/ext4.h +++ b/include/trace/events/ext4.h | |||
@@ -36,8 +36,8 @@ TRACE_EVENT(ext4_free_inode, | |||
36 | __entry->dev = inode->i_sb->s_dev; | 36 | __entry->dev = inode->i_sb->s_dev; |
37 | __entry->ino = inode->i_ino; | 37 | __entry->ino = inode->i_ino; |
38 | __entry->mode = inode->i_mode; | 38 | __entry->mode = inode->i_mode; |
39 | __entry->uid = inode->i_uid; | 39 | __entry->uid = i_uid_read(inode); |
40 | __entry->gid = inode->i_gid; | 40 | __entry->gid = i_gid_read(inode); |
41 | __entry->blocks = inode->i_blocks; | 41 | __entry->blocks = inode->i_blocks; |
42 | ), | 42 | ), |
43 | 43 | ||
diff --git a/include/trace/events/jbd.h b/include/trace/events/jbd.h index aff64d82d713..da6f2591c25e 100644 --- a/include/trace/events/jbd.h +++ b/include/trace/events/jbd.h | |||
@@ -36,19 +36,17 @@ DECLARE_EVENT_CLASS(jbd_commit, | |||
36 | 36 | ||
37 | TP_STRUCT__entry( | 37 | TP_STRUCT__entry( |
38 | __field( dev_t, dev ) | 38 | __field( dev_t, dev ) |
39 | __field( char, sync_commit ) | ||
40 | __field( int, transaction ) | 39 | __field( int, transaction ) |
41 | ), | 40 | ), |
42 | 41 | ||
43 | TP_fast_assign( | 42 | TP_fast_assign( |
44 | __entry->dev = journal->j_fs_dev->bd_dev; | 43 | __entry->dev = journal->j_fs_dev->bd_dev; |
45 | __entry->sync_commit = commit_transaction->t_synchronous_commit; | ||
46 | __entry->transaction = commit_transaction->t_tid; | 44 | __entry->transaction = commit_transaction->t_tid; |
47 | ), | 45 | ), |
48 | 46 | ||
49 | TP_printk("dev %d,%d transaction %d sync %d", | 47 | TP_printk("dev %d,%d transaction %d", |
50 | MAJOR(__entry->dev), MINOR(__entry->dev), | 48 | MAJOR(__entry->dev), MINOR(__entry->dev), |
51 | __entry->transaction, __entry->sync_commit) | 49 | __entry->transaction) |
52 | ); | 50 | ); |
53 | 51 | ||
54 | DEFINE_EVENT(jbd_commit, jbd_start_commit, | 52 | DEFINE_EVENT(jbd_commit, jbd_start_commit, |
@@ -87,19 +85,17 @@ TRACE_EVENT(jbd_drop_transaction, | |||
87 | 85 | ||
88 | TP_STRUCT__entry( | 86 | TP_STRUCT__entry( |
89 | __field( dev_t, dev ) | 87 | __field( dev_t, dev ) |
90 | __field( char, sync_commit ) | ||
91 | __field( int, transaction ) | 88 | __field( int, transaction ) |
92 | ), | 89 | ), |
93 | 90 | ||
94 | TP_fast_assign( | 91 | TP_fast_assign( |
95 | __entry->dev = journal->j_fs_dev->bd_dev; | 92 | __entry->dev = journal->j_fs_dev->bd_dev; |
96 | __entry->sync_commit = commit_transaction->t_synchronous_commit; | ||
97 | __entry->transaction = commit_transaction->t_tid; | 93 | __entry->transaction = commit_transaction->t_tid; |
98 | ), | 94 | ), |
99 | 95 | ||
100 | TP_printk("dev %d,%d transaction %d sync %d", | 96 | TP_printk("dev %d,%d transaction %d", |
101 | MAJOR(__entry->dev), MINOR(__entry->dev), | 97 | MAJOR(__entry->dev), MINOR(__entry->dev), |
102 | __entry->transaction, __entry->sync_commit) | 98 | __entry->transaction) |
103 | ); | 99 | ); |
104 | 100 | ||
105 | TRACE_EVENT(jbd_end_commit, | 101 | TRACE_EVENT(jbd_end_commit, |
@@ -109,21 +105,19 @@ TRACE_EVENT(jbd_end_commit, | |||
109 | 105 | ||
110 | TP_STRUCT__entry( | 106 | TP_STRUCT__entry( |
111 | __field( dev_t, dev ) | 107 | __field( dev_t, dev ) |
112 | __field( char, sync_commit ) | ||
113 | __field( int, transaction ) | 108 | __field( int, transaction ) |
114 | __field( int, head ) | 109 | __field( int, head ) |
115 | ), | 110 | ), |
116 | 111 | ||
117 | TP_fast_assign( | 112 | TP_fast_assign( |
118 | __entry->dev = journal->j_fs_dev->bd_dev; | 113 | __entry->dev = journal->j_fs_dev->bd_dev; |
119 | __entry->sync_commit = commit_transaction->t_synchronous_commit; | ||
120 | __entry->transaction = commit_transaction->t_tid; | 114 | __entry->transaction = commit_transaction->t_tid; |
121 | __entry->head = journal->j_tail_sequence; | 115 | __entry->head = journal->j_tail_sequence; |
122 | ), | 116 | ), |
123 | 117 | ||
124 | TP_printk("dev %d,%d transaction %d sync %d head %d", | 118 | TP_printk("dev %d,%d transaction %d head %d", |
125 | MAJOR(__entry->dev), MINOR(__entry->dev), | 119 | MAJOR(__entry->dev), MINOR(__entry->dev), |
126 | __entry->transaction, __entry->sync_commit, __entry->head) | 120 | __entry->transaction, __entry->head) |
127 | ); | 121 | ); |
128 | 122 | ||
129 | TRACE_EVENT(jbd_do_submit_data, | 123 | TRACE_EVENT(jbd_do_submit_data, |
@@ -133,19 +127,17 @@ TRACE_EVENT(jbd_do_submit_data, | |||
133 | 127 | ||
134 | TP_STRUCT__entry( | 128 | TP_STRUCT__entry( |
135 | __field( dev_t, dev ) | 129 | __field( dev_t, dev ) |
136 | __field( char, sync_commit ) | ||
137 | __field( int, transaction ) | 130 | __field( int, transaction ) |
138 | ), | 131 | ), |
139 | 132 | ||
140 | TP_fast_assign( | 133 | TP_fast_assign( |
141 | __entry->dev = journal->j_fs_dev->bd_dev; | 134 | __entry->dev = journal->j_fs_dev->bd_dev; |
142 | __entry->sync_commit = commit_transaction->t_synchronous_commit; | ||
143 | __entry->transaction = commit_transaction->t_tid; | 135 | __entry->transaction = commit_transaction->t_tid; |
144 | ), | 136 | ), |
145 | 137 | ||
146 | TP_printk("dev %d,%d transaction %d sync %d", | 138 | TP_printk("dev %d,%d transaction %d", |
147 | MAJOR(__entry->dev), MINOR(__entry->dev), | 139 | MAJOR(__entry->dev), MINOR(__entry->dev), |
148 | __entry->transaction, __entry->sync_commit) | 140 | __entry->transaction) |
149 | ); | 141 | ); |
150 | 142 | ||
151 | TRACE_EVENT(jbd_cleanup_journal_tail, | 143 | TRACE_EVENT(jbd_cleanup_journal_tail, |
@@ -177,24 +169,23 @@ TRACE_EVENT(jbd_cleanup_journal_tail, | |||
177 | __entry->block_nr, __entry->freed) | 169 | __entry->block_nr, __entry->freed) |
178 | ); | 170 | ); |
179 | 171 | ||
180 | TRACE_EVENT(jbd_update_superblock_end, | 172 | TRACE_EVENT(journal_write_superblock, |
181 | TP_PROTO(journal_t *journal, int wait), | 173 | TP_PROTO(journal_t *journal, int write_op), |
182 | 174 | ||
183 | TP_ARGS(journal, wait), | 175 | TP_ARGS(journal, write_op), |
184 | 176 | ||
185 | TP_STRUCT__entry( | 177 | TP_STRUCT__entry( |
186 | __field( dev_t, dev ) | 178 | __field( dev_t, dev ) |
187 | __field( int, wait ) | 179 | __field( int, write_op ) |
188 | ), | 180 | ), |
189 | 181 | ||
190 | TP_fast_assign( | 182 | TP_fast_assign( |
191 | __entry->dev = journal->j_fs_dev->bd_dev; | 183 | __entry->dev = journal->j_fs_dev->bd_dev; |
192 | __entry->wait = wait; | 184 | __entry->write_op = write_op; |
193 | ), | 185 | ), |
194 | 186 | ||
195 | TP_printk("dev %d,%d wait %d", | 187 | TP_printk("dev %d,%d write_op %x", MAJOR(__entry->dev), |
196 | MAJOR(__entry->dev), MINOR(__entry->dev), | 188 | MINOR(__entry->dev), __entry->write_op) |
197 | __entry->wait) | ||
198 | ); | 189 | ); |
199 | 190 | ||
200 | #endif /* _TRACE_JBD_H */ | 191 | #endif /* _TRACE_JBD_H */ |
diff --git a/include/trace/events/power.h b/include/trace/events/power.h index cae9a94f025d..0c9783841a30 100644 --- a/include/trace/events/power.h +++ b/include/trace/events/power.h | |||
@@ -65,6 +65,40 @@ TRACE_EVENT(machine_suspend, | |||
65 | TP_printk("state=%lu", (unsigned long)__entry->state) | 65 | TP_printk("state=%lu", (unsigned long)__entry->state) |
66 | ); | 66 | ); |
67 | 67 | ||
68 | DECLARE_EVENT_CLASS(wakeup_source, | ||
69 | |||
70 | TP_PROTO(const char *name, unsigned int state), | ||
71 | |||
72 | TP_ARGS(name, state), | ||
73 | |||
74 | TP_STRUCT__entry( | ||
75 | __string( name, name ) | ||
76 | __field( u64, state ) | ||
77 | ), | ||
78 | |||
79 | TP_fast_assign( | ||
80 | __assign_str(name, name); | ||
81 | __entry->state = state; | ||
82 | ), | ||
83 | |||
84 | TP_printk("%s state=0x%lx", __get_str(name), | ||
85 | (unsigned long)__entry->state) | ||
86 | ); | ||
87 | |||
88 | DEFINE_EVENT(wakeup_source, wakeup_source_activate, | ||
89 | |||
90 | TP_PROTO(const char *name, unsigned int state), | ||
91 | |||
92 | TP_ARGS(name, state) | ||
93 | ); | ||
94 | |||
95 | DEFINE_EVENT(wakeup_source, wakeup_source_deactivate, | ||
96 | |||
97 | TP_PROTO(const char *name, unsigned int state), | ||
98 | |||
99 | TP_ARGS(name, state) | ||
100 | ); | ||
101 | |||
68 | #ifdef CONFIG_EVENT_POWER_TRACING_DEPRECATED | 102 | #ifdef CONFIG_EVENT_POWER_TRACING_DEPRECATED |
69 | 103 | ||
70 | /* | 104 | /* |
diff --git a/include/trace/events/rcu.h b/include/trace/events/rcu.h index 337099783f37..1480900c511c 100644 --- a/include/trace/events/rcu.h +++ b/include/trace/events/rcu.h | |||
@@ -292,6 +292,8 @@ TRACE_EVENT(rcu_dyntick, | |||
292 | * "More callbacks": Still more callbacks, try again to clear them out. | 292 | * "More callbacks": Still more callbacks, try again to clear them out. |
293 | * "Callbacks drained": All callbacks processed, off to dyntick idle! | 293 | * "Callbacks drained": All callbacks processed, off to dyntick idle! |
294 | * "Timer": Timer fired to cause CPU to continue processing callbacks. | 294 | * "Timer": Timer fired to cause CPU to continue processing callbacks. |
295 | * "Demigrate": Timer fired on wrong CPU, woke up correct CPU. | ||
296 | * "Cleanup after idle": Idle exited, timer canceled. | ||
295 | */ | 297 | */ |
296 | TRACE_EVENT(rcu_prep_idle, | 298 | TRACE_EVENT(rcu_prep_idle, |
297 | 299 | ||
diff --git a/include/trace/events/workqueue.h b/include/trace/events/workqueue.h index 7d497291c85d..4018f5058f27 100644 --- a/include/trace/events/workqueue.h +++ b/include/trace/events/workqueue.h | |||
@@ -103,7 +103,7 @@ TRACE_EVENT(workqueue_execute_start, | |||
103 | ); | 103 | ); |
104 | 104 | ||
105 | /** | 105 | /** |
106 | * workqueue_execute_end - called immediately before the workqueue callback | 106 | * workqueue_execute_end - called immediately after the workqueue callback |
107 | * @work: pointer to struct work_struct | 107 | * @work: pointer to struct work_struct |
108 | * | 108 | * |
109 | * Allows to track workqueue execution. | 109 | * Allows to track workqueue execution. |