diff options
2 files changed, 8 insertions, 2 deletions
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ftrace.core/src/org/eclipse/tracecompass/incubator/internal/ftrace/core/event/GenericFtraceField.java b/tracetypes/org.eclipse.tracecompass.incubator.ftrace.core/src/org/eclipse/tracecompass/incubator/internal/ftrace/core/event/GenericFtraceField.java index d5bfe764b..263c7592f 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.ftrace.core/src/org/eclipse/tracecompass/incubator/internal/ftrace/core/event/GenericFtraceField.java +++ b/tracetypes/org.eclipse.tracecompass.incubator.ftrace.core/src/org/eclipse/tracecompass/incubator/internal/ftrace/core/event/GenericFtraceField.java @@ -135,7 +135,7 @@ public class GenericFtraceField { if (key.equals("prev_state")) { //$NON-NLS-1$ fields.put(key, PREV_STATE_LUT.getOrDefault(value.charAt(0), 0L)); } else if (StringUtils.isNumeric(value)) { - fields.put(key, Long.parseLong(value)); + fields.put(key, Long.parseUnsignedLong(value)); } else { fields.put(key, value); } diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ftrace.core/src/org/eclipse/tracecompass/incubator/internal/ftrace/core/trace/GenericFtrace.java b/tracetypes/org.eclipse.tracecompass.incubator.ftrace.core/src/org/eclipse/tracecompass/incubator/internal/ftrace/core/trace/GenericFtrace.java index 85c5a7fdc..30187ea73 100644 --- a/tracetypes/org.eclipse.tracecompass.incubator.ftrace.core/src/org/eclipse/tracecompass/incubator/internal/ftrace/core/trace/GenericFtrace.java +++ b/tracetypes/org.eclipse.tracecompass.incubator.ftrace.core/src/org/eclipse/tracecompass/incubator/internal/ftrace/core/trace/GenericFtrace.java @@ -107,11 +107,17 @@ public abstract class GenericFtrace extends TmfTrace implements IKernelTrace { if (location == null) { fFileInput.seek(0); long lineStartOffset = fFileInput.getFilePointer(); - String line = fFileInput.readLine(); + @Nullable String line = fFileInput.readLine(); + if (line == null) { + return context; + } Matcher matcher = IGenericFtraceConstants.FTRACE_PATTERN.matcher(line); while (!matcher.matches()) { lineStartOffset = fFileInput.getFilePointer(); line = fFileInput.readLine(); + if (line == null) { + break; + } matcher = IGenericFtraceConstants.FTRACE_PATTERN.matcher(line); } fFileInput.seek(lineStartOffset); |