diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-27 01:41:47 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-27 01:41:47 +0200 |
| commit | e894245c78b4d5b69074dc8d7f671770f513a4b6 (patch) | |
| tree | 18824efee368b949865532bf9c478ab6031d3aae /include/trace | |
| parent | ce63e1862ce81d85df9e3239e4467ac765e04962 (diff) | |
| parent | 536446772f1181f3afdf332780b5325d1b6980c6 (diff) | |
| download | linux-stable-e894245c78b4d5b69074dc8d7f671770f513a4b6.tar.gz linux-stable-e894245c78b4d5b69074dc8d7f671770f513a4b6.tar.bz2 linux-stable-e894245c78b4d5b69074dc8d7f671770f513a4b6.zip | |
Merge branch 'pm-sleep'
* pm-sleep:
PM / Sleep: new trace event to print device suspend and resume times
PM / Sleep: increase ftrace coverage in suspend/resume
Diffstat (limited to 'include/trace')
| -rw-r--r-- | include/trace/events/power.h | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/include/trace/events/power.h b/include/trace/events/power.h index 8e42410bd159..cda100d6762d 100644 --- a/include/trace/events/power.h +++ b/include/trace/events/power.h @@ -66,6 +66,43 @@ TRACE_EVENT(machine_suspend, TP_printk("state=%lu", (unsigned long)__entry->state) ); +TRACE_EVENT(device_pm_report_time, + + TP_PROTO(struct device *dev, const char *pm_ops, s64 ops_time, + char *pm_event_str, int error), + + TP_ARGS(dev, pm_ops, ops_time, pm_event_str, error), + + TP_STRUCT__entry( + __string(device, dev_name(dev)) + __string(driver, dev_driver_string(dev)) + __string(parent, dev->parent ? dev_name(dev->parent) : "none") + __string(pm_ops, pm_ops ? pm_ops : "none ") + __string(pm_event_str, pm_event_str) + __field(s64, ops_time) + __field(int, error) + ), + + TP_fast_assign( + const char *tmp = dev->parent ? dev_name(dev->parent) : "none"; + const char *tmp_i = pm_ops ? pm_ops : "none "; + + __assign_str(device, dev_name(dev)); + __assign_str(driver, dev_driver_string(dev)); + __assign_str(parent, tmp); + __assign_str(pm_ops, tmp_i); + __assign_str(pm_event_str, pm_event_str); + __entry->ops_time = ops_time; + __entry->error = error; + ), + + /* ops_str has an extra space at the end */ + TP_printk("%s %s parent=%s state=%s ops=%snsecs=%lld err=%d", + __get_str(driver), __get_str(device), __get_str(parent), + __get_str(pm_event_str), __get_str(pm_ops), + __entry->ops_time, __entry->error) +); + DECLARE_EVENT_CLASS(wakeup_source, TP_PROTO(const char *name, unsigned int state), |