Projects >> linuxtools >>bd8ffaf6140ab67c8de94550a166a379c95e8fd7

Chunk
Conflicting content 
    /**
     * The default trace cache size
     */
<<<<<<< HEAD
    public static final int DEFAULT_TRACE_CACHE_SIZE = 1000;
=======
    public static final int DEFAULT_INDEX_PAGE_SIZE = 50000;
>>>>>>> fef460524ce8c8791c27581d3e74078dc7eec175

    // ------------------------------------------------------------------------
    // Attributes
Solution content 
    /**
     * The default trace cache size
     */
    public static final int DEFAULT_TRACE_CACHE_SIZE = 50000;

    // ------------------------------------------------------------------------
    // Attributes
File
TmfTrace.java
Developer's decision
Manual
Kind of conflict
Attribute
Chunk
Conflicting content 
            }

            // Create the experiment
<<<<<<< HEAD
            final TmfExperiment experiment = new TmfExperiment(TmfEvent.class, fExperiment.getName(), traces, cacheSize);
=======
            TmfExperiment experiment = new TmfExperiment(ITmfEvent.class, fExperiment.getName(), traces, cacheSize);
>>>>>>> fef460524ce8c8791c27581d3e74078dc7eec175
            experiment.setBookmarksFile(file);

            if (useEditor) {
Solution content 
            }

            // Create the experiment
            final TmfExperiment experiment = new TmfExperiment(ITmfEvent.class, fExperiment.getName(), traces, cacheSize);
            experiment.setBookmarksFile(file);

            if (useEditor) {
File
OpenExperimentHandler.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
                                cacheSize = Math.min(cacheSize, trace.getCacheSize());
                                traces[i] = trace;
                            }
<<<<<<< HEAD
                            final TmfExperiment experiment = new TmfExperiment(TmfEvent.class, experimentElement.getName(), traces, cacheSize);
=======
                            TmfExperiment experiment = new TmfExperiment(ITmfEvent.class, experimentElement.getName(), traces, cacheSize);
>>>>>>> fef460524ce8c8791c27581d3e74078dc7eec175
                            experiment.setBookmarksFile(fFile);
                            fTrace = experiment;
                            TmfExperiment.setCurrentExperiment(experiment);
Solution content 
                                cacheSize = Math.min(cacheSize, trace.getCacheSize());
                                traces[i] = trace;
                            }
                            final TmfExperiment experiment = new TmfExperiment(ITmfEvent.class, experimentElement.getName(), traces, cacheSize);
                            experiment.setBookmarksFile(fFile);
                            fTrace = experiment;
                            TmfExperiment.setCurrentExperiment(experiment);
File
EventsViewEditor.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
                                cacheSize = Math.min(cacheSize, trace.getCacheSize());
                                traces[i] = trace;
                            }
<<<<<<< HEAD
                            final TmfExperiment experiment = new TmfExperiment(TmfEvent.class, experimentElement.getName(), traces, cacheSize);
=======
                            TmfExperiment experiment = new TmfExperiment(ITmfEvent.class, experimentElement.getName(), traces, cacheSize);
>>>>>>> fef460524ce8c8791c27581d3e74078dc7eec175
                            experiment.setBookmarksFile(fFile);
                            fTrace = experiment;
                            experiment.initTrace(null, null, null);
Solution content 
                                cacheSize = Math.min(cacheSize, trace.getCacheSize());
                                traces[i] = trace;
                            }
                            final TmfExperiment experiment = new TmfExperiment(ITmfEvent.class, experimentElement.getName(), traces, cacheSize);
                            experiment.setBookmarksFile(fFile);
                            fTrace = experiment;
                            experiment.initTrace(null, null, null);
