X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=org.eclipse.linuxtools.ctf.core%2Fsrc%2Forg%2Feclipse%2Flinuxtools%2Fctf%2Fcore%2Ftrace%2FCTFTrace.java;h=7bb19730fe8c4cce8279e57f40084e4d402a2337;hb=ab04fc6bc48d6ebda9c00071b8e4f3077421e01e;hp=e02c58b01a2f0e6b33229df00cc2442af20c17bb;hpb=60fb38b86bdccbdc87eba7a3429968214dc3ddfa;p=deliverable%2Ftracecompass.git diff --git a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java index e02c58b01a..7bb19730fe 100644 --- a/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java +++ b/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/CTFTrace.java @@ -1,13 +1,15 @@ /******************************************************************************* - * Copyright (c) 2011-2013 Ericsson, Ecole Polytechnique de Montreal and others + * Copyright (c) 2011, 2014 Ericsson, Ecole Polytechnique de Montreal and others * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License v1.0 which * accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html * - * Contributors: Matthew Khouzam - Initial API and implementation - * Contributors: Alexandre Montplaisir - Initial API and implementation + * Contributors: + * Matthew Khouzam - Initial API and implementation + * Alexandre Montplaisir - Initial API and implementation + * Simon Delisle - Replace LinkedList by TreeSet in callsitesByName attribute *******************************************************************************/ package org.eclipse.linuxtools.ctf.core.trace; @@ -28,7 +30,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import java.util.ListIterator; import java.util.Map; import java.util.Map.Entry; import java.util.Set; @@ -46,8 +47,8 @@ import org.eclipse.linuxtools.ctf.core.event.types.IDefinitionScope; import org.eclipse.linuxtools.ctf.core.event.types.IntegerDefinition; import org.eclipse.linuxtools.ctf.core.event.types.StructDeclaration; import org.eclipse.linuxtools.ctf.core.event.types.StructDefinition; +import org.eclipse.linuxtools.internal.ctf.core.event.CTFCallsiteComparator; import org.eclipse.linuxtools.internal.ctf.core.event.metadata.exceptions.ParseException; -import org.eclipse.linuxtools.internal.ctf.core.trace.StreamInputPacketIndex; /** * A CTF trace on the file system. @@ -60,60 +61,50 @@ import org.eclipse.linuxtools.internal.ctf.core.trace.StreamInputPacketIndex; * @author Matthew Khouzam * @version $Revision: 1.0 $ */ -public class CTFTrace implements IDefinitionScope { +public class CTFTrace implements IDefinitionScope, AutoCloseable { - /* - * (non-Javadoc) - * - * @see java.lang.Object#toString() - */ @SuppressWarnings("nls") @Override public String toString() { /* Only for debugging, shouldn't be externalized */ - return "CTFTrace [path=" + path + ", major=" + major + ", minor=" - + minor + ", uuid=" + uuid + "]"; + return "CTFTrace [path=" + fPath + ", major=" + fMajor + ", minor=" + + fMinor + ", uuid=" + fUuid + "]"; } /** * The trace directory on the filesystem. */ - private final File path; - - /** - * The metadata parsing object. - */ - private final Metadata metadata; + private final File fPath; /** * Major CTF version number */ - private Long major; + private Long fMajor; /** * Minor CTF version number */ - private Long minor; + private Long fMinor; /** * Trace UUID */ - private UUID uuid; + private UUID fUuid; /** * Trace byte order */ - private ByteOrder byteOrder; + private ByteOrder fByteOrder; /** * Packet header structure declaration */ - private StructDeclaration packetHeaderDecl = null; + private StructDeclaration fPacketHeaderDecl = null; /** * The clock of the trace */ - private CTFClock singleClock; + private CTFClock fSingleClock; /** * Packet header structure definition @@ -121,44 +112,37 @@ public class CTFTrace implements IDefinitionScope { * This is only used when opening the trace files, to read the first packet * header and see if they are valid trace files. */ - private StructDefinition packetHeaderDef; + private StructDefinition fPacketHeaderDef; /** * Collection of streams contained in the trace. */ - private final Map streams = new HashMap(); + private final Map fStreams = new HashMap<>(); /** * Collection of environment variables set by the tracer */ - private final Map environment = new HashMap(); + private final Map fEnvironment = new HashMap<>(); /** * Collection of all the clocks in a system. */ - private final Map clocks = new HashMap(); + private final Map fClocks = new HashMap<>(); /** FileInputStreams to the streams */ - private final List fileInputStreams = new LinkedList(); + private final List fFileInputStreams = new LinkedList<>(); /** Handlers for the metadata files */ - private final static FileFilter metadataFileFilter = new MetadataFileFilter(); - private final static Comparator metadataComparator = new MetadataComparator(); // $codepro.audit.disable - // fieldJavadoc - - /** map of all the event types */ - private final Map> eventDecs = new HashMap>(); - /** map of all the event types */ - private final Map> eventDefs = new HashMap>(); - /** map of all the indexes */ - private final Map indexes = new HashMap(); + private static final FileFilter METADATA_FILE_FILTER = new MetadataFileFilter(); + private static final Comparator METADATA_COMPARATOR = new MetadataComparator(); /** Callsite helpers */ - private Map> callsitesByName = new HashMap>(); - /** Callsite helpers */ - private TreeSet callsitesByIP = new TreeSet(); + private CTFCallsiteComparator fCtfCallsiteComparator = new CTFCallsiteComparator(); + private Map> fCallsitesByName = new HashMap<>(); + /** Callsite helpers */ + private TreeSet fCallsitesByIP = new TreeSet<>(); // ------------------------------------------------------------------------ // Constructors @@ -186,66 +170,73 @@ public class CTFTrace implements IDefinitionScope { * If no CTF trace was found at the path */ public CTFTrace(File path) throws CTFReaderException { - this.path = path; - this.metadata = new Metadata(this); + fPath = path; + final Metadata metadata = new Metadata(this); /* Set up the internal containers for this trace */ - if (!this.path.exists()) { + if (!fPath.exists()) { throw new CTFReaderException("Trace (" + path.getPath() + ") doesn't exist. Deleted or moved?"); //$NON-NLS-1$ //$NON-NLS-2$ } - if (!this.path.isDirectory()) { + if (!fPath.isDirectory()) { throw new CTFReaderException("Path must be a valid directory"); //$NON-NLS-1$ } /* Open and parse the metadata file */ - metadata.parse(); + metadata.parseFile(); - /* Open all the trace files */ + init(path); + } + + /** + * Streamed constructor + * + * @since 3.0 + */ + public CTFTrace() { + fPath = null; + init(); + } + + private void init() { /* Create the definitions needed to read things from the files */ - if (packetHeaderDecl != null) { - packetHeaderDef = packetHeaderDecl.createDefinition(this, - "packet.header"); //$NON-NLS-1$ + if (fPacketHeaderDecl != null) { + fPacketHeaderDef = fPacketHeaderDecl.createDefinition(this, "packet.header"); //$NON-NLS-1$ } + } + + private void init(File path) throws CTFReaderException { + + init(); + + /* Open all the trace files */ /* List files not called metadata and not hidden. */ - File[] files = path.listFiles(metadataFileFilter); - Arrays.sort(files, metadataComparator); + File[] files = path.listFiles(METADATA_FILE_FILTER); + Arrays.sort(files, METADATA_COMPARATOR); + /* Try to open each file */ for (File streamFile : files) { openStreamInput(streamFile); } /* Create their index */ - for (Map.Entry stream : streams.entrySet()) { - Set inputs = stream.getValue().getStreamInputs(); + for (Stream stream : getStreams()) { + Set inputs = stream.getStreamInputs(); for (StreamInput s : inputs) { - /* - * Copy the events - */ - Iterator> it = s.getStream() - .getEvents().entrySet().iterator(); - while (it.hasNext()) { - Entry pairs = it.next(); - Long eventNum = pairs.getKey(); - IEventDeclaration eventDec = pairs.getValue(); - getEvents(s.getStream().getId()).put(eventNum, eventDec); - } - - /* - * index the trace - */ - s.setupIndex(); + addStream(s); } } } /** * Dispose the trace - * @since 2.0 + * + * @since 3.0 */ - public void dispose() { - for (FileInputStream fis : fileInputStreams) { + @Override + public void close() { + for (FileInputStream fis : fFileInputStreams) { if (fis != null) { try { fis.close(); @@ -254,7 +245,6 @@ public class CTFTrace implements IDefinitionScope { } } } - System.gc(); // Invoke GC to release MappedByteBuffer objects (Java bug JDK-4724038) } // ------------------------------------------------------------------------ @@ -267,34 +257,25 @@ public class CTFTrace implements IDefinitionScope { * @param streamId * The ID of the stream from which to read * @return The Hash map with the event declarations + * @since 2.0 */ - public HashMap getEvents(Long streamId) { - return eventDecs.get(streamId); - } - - /** - * Gets an index for a given StreamInput - * @param id the StreamInput - * @return The index - */ - StreamInputPacketIndex getIndex(StreamInput id){ - if(! indexes.containsKey(id)){ - indexes.put(id, new StreamInputPacketIndex()); - } - return indexes.get(id); + public Map getEvents(Long streamId) { + return fStreams.get(streamId).getEvents(); } /** * Gets an event Declaration hashmap for a given StreamInput - * @param id the StreamInput - * @return the hashmap with the event definitions + * + * @param id + * the StreamInput + * @return an empty hashmap, please see deprecated * @since 2.0 + * @deprecated You should be using + * {@link StreamInputReader#getEventDefinitions()} instead. */ - public HashMap getEventDefs(StreamInput id) { - if(! eventDefs.containsKey(id)){ - eventDefs.put(id, new HashMap()); - } - return eventDefs.get(id); + @Deprecated + public Map getEventDefs(StreamInput id) { + return new HashMap<>(); } /** @@ -320,7 +301,7 @@ public class CTFTrace implements IDefinitionScope { * @since 2.0 */ public Stream getStream(Long id) { - return streams.get(id); + return fStreams.get(id); } /** @@ -329,7 +310,7 @@ public class CTFTrace implements IDefinitionScope { * @return int the number of streams */ public int nbStreams() { - return streams.size(); + return fStreams.size(); } /** @@ -339,7 +320,7 @@ public class CTFTrace implements IDefinitionScope { * long the major version */ public void setMajor(long major) { - this.major = major; + fMajor = major; } /** @@ -349,7 +330,7 @@ public class CTFTrace implements IDefinitionScope { * long the minor version */ public void setMinor(long minor) { - this.minor = minor; + fMinor = minor; } /** @@ -359,7 +340,7 @@ public class CTFTrace implements IDefinitionScope { * UUID */ public void setUUID(UUID uuid) { - this.uuid = uuid; + fUuid = uuid; } /** @@ -369,7 +350,7 @@ public class CTFTrace implements IDefinitionScope { * ByteOrder of the trace, can be little-endian or big-endian */ public void setByteOrder(ByteOrder byteOrder) { - this.byteOrder = byteOrder; + fByteOrder = byteOrder; } /** @@ -379,16 +360,17 @@ public class CTFTrace implements IDefinitionScope { * StructDeclaration the header in structdeclaration form */ public void setPacketHeader(StructDeclaration packetHeader) { - this.packetHeaderDecl = packetHeader; + fPacketHeaderDecl = packetHeader; } /** - * Method majortIsSet is the major version number set? + * Method majorIsSet is the major version number set? * * @return boolean is the major set? + * @since 3.0 */ - public boolean majortIsSet() { - return major != null; + public boolean majorIsSet() { + return fMajor != null; } /** @@ -397,16 +379,17 @@ public class CTFTrace implements IDefinitionScope { * @return boolean is the minor set? */ public boolean minorIsSet() { - return minor != null; + return fMinor != null; } /** * Method UUIDIsSet is the UUID set? * * @return boolean is the UUID set? + * @since 2.0 */ - public boolean UUIDIsSet() { - return uuid != null; + public boolean uuidIsSet() { + return fUuid != null; } /** @@ -415,7 +398,7 @@ public class CTFTrace implements IDefinitionScope { * @return boolean is the byteorder set? */ public boolean byteOrderIsSet() { - return byteOrder != null; + return fByteOrder != null; } /** @@ -424,7 +407,7 @@ public class CTFTrace implements IDefinitionScope { * @return boolean is the packet header set? */ public boolean packetHeaderIsSet() { - return packetHeaderDecl != null; + return fPacketHeaderDecl != null; } /** @@ -433,7 +416,7 @@ public class CTFTrace implements IDefinitionScope { * @return UUID gets the trace UUID */ public UUID getUUID() { - return uuid; + return fUuid; } /** @@ -442,7 +425,7 @@ public class CTFTrace implements IDefinitionScope { * @return long gets the trace major version */ public long getMajor() { - return major; + return fMajor; } /** @@ -451,7 +434,7 @@ public class CTFTrace implements IDefinitionScope { * @return long gets the trace minor version */ public long getMinor() { - return minor; + return fMinor; } /** @@ -459,8 +442,8 @@ public class CTFTrace implements IDefinitionScope { * * @return ByteOrder gets the trace byte order */ - public ByteOrder getByteOrder() { - return byteOrder; + public final ByteOrder getByteOrder() { + return fByteOrder; } /** @@ -469,7 +452,7 @@ public class CTFTrace implements IDefinitionScope { * @return StructDeclaration gets the trace packet header */ public StructDeclaration getPacketHeader() { - return packetHeaderDecl; + return fPacketHeaderDecl; } /** @@ -478,16 +461,17 @@ public class CTFTrace implements IDefinitionScope { * @return File the path in "File" format. */ public File getTraceDirectory() { - return path; + return fPath; } /** - * Method getStreams get all the streams in a map format. + * Get all the streams as an iterable. * - * @return Map a map of all the streams. + * @return Iterable<Stream> an iterable over streams. + * @since 3.0 */ - public Map getStreams() { - return streams; + public Iterable getStreams() { + return fStreams.values(); } /** @@ -498,16 +482,36 @@ public class CTFTrace implements IDefinitionScope { */ @Override public String getPath() { - return path.getPath(); + return (fPath != null) ? fPath.getPath() : ""; //$NON-NLS-1$ } // ------------------------------------------------------------------------ // Operations // ------------------------------------------------------------------------ + private void addStream(StreamInput s) { + + /* + * Copy the events + */ + Iterator> it = s.getStream() + .getEvents().entrySet().iterator(); + while (it.hasNext()) { + Entry pairs = it.next(); + Long eventNum = pairs.getKey(); + IEventDeclaration eventDec = pairs.getValue(); + getEvents(s.getStream().getId()).put(eventNum, eventDec); + } + + /* + * index the trace + */ + s.setupIndex(); + } + /** * Tries to open the given file, reads the first packet header of the file - * and check its validity. + * and check its validity. This will add a file to a stream as a streaminput * * @param streamFile * A trace file in the trace directory. @@ -515,8 +519,9 @@ public class CTFTrace implements IDefinitionScope { * Which index in the class' streamFileChannel array this file * must use * @throws CTFReaderException + * if there is a file error */ - private void openStreamInput(File streamFile) throws CTFReaderException { + private Stream openStreamInput(File streamFile) throws CTFReaderException { MappedByteBuffer byteBuffer; BitBuffer streamBitBuffer; Stream stream; @@ -527,28 +532,32 @@ public class CTFTrace implements IDefinitionScope { + streamFile.getPath()); } + FileInputStream fis = null; try { /* Open the file and get the FileChannel */ - FileInputStream fis = new FileInputStream(streamFile); - fileInputStreams.add(fis); + fis = new FileInputStream(streamFile); + fFileInputStreams.add(fis); fc = fis.getChannel(); /* Map one memory page of 4 kiB */ - byteBuffer = fc.map(MapMode.READ_ONLY, 0, 4096); + byteBuffer = fc.map(MapMode.READ_ONLY, 0, (int) Math.min(fc.size(), 4096L)); } catch (IOException e) { + if (fis != null) { + fFileInputStreams.remove(fis); + } /* Shouldn't happen at this stage if every other check passed */ - throw new CTFReaderException(); + throw new CTFReaderException(e); } /* Create a BitBuffer with this mapping and the trace byte order */ streamBitBuffer = new BitBuffer(byteBuffer, this.getByteOrder()); - if (packetHeaderDef != null) { + if (fPacketHeaderDef != null) { /* Read the packet header */ - packetHeaderDef.read(streamBitBuffer); + fPacketHeaderDef.read(streamBitBuffer); /* Check the magic number */ - IntegerDefinition magicDef = (IntegerDefinition) packetHeaderDef + IntegerDefinition magicDef = (IntegerDefinition) fPacketHeaderDef .lookupDefinition("magic"); //$NON-NLS-1$ int magic = (int) magicDef.getValue(); if (magic != Utils.CTF_MAGIC) { @@ -556,7 +565,7 @@ public class CTFTrace implements IDefinitionScope { } /* Check UUID */ - ArrayDefinition uuidDef = (ArrayDefinition) packetHeaderDef + ArrayDefinition uuidDef = (ArrayDefinition) fPacketHeaderDef .lookupDefinition("uuid"); //$NON-NLS-1$ if (uuidDef != null) { byte[] uuidArray = new byte[Utils.UUID_LEN]; @@ -569,25 +578,30 @@ public class CTFTrace implements IDefinitionScope { UUID otheruuid = Utils.makeUUID(uuidArray); - if (!this.uuid.equals(otheruuid)) { + if (!fUuid.equals(otheruuid)) { throw new CTFReaderException("UUID mismatch"); //$NON-NLS-1$ } } /* Read the stream ID */ - Definition streamIDDef = packetHeaderDef.lookupDefinition("stream_id"); //$NON-NLS-1$ + Definition streamIDDef = fPacketHeaderDef.lookupDefinition("stream_id"); //$NON-NLS-1$ - if (streamIDDef instanceof IntegerDefinition) { //this doubles as a null check + if (streamIDDef instanceof IntegerDefinition) { // this doubles as a + // null check long streamID = ((IntegerDefinition) streamIDDef).getValue(); - stream = streams.get(streamID); + stream = fStreams.get(streamID); } else { /* No stream_id in the packet header */ - stream = streams.get(null); + stream = fStreams.get(null); } } else { /* No packet header, we suppose there is only one stream */ - stream = streams.get(null); + stream = fStreams.get(null); + } + + if (stream == null) { + throw new CTFReaderException("Unexpected end of stream"); //$NON-NLS-1$ } /* Create the stream input */ @@ -595,6 +609,8 @@ public class CTFTrace implements IDefinitionScope { /* Add a reference to the streamInput in the stream */ stream.addInput(streamInput); + + return stream; } /** @@ -608,13 +624,27 @@ public class CTFTrace implements IDefinitionScope { @Override public Definition lookupDefinition(String lookupPath) { if (lookupPath.equals("trace.packet.header")) { //$NON-NLS-1$ - return packetHeaderDef; + return fPacketHeaderDef; } return null; } /** - * Adds a new stream to the trace. + * Add a new stream file to support new streams while the trace is being + * read. + * + * @param streamFile + * the file of the stream + * @throws CTFReaderException + * A stream had an issue being read + * @since 3.0 + */ + public void addStreamFile(File streamFile) throws CTFReaderException { + openStreamInput(streamFile); + } + + /** + * Registers a new stream to the trace. * * @param stream * A stream object. @@ -624,11 +654,16 @@ public class CTFTrace implements IDefinitionScope { */ public void addStream(Stream stream) throws ParseException { + /* + * Init if not done before + */ + init(); + /* * If there is already a stream without id (the null key), it must be * the only one */ - if (streams.get(null) != null) { + if (fStreams.get(null) != null) { throw new ParseException("Stream without id with multiple streams"); //$NON-NLS-1$ } @@ -636,68 +671,68 @@ public class CTFTrace implements IDefinitionScope { * If the stream we try to add has the null key, it must be the only * one. Thus, if the streams container is not empty, it is not valid. */ - if ((stream.getId() == null) && (streams.size() != 0)) { + if ((stream.getId() == null) && (fStreams.size() != 0)) { throw new ParseException("Stream without id with multiple streams"); //$NON-NLS-1$ } - /* If a stream with the same ID already exists, it is not valid. */ - if (streams.get(stream.getId()) != null) { + /* + * If a stream with the same ID already exists, it is not valid. + */ + Stream existingStream = fStreams.get(stream.getId()); + if (existingStream != null) { throw new ParseException("Stream id already exists"); //$NON-NLS-1$ } - /* It should be ok now. */ - streams.put(stream.getId(), stream); - eventDecs.put(stream.getId(), new HashMap()); + /* This stream is valid and has a unique id. */ + fStreams.put(stream.getId(), stream); } /** - * gets the Environment variables from the trace metadata (See CTF spec) - * @return the environment variables in a map form (key value) + * Gets the Environment variables from the trace metadata (See CTF spec) + * + * @return The environment variables in the form of an unmodifiable map + * (key, value) * @since 2.0 */ public Map getEnvironment() { - return environment; - } - - /** - * Look up a specific environment variable - * @param key the key to look for - * @return the value of the variable, can be null. - */ - public String lookupEnvironment(String key) { - return environment.get(key); + return Collections.unmodifiableMap(fEnvironment); } /** * Add a variable to the environment variables - * @param varName the name of the variable - * @param varValue the value of the variable + * + * @param varName + * the name of the variable + * @param varValue + * the value of the variable */ public void addEnvironmentVar(String varName, String varValue) { - environment.put(varName, varValue); + fEnvironment.put(varName, varValue); } /** * Add a clock to the clock list - * @param nameValue the name of the clock (full name with scope) - * @param ctfClock the clock + * + * @param nameValue + * the name of the clock (full name with scope) + * @param ctfClock + * the clock */ public void addClock(String nameValue, CTFClock ctfClock) { - clocks.put(nameValue, ctfClock); + fClocks.put(nameValue, ctfClock); } /** * gets the clock with a specific name - * @param name the name of the clock. + * + * @param name + * the name of the clock. * @return the clock */ public CTFClock getClock(String name) { - return clocks.get(name); + return fClocks.get(name); } - - - /** * gets the clock if there is only one. (this is 100% of the use cases as of * June 2012) @@ -705,9 +740,9 @@ public class CTFTrace implements IDefinitionScope { * @return the clock */ public final CTFClock getClock() { - if (clocks.size() == 1) { - singleClock = clocks.get(clocks.keySet().iterator().next()); - return singleClock; + if (fClocks.size() == 1) { + fSingleClock = fClocks.get(fClocks.keySet().iterator().next()); + return fSingleClock; } return null; } @@ -721,7 +756,7 @@ public class CTFTrace implements IDefinitionScope { if (getClock() == null) { return 0; } - return singleClock.getClockOffset(); + return fSingleClock.getClockOffset(); } /** @@ -729,11 +764,11 @@ public class CTFTrace implements IDefinitionScope { * * @return the time offset of a clock with respect to UTC in nanoseconds */ - private final double getTimeScale() { + private double getTimeScale() { if (getClock() == null) { return 1.0; } - return singleClock.getClockScale(); + return fSingleClock.getClockScale(); } /** @@ -741,11 +776,11 @@ public class CTFTrace implements IDefinitionScope { * * @return if the trace is in ns or cycles. */ - private final boolean clockNeedsScale() { + private boolean clockNeedsScale() { if (getClock() == null) { return false; } - return singleClock.isClockScaled(); + return fSingleClock.isClockScaled(); } /** @@ -753,11 +788,11 @@ public class CTFTrace implements IDefinitionScope { * * @return 1.0 / scale */ - private final double getInverseTimeScale() { + private double getInverseTimeScale() { if (getClock() == null) { return 1.0; } - return singleClock.getClockAntiScale(); + return fSingleClock.getClockAntiScale(); } /** @@ -798,29 +833,6 @@ public class CTFTrace implements IDefinitionScope { return retVal - getOffset(); } - /** - * Does a given stream contain any events? - * @param id the stream ID - * @return true if the stream has events. - */ - public boolean hasEvents(Long id){ - return eventDecs.containsKey(id); - } - - /** - * Add an event declaration map to the events map. - * @param id the id of a stream - * @return the hashmap containing events. - */ - public HashMap createEvents(Long id){ - HashMap value = eventDecs.get(id); - if( value == null ) { - value = new HashMap(); - eventDecs.put(id, value); - } - return value; - } - /** * Adds a callsite * @@ -839,37 +851,29 @@ public class CTFTrace implements IDefinitionScope { String fileName, long lineNumber) { final CTFCallsite cs = new CTFCallsite(eventName, funcName, ip, fileName, lineNumber); - LinkedList csl = callsitesByName.get(eventName); + TreeSet csl = fCallsitesByName.get(eventName); if (csl == null) { - csl = new LinkedList(); - callsitesByName.put(eventName, csl); + csl = new TreeSet<>(fCtfCallsiteComparator); + fCallsitesByName.put(eventName, csl); } - ListIterator iter = csl.listIterator(); - int index = 0; - for (; index < csl.size(); index++) { - if (iter.next().compareTo(cs) < 0) { - break; - } - } - - csl.add(index, cs); + csl.add(cs); - callsitesByIP.add(cs); + fCallsitesByIP.add(cs); } /** - * Gets the list of callsites associated to an event name. O(1) + * Gets the set of callsites associated to an event name. O(1) * * @param eventName * the event name - * @return the callsite list can be empty - * @since 1.2 + * @return the callsite set can be empty + * @since 3.0 */ - public List getCallsiteCandidates(String eventName) { - LinkedList retVal = callsitesByName.get(eventName); - if( retVal == null ) { - retVal = new LinkedList(); + public TreeSet getCallsiteCandidates(String eventName) { + TreeSet retVal = fCallsitesByName.get(eventName); + if (retVal == null) { + retVal = new TreeSet<>(fCtfCallsiteComparator); } return retVal; } @@ -883,9 +887,9 @@ public class CTFTrace implements IDefinitionScope { * @since 1.2 */ public CTFCallsite getCallsite(String eventName) { - LinkedList callsites = callsitesByName.get(eventName); + TreeSet callsites = fCallsitesByName.get(eventName); if (callsites != null) { - return callsites.getFirst(); + return callsites.first(); } return null; } @@ -901,7 +905,7 @@ public class CTFTrace implements IDefinitionScope { */ public CTFCallsite getCallsite(long ip) { CTFCallsite cs = new CTFCallsite(null, null, ip, null, 0L); - return callsitesByIP.ceiling(cs); + return fCallsitesByIP.ceiling(cs); } /** @@ -914,15 +918,14 @@ public class CTFTrace implements IDefinitionScope { * @return the closest matching callsite, can be null */ public CTFCallsite getCallsite(String eventName, long ip) { - final LinkedList candidates = callsitesByName.get(eventName); + final TreeSet candidates = fCallsitesByName.get(eventName); final CTFCallsite dummyCs = new CTFCallsite(null, null, ip, null, -1); - final int pos = Collections.binarySearch(candidates, dummyCs)+1; - if( pos >= candidates.size()) { - return null; + final CTFCallsite callsite = candidates.ceiling(dummyCs); + if (callsite == null) { + return candidates.floor(dummyCs); } - return candidates.get(pos); + return callsite; } - } class MetadataFileFilter implements FileFilter {