X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=analysis%2Forg.eclipse.tracecompass.analysis.os.linux.core%2Fsrc%2Forg%2Feclipse%2Ftracecompass%2Fanalysis%2Fos%2Flinux%2Fcore%2Ftrace%2FDefaultEventLayout.java;h=87da71bbfd8321c1f34c1703a0c16405050175d5;hb=01f2a5074ceebbc1ceaf2643c1aff5168a61ed4b;hp=7b0f09a546f5abc133e0058b2239e5c72a164815;hpb=0926f3f3ba5fd1d9a9f84a2a88c979be0572a4d2;p=deliverable%2Ftracecompass.git

diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/trace/DefaultEventLayout.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/trace/DefaultEventLayout.java
index 7b0f09a546..87da71bbfd 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/trace/DefaultEventLayout.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/trace/DefaultEventLayout.java
@@ -38,12 +38,15 @@ public class DefaultEventLayout implements IKernelAnalysisEventLayout{
     private static final String SOFTIRQ_ENTRY = "softirq_entry"; //$NON-NLS-1$
     private static final String SOFTIRQ_EXIT = "softirq_exit"; //$NON-NLS-1$
     private static final String SOFTIRQ_RAISE = "softirq_raise"; //$NON-NLS-1$
+    private static final String HRTIMER_START = "hrtimer_start"; //$NON-NLS-1$
+    private static final String HRTIMER_CANCEL = "hrtimer_cancel"; //$NON-NLS-1$
     private static final String HRTIMER_EXPIRE_ENTRY = "hrtimer_expire_entry"; //$NON-NLS-1$
     private static final String HRTIMER_EXPIRE_EXIT = "hrtimer_expire_exit"; //$NON-NLS-1$
     private static final String SCHED_SWITCH = "sched_switch"; //$NON-NLS-1$
     private static final String SCHED_PI_SETPRIO = "sched_pi_setprio"; //$NON-NLS-1$
 
     private static final String SCHED_TTWU = "sched_ttwu"; //$NON-NLS-1$
+    private static final String SCHED_WAKING = "sched_waking"; //$NON-NLS-1$
     private static final String SCHED_WAKEUP = "sched_wakeup"; //$NON-NLS-1$
     private static final String SCHED_WAKEUP_NEW = "sched_wakeup_new"; //$NON-NLS-1$
     private static final Collection<String> SCHED_WAKEUP_EVENTS =
@@ -78,6 +81,11 @@ public class DefaultEventLayout implements IKernelAnalysisEventLayout{
     private static final String STATUS = "status"; //$NON-NLS-1$
     private static final String PREV_COMM = "prev_comm"; //$NON-NLS-1$
     private static final String FILENAME = "filename"; //$NON-NLS-1$
+    private static final String HRTIMER = "hrtimer"; //$NON-NLS-1$
+    private static final String FUNCTION = "function"; //$NON-NLS-1$
+    private static final String EXPIRES = "expires"; //$NON-NLS-1$
+    private static final String NOW = "now"; //$NON-NLS-1$
+    private static final String SOFT_EXPIRES = "softexpires"; //$NON-NLS-1$
 
     /** All instances are the same. Only provide a static instance getter */
     private DefaultEventLayout() {
@@ -173,6 +181,12 @@ public class DefaultEventLayout implements IKernelAnalysisEventLayout{
         return SYSCALL_EXIT_PREFIX;
     }
 
+    /** @since 2.0 */
+    @Override
+    public String eventCompatSyscallExitPrefix() {
+        return SYSCALL_EXIT_PREFIX;
+    }
+
     // ------------------------------------------------------------------------
     // Event field names
     // ------------------------------------------------------------------------
@@ -293,6 +307,18 @@ public class DefaultEventLayout implements IKernelAnalysisEventLayout{
         return SCHED_WAKEUP_NEW;
     }
 
+    /** @since 2.0 */
+    @Override
+    public String eventHRTimerStart() {
+        return HRTIMER_START;
+    }
+
+    /** @since 2.0 */
+    @Override
+    public String eventHRTimerCancel() {
+        return HRTIMER_CANCEL;
+    }
+
     /** @since 2.0 */
     @Override
     public String eventHRTimerExpireEntry() {
@@ -315,4 +341,44 @@ public class DefaultEventLayout implements IKernelAnalysisEventLayout{
         return SCHED_TTWU;
     }
 
+    /** @since 2.0 */
+    @Override
+    public String fieldHRtimer() {
+        return HRTIMER;
+    }
+
+    /** @since 2.0 */
+    @Override
+    public String fieldHRtimerFunction() {
+        return FUNCTION;
+    }
+
+    /** @since 2.0 */
+    @Override
+    public String fieldHRtimerExpires() {
+        return EXPIRES;
+    }
+
+    /** @since 2.0 */
+    @Override
+    public String fieldHRtimerSoftexpires() {
+        return SOFT_EXPIRES;
+    }
+
+    /** @since 2.0 */
+    @Override
+    public String fieldHRtimerNow() {
+        return NOW;
+    }
+
+    /**
+     * Event indicating the source of the wakeup signal.
+     *
+     * @return The name of the event
+     * @since 2.0
+     */
+    public String eventSchedProcessWaking() {
+        return SCHED_WAKING;
+    }
+
 }