File
TmfEventsEditor.java
Developer's decision
Manual
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
                    for (final IConfigurationElement ce : TmfTraceType.getTypeElements())
                        if (traceTypeId.equals(ce.getAttribute(TmfTraceType.ID_ATTR))) {
                            fTrace = (ITmfTrace) ce.createExecutableExtension(TmfTraceType.TRACE_TYPE_ATTR);
<<<<<<< HEAD
                            final TmfEvent event = (TmfEvent) ce.createExecutableExtension(TmfTraceType.EVENT_TYPE_ATTR);
                            final String path = fFile.getLocationURI().getPath();
                            fTrace.initTrace(null, path, event.getClass());
=======
                            ITmfEvent event = (TmfEvent) ce.createExecutableExtension(TmfTraceType.EVENT_TYPE_ATTR);
                            String path = fFile.getLocationURI().getPath();
                            fTrace.initTrace(name, path, event.getClass());
                            fTrace.indexTrace(false);
>>>>>>> fef460524ce8c8791c27581d3e74078dc7eec175
                            break;
                        }
            } catch (final InvalidRegistryObjectException e) {
Solution content 
                    for (final IConfigurationElement ce : TmfTraceType.getTypeElements())
                        if (traceTypeId.equals(ce.getAttribute(TmfTraceType.ID_ATTR))) {
                            fTrace = (ITmfTrace) ce.createExecutableExtension(TmfTraceType.TRACE_TYPE_ATTR);
                            final ITmfEvent event = (TmfEvent) ce.createExecutableExtension(TmfTraceType.EVENT_TYPE_ATTR);
                            final String path = fFile.getLocationURI().getPath();
                            fTrace.initTrace(null, path, event.getClass());
                            break;
                        }
            } catch (final InvalidRegistryObjectException e) {
File
TmfEventsEditor.java
Developer's decision
Manual
Kind of conflict
Cast expression
Method invocation
Variable
Chunk
Conflicting content 
            final int nbRequested = (int) (fTrace.getNbEvents() - fFilterCheckCount);
            if (nbRequested <= 0)
                return;
<<<<<<< HEAD
            request = new TmfEventRequest(TmfEvent.class, TmfTimeRange.ETERNITY, (int) fFilterCheckCount,
                    nbRequested, fTrace.getCacheSize(), ExecutionType.BACKGROUND) {
                @Override
                public void handleData(final TmfEvent event) {
=======
            }
            request = new TmfEventRequest(ITmfEvent.class, TmfTimeRange.ETERNITY, (int) fFilterCheckCount,
                    nbRequested, fTrace.getIndexPageSize(), ExecutionType.BACKGROUND) {
                @Override
                public void handleData(ITmfEvent event) {
>>>>>>> fef460524ce8c8791c27581d3e74078dc7eec175
                    super.handleData(event);
                    if (request.isCancelled())
                        return;
Solution content 
            final int nbRequested = (int) (fTrace.getNbEvents() - fFilterCheckCount);
            if (nbRequested <= 0)
                return;
            request = new TmfEventRequest(ITmfEvent.class, TmfTimeRange.ETERNITY, (int) fFilterCheckCount,
                    nbRequested, fTrace.getCacheSize(), ExecutionType.BACKGROUND) {
                @Override
                public void handleData(final ITmfEvent event) {
                    super.handleData(event);
                    if (request.isCancelled())
                        return;
File
TmfEventsTable.java
Developer's decision
Manual
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
            boolean wrapped = false;
            while (!monitor.isCanceled() && (foundRank == -1) && (fTrace != null)) {
                int nbRequested = (direction == Direction.FORWARD ? Integer.MAX_VALUE : Math.min((int) rank + 1,
<<<<<<< HEAD
                        fTrace.getCacheSize()));
                if (direction == Direction.BACKWARD)
                    rank = Math.max(0, rank - fTrace.getCacheSize() + 1);
                request = new TmfDataRequest(TmfEvent.class, (int) rank, nbRequested) {
                    long currentRank = rank;

                    @Override
                    public void handleData(final TmfEvent event) {
=======
                        fTrace.getIndexPageSize()));
                if (direction == Direction.BACKWARD) {
                    rank = Math.max(0, rank - fTrace.getIndexPageSize() + 1);

                }
                request = new TmfDataRequest(ITmfEvent.class, (int) rank, nbRequested) {
                    long currentRank = rank;

                    @Override
                    public void handleData(ITmfEvent event) {
>>>>>>> fef460524ce8c8791c27581d3e74078dc7eec175
                        super.handleData(event);
                        if (searchFilter.matches(event) && ((eventFilter == null) || eventFilter.matches(event))) {
                            foundRank = currentRank;
Solution content 
            boolean wrapped = false;
            while (!monitor.isCanceled() && (foundRank == -1) && (fTrace != null)) {
                int nbRequested = (direction == Direction.FORWARD ? Integer.MAX_VALUE : Math.min((int) rank + 1, fTrace.getCacheSize()));
                if (direction == Direction.BACKWARD) {
                    rank = Math.max(0, rank - fTrace.getCacheSize() + 1);
                }
                request = new TmfDataRequest(ITmfEvent.class, (int) rank, nbRequested) {
                    long currentRank = rank;

                    @Override
                    public void handleData(final ITmfEvent event) {
                        super.handleData(event);
                        if (searchFilter.matches(event) && ((eventFilter == null) || eventFilter.matches(event))) {
                            foundRank = currentRank;
File
TmfEventsTable.java
Developer's decision
Manual
Kind of conflict
Attribute
If statement
Method invocation
Chunk
Conflicting content 
                TmfTimestamp ts = new TmfTimestamp(signal.getCurrentTime());

                @Override
<<<<<<< HEAD
                public void handleData(final TmfEvent event) {
=======
                public void handleData(ITmfEvent event) {
>>>>>>> fef460524ce8c8791c27581d3e74078dc7eec175
                    super.handleData(event);
                }
Solution content 
                TmfTimestamp ts = new TmfTimestamp(signal.getCurrentTime());

                @Override
                public void handleData(final ITmfEvent event) {
                    super.handleData(event);
                }
File
TmfEventsTable.java
Developer's decision
Manual
Kind of conflict
Method signature