Attachment #145578 for bug #287562

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 5-10 Link Here

(-)META-INF/MANIFEST.MF (-3 / +2 lines)
5	Bundle-Version: 0.0.1	5	Bundle-Version: 0.0.1
6	Bundle-RequiredExecutionEnvironment: J2SE-1.5	6	Bundle-RequiredExecutionEnvironment: J2SE-1.5
7	Bundle-Vendor: Eclipse	7	Bundle-Vendor: Eclipse
8	Require-Bundle: org.junit4;bundle-version="4.5.0"	8	Require-Bundle: org.junit4;bundle-version="4.5.0",
9	Import-Package: org.eclipse.linuxtools.tmf.event,	9	org.eclipse.linuxtools.tmf;bundle-version="0.0.1"
10	org.eclipse.linuxtools.tmf.eventlog




import java.util.Vector;

import org.eclipse.linuxtools.tmf.event.TmfEvent;
import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
import org.junit.BeforeClass;
import org.junit.Test;


    @Test
    public void testConstructorForRange() throws Exception {
        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
        TmfEventRequest request = new TmfEventRequest(range, 0, -1, 1);

        assertEquals("StartTime", TmfTimestamp.BigBang,   request.getRange().getStartTime());


    @Test
    public void testConstructorForNbEvents() throws Exception {
        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
        TmfEventRequest request = new TmfEventRequest(range, 0, 10, 1);

        assertEquals("StartTime", TmfTimestamp.BigBang,   request.getRange().getStartTime());


    @Test
    public void testConstructorWithOffset() throws Exception {
        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
        TmfEventRequest request = new TmfEventRequest(range, 5, 10, 1);

        assertEquals("StartTime", TmfTimestamp.BigBang,   request.getRange().getStartTime());


    @Test
    public void testConstructorWithNegativeOffset() throws Exception {
        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
        TmfEventRequest request = new TmfEventRequest(range, -5, 10, 1);

        assertEquals("StartTime", TmfTimestamp.BigBang,   request.getRange().getStartTime());

        final int BLOCK_SIZE = 100;
        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();

        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
        final TmfEventRequest request = new TmfEventRequest(range, 0, NB_EVENTS, BLOCK_SIZE) {
            @Override
            public void newEvents(Vector<TmfEvent> events) {

        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();
        int nbExpectedEvents = TmfRequestHandlerStub.MAX_GENERATED_EVENTS;

        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
        final TmfEventRequest request = new TmfEventRequest(range, 0, NB_EVENTS, BLOCK_SIZE) {
            @Override
            public void newEvents(Vector<TmfEvent> events) {

        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();
        int nbExpectedEvents = TmfRequestHandlerStub.MAX_GENERATED_EVENTS;

        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
        final TmfEventRequest request = new TmfEventRequest(range, OFFSET, NB_EVENTS, BLOCK_SIZE) {
            @Override
            public void newEvents(Vector<TmfEvent> events) {

        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();
        int nbExpectedEvents = TmfRequestHandlerStub.MAX_GENERATED_EVENTS;

        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
        final TmfEventRequest request = new TmfEventRequest(range, OFFSET, NB_EVENTS, BLOCK_SIZE) {
            @Override
            public void newEvents(Vector<TmfEvent> events) {

        final int BLOCK_SIZE = 100;
        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();

        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
        final TmfEventRequest request = new TmfEventRequest(range, 0, NB_EVENTS, BLOCK_SIZE) {
            @Override
            public void newEvents(Vector<TmfEvent> events) {




import java.util.Vector;

import org.eclipse.linuxtools.tmf.event.TmfEvent;
import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
import org.junit.BeforeClass;
import org.junit.Test;

        assertEquals("GetEpoch", TmfTimestamp.BigBang, eventLog.getEpoch());
        assertEquals("GetNbEvents", fTotalNbEvents, eventLog.getNbEvents());

        TmfTimeRange timeRange = eventLog.getTimeRange();
        assertEquals("GetTimeRange", 0, timeRange.getStartTime().getValue());
        assertEquals("GetTimeRange", fTotalNbEvents - 1, timeRange.getEndTime().getValue());
	}

        assertEquals("GetEpoch", epoch, eventLog.getEpoch());
        assertEquals("GetNbEvents", fTotalNbEvents, eventLog.getNbEvents());

        TmfTimeRange timeRange = eventLog.getTimeRange();
        assertEquals("GetTimeRange", 0, timeRange.getStartTime().getValue());
        assertEquals("GetTimeRange", fTotalNbEvents - 1, timeRange.getEndTime().getValue());
	}

        final int BLOCK_SIZE = 100;
        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();

        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
        final TmfEventRequest request = new TmfEventRequest(range, 0, NB_EVENTS, BLOCK_SIZE) {
            @Override
            public void newEvents(Vector<TmfEvent> events) {

        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();
        int nbExpectedEvents = eventLog.getNbEvents();

        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
        final TmfEventRequest request = new TmfEventRequest(range, 0, NB_EVENTS, BLOCK_SIZE) {
            @Override
            public void newEvents(Vector<TmfEvent> events) {

        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();
        int nbExpectedEvents = TmfRequestHandlerStub.MAX_GENERATED_EVENTS;

        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
        final TmfEventRequest request = new TmfEventRequest(range, OFFSET, NB_EVENTS, BLOCK_SIZE) {
            @Override
            public void newEvents(Vector<TmfEvent> events) {

        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();
        int nbExpectedEvents = TmfRequestHandlerStub.MAX_GENERATED_EVENTS;

        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
        final TmfEventRequest request = new TmfEventRequest(range, OFFSET, NB_EVENTS, BLOCK_SIZE) {
            @Override
            public void newEvents(Vector<TmfEvent> events) {

        final int BLOCK_SIZE = 100;
        final Vector<TmfEvent> requestedEvents = new Vector<TmfEvent>();

        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
        final TmfEventRequest request = new TmfEventRequest(range, 0, NB_EVENTS, BLOCK_SIZE) {
            @Override
            public void newEvents(Vector<TmfEvent> events) {

Lines 19-25 Link Here

(-)src/org/eclipse/linuxtools/tmf/event/TmfEventTypeTest.java (-1 / +1 lines)
19	/**	19	/**
20	* <b><u>TmfEventTypeTest</u></b>	20	* <b><u>TmfEventTypeTest</u></b>
21	* <p>	21	* <p>
22	* TODO: Implement me. Please.	22	* JUnit test suite for the TmfEventType class.
23	*/	23	*/
24	public class TmfEventTypeTest {	24	public class TmfEventTypeTest {
25		25




 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *   Francois Chouinard - Initial API and implementation
 *******************************************************************************/

package org.eclipse.linuxtools.tmf.event;

/**
 * <b><u>TmfTimestampTest</u></b>
 * <p>
 * JUnit test suite for the TmfTimestamp class.
 */
public class TmfTimestampTest {



    @Test
    public void testSimpleConstructor() throws Exception {
        TmfTimestamp ts = new TmfTimestamp(12345);
        assertEquals("getValue", 12345, ts.getValue());
        assertEquals("getscale",     0, ts.getScale());
        assertEquals("getPrecision", 0, ts.getPrecision());
    }

    @Test
    public void testSimpleConstructor2() throws Exception {
        TmfTimestamp ts = new TmfTimestamp(12345, (byte) -1);
        assertEquals("getValue", 12345, ts.getValue());
        assertEquals("getscale",    -1, ts.getScale());

Lines 7-13 Link Here

(-)src/org/eclipse/linuxtools/tmf/event/TmfEventFormatTest.java (-2 / +2 lines)
7	* http://www.eclipse.org/legal/epl-v10.html	7	* http://www.eclipse.org/legal/epl-v10.html
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* Francois Chouinard (fchouinard@gmail.com) - Initial API and implementation	10	* Francois Chouinard - Initial API and implementation
11	*******************************************************************************/	11	*******************************************************************************/
12		12
13	package org.eclipse.linuxtools.tmf.event;	13	package org.eclipse.linuxtools.tmf.event;
Lines 19-25 Link Here
19	/**	19	/**
20	* <b><u>TmfEventFormatTest</u></b>	20	* <b><u>TmfEventFormatTest</u></b>
21	* <p>	21	* <p>
22	* TODO: Implement me. Please.	22	* JUnit test suite for the TmfEventFormat class.
23	*/	23	*/
24	public class TmfEventFormatTest {	24	public class TmfEventFormatTest {
25		25




 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *   Francois Chouinard - Initial API and implementation
 *******************************************************************************/


package org.eclipse.linuxtools.tmf.event;

import static org.junit.Assert.assertEquals;

/**
 * <b><u>TmfTraceEventTest</u></b>
 * <p>
 * JUnit test suite for the TmfTraceEvent class.
 */
public class TmfTraceEventTest {





 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *   Francois Chouinard - Initial API and implementation
 *******************************************************************************/

package org.eclipse.linuxtools.tmf.event;

/**
 * <b><u>TmfEventContentTest</u></b>
 * <p>
 * JUnit test suite for the TmfEventContent class.
 */
public class TmfEventContentTest {



	@Test
	public void testTmfEventContent() {
		TmfEventContent content = new TmfEventContent("Some content", new TmfEventFormat());
				new TmfEventFormat());
		assertEquals("getFormat", 1, content.getFormat().getLabels().length);
		assertEquals("getLabels", "Content", content.getFormat().getLabels()[0]);
		assertEquals("getContent", "Some content", content.getContent());


	@Test
	public void testBasicGetField() {
		TmfEventContent content = new TmfEventContent("Some content", new TmfEventFormat());
				new TmfEventFormat());
		assertEquals("getField", 1, content.getFields().length);
		assertEquals("getField", "Some content", content.getField(0).toString());
	}

		assertEquals("getField", "-10", content.getField(1).toString());
		assertEquals("getField", "true", content.getField(2).toString());
		assertEquals("getField", "some string", content.getField(3).toString());
		assertEquals("getField", "[TmfTimestamp:1,2,3]", content.getField(4).toString());
				.toString());
	}

}




 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *   Francois Chouinard - Initial API and implementation
 *******************************************************************************/

package org.eclipse.linuxtools.tmf.event;

/**
 * <b><u>TmfEventTest</u></b>
 * <p>
 * JUNit test suite for the TmfEvent class.
 */
public class TmfEventTest {


        TmfEvent event = new TmfEvent(timestamp, source, type, content, reference);

        // Check the event timestamp
        TmfTimestamp ts = event.getTimestamp();
        assertEquals("getValue", 12345, ts.getValue());
        assertEquals("getscale",     2, ts.getScale());
        assertEquals("getPrecision", 5, ts.getPrecision());

        // Check the original event timestamp
        ts = event.getOriginalTimestamp();
        assertEquals("getValue", 12345, ts.getValue());
        assertEquals("getscale",     2, ts.getScale());
        assertEquals("getPrecision", 5, ts.getPrecision());

        // Check the event source
        TmfEventSource src = event.getSource();
        assertEquals("getValue", "Source", src.getSourceId());

        // Check the event type
        TmfEventType tp = event.getType();
        assertEquals("getValue", "Type", tp.getTypeId());
        assertEquals("getFormat", "field1", tp.getFormat().getLabels()[0]);
        assertEquals("getFormat", "field2", tp.getFormat().getLabels()[1]);

        // Check the event content
        TmfEventContent cnt = event.getContent();
        assertEquals("getField", 1, cnt.getFields().length);
        assertEquals("getField", "Some content", cnt.getField(0).toString());

        // Check the event reference
        TmfEventReference ref = event.getReference();
        assertEquals("getValue", "Reference", ref.getValue());
    }

    @Test
    public void testTmfEvent2() {
        TmfTimestamp      original  = new TmfTimestamp(12345, (byte) 2, 5);
        TmfTimestamp      effective = new TmfTimestamp(12350, (byte) 2, 5);
        TmfEventSource    source    = new TmfEventSource("Source");
        TmfEventFormat    format    = new TmfEventFormat(new String[] { "field1", "field2" });
        TmfEventType      type      = new TmfEventType("Type", format);
        TmfEventContent   content   = new TmfEventContent("Some content", format);
        TmfEventReference reference = new TmfEventReference("Reference");

        // Create the event
        TmfEvent event = new TmfEvent(original, effective, source, type, content, reference);

        // Check the event timestamp
        TmfTimestamp ts = event.getTimestamp();
        assertEquals("getValue", 12350, ts.getValue());
        assertEquals("getscale",     2, ts.getScale());
        assertEquals("getPrecision", 5, ts.getPrecision());

        // Check the original event timestamp
        ts = event.getOriginalTimestamp();
        assertEquals("getValue", 12345, ts.getValue());
        assertEquals("getscale",     2, ts.getScale());
        assertEquals("getPrecision", 5, ts.getPrecision());

        // Check the event source
        TmfEventSource src = event.getSource();
        assertEquals("getValue", "Source", src.getSourceId());

        // Check the event type
        TmfEventType tp = event.getType();
        assertEquals("getValue", "Type", tp.getTypeId());
        assertEquals("getFormat", "field1", tp.getFormat().getLabels()[0]);
        assertEquals("getFormat", "field2", tp.getFormat().getLabels()[1]);

        // Check the event content
        TmfEventContent cnt = event.getContent();
        assertEquals("getField", 1, cnt.getFields().length);
        assertEquals("getField", "Some content", cnt.getField(0).toString());

        // Check the event reference
        TmfEventReference ref = event.getReference();
        assertEquals("getValue", "Reference", ref.getValue());
    }

}




/*******************************************************************************
 * Copyright (c) 2009 Ericsson
 * 
 * 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:
 *   Francois Chouinard - Initial API and implementation
 *******************************************************************************/

package org.eclipse.linuxtools.tmf.event;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;

import org.junit.Test;

/**
 * <b><u>TmfTimeRangeTest</u></b>
 * <p>
 * JUnit test suite for the TmfTimeRange class.
 */
public class TmfTimeRangeTest {

    // ========================================================================
    // Constructors
    // ========================================================================

    @Test
    public void testConstructor() throws Exception {
        TmfTimestamp ts1   = new TmfTimestamp(12345);
        TmfTimestamp ts2   = new TmfTimestamp(12350);
        TmfTimeRange range = new TmfTimeRange(ts1, ts2);
        assertEquals("startTime", ts1, range.getStartTime());
        assertEquals("endTime",   ts2, range.getEndTime());
    }

    @Test
    public void testOpenRange1() throws Exception {
        TmfTimestamp ts2    = new TmfTimestamp(12350);
        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, ts2);
        assertEquals("startTime", TmfTimestamp.BigBang, range.getStartTime());
        assertEquals("endTime",   ts2, range.getEndTime());
    }

    @Test
    public void testOpenRange2() throws Exception {
        TmfTimestamp ts1   = new TmfTimestamp(12345);
        TmfTimeRange range = new TmfTimeRange(ts1, TmfTimestamp.BigCrunch);
        assertEquals("startTime", ts1, range.getStartTime());
        assertEquals("endTime",   TmfTimestamp.BigCrunch, range.getEndTime());
    }

    @Test
    public void testOpenRange3() throws Exception {
        TmfTimeRange range = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigCrunch);
        assertEquals("startTime", TmfTimestamp.BigBang,   range.getStartTime());
        assertEquals("endTime",   TmfTimestamp.BigCrunch, range.getEndTime());
    }

    // ========================================================================
    // Constructors
    // ========================================================================

    @Test
    public void testContains() throws Exception {
        TmfTimestamp ts1   = new TmfTimestamp(12345);
        TmfTimestamp ts2   = new TmfTimestamp(12350);
        TmfTimeRange range = new TmfTimeRange(ts1, ts2);

        assertTrue("contains (lower bound)",   range.contains(new TmfTimestamp(12345)));
        assertTrue("contains (higher bound)",  range.contains(new TmfTimestamp(12350)));
        assertTrue("contains (within bounds)", range.contains(new TmfTimestamp(12346)));

        assertFalse("contains (low value)",   range.contains(new TmfTimestamp(12340)));
        assertFalse("contains (high value)",  range.contains(new TmfTimestamp(12351)));
    }

}

Lines 7-13 Link Here

(-)src/org/eclipse/linuxtools/tmf/event/AllEventTests.java (-1 / +2 lines)
7	* http://www.eclipse.org/legal/epl-v10.html	7	* http://www.eclipse.org/legal/epl-v10.html
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* Francois Chouinard (fchouinard@gmail.com) - Initial API and implementation	10	* Francois Chouinard - Initial API and implementation
11	*******************************************************************************/	11	*******************************************************************************/
12		12
13	package org.eclipse.linuxtools.tmf.event;	13	package org.eclipse.linuxtools.tmf.event;
Lines 18-23 Link Here
18	@RunWith(Suite.class)	18	@RunWith(Suite.class)
19	@Suite.SuiteClasses({	19	@Suite.SuiteClasses({
20	TmfTimestampTest.class,	20	TmfTimestampTest.class,
		21	TmfTimeRangeTest.class,
21	TmfEventTypeTest.class,	22	TmfEventTypeTest.class,
22	TmfEventFormatTest.class,	23	TmfEventFormatTest.class,
23	TmfEventContentTest.class,	24	TmfEventContentTest.class,

Lines 7-13 Link Here

(-)src/org/eclipse/linuxtools/tmf/event/TmfEventType.java (-1 / +10 lines)
7	* http://www.eclipse.org/legal/epl-v10.html	7	* http://www.eclipse.org/legal/epl-v10.html
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* Francois Chouinard (fchouinard@gmail.com) - Initial API and implementation	10	* Francois Chouinard - Initial API and implementation
11	*******************************************************************************/	11	*******************************************************************************/
12		12
13	package org.eclipse.linuxtools.tmf.event;	13	package org.eclipse.linuxtools.tmf.event;
Lines 57-60 Link Here
57	return fFormat;	57	return fFormat;
58	}	58	}
59		59
		60	// ========================================================================
		61	// Operators
		62	// ========================================================================
		63
		64	@Override
		65	public String toString() {
		66	return fTypeId.toString();
		67	}
		68
60	}	69	}

Lines 7-13 Link Here

(-)src/org/eclipse/linuxtools/tmf/event/ITmfContentParser.java (-1 / +1 lines)
7	* http://www.eclipse.org/legal/epl-v10.html	7	* http://www.eclipse.org/legal/epl-v10.html
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* Francois Chouinard (fchouinard@gmail.com) - Initial API and implementation	10	* Francois Chouinard - Initial API and implementation
11	*******************************************************************************/	11	*******************************************************************************/
12		12
13	package org.eclipse.linuxtools.tmf.event;	13	package org.eclipse.linuxtools.tmf.event;




 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *   Francois Chouinard - Initial API and implementation
 *******************************************************************************/

package org.eclipse.linuxtools.tmf.event;

 * <p>
 * It provides a generic timestamp implementation in its most basic form:
 * <ul>
 * <li>an unstructured integer value
 * <li>a time scale corresponding to the magnitude of the value wrt some
 * application-specific base unit (e.g. the second)
 * <li>a precision to indicate the error on the value (useful for comparing
 * timestamps in different scales). Default: 0.
 * </ul>
 * To allow synchronization of timestamps from different reference clocks, there
 * is a possibility to "adjust" the timestamp both by changing its scale (traces
 * of different scale) and by adding an offset to its value (clock drift between
 * traces).
 * <p>
 * Note that the adjusted timestamp value could be negative e.g. for events that
 * occurred before t0 of the reference clock.
 * 
 */
public class TmfTimestamp {


    // Attributes
    // ========================================================================

    protected final long fValue; // The timestamp value
    protected final byte fScale; // The time scale
    protected final long fPrecision; // The value precision (tolerance)

    // ========================================================================
    // Constants
    // ========================================================================

    // The beginning and end of time
    public static final TmfTimestamp BigBang = new TmfTimestamp(0, (byte) 0, 0);
    public static final TmfTimestamp BigCrunch = new TmfTimestamp(Long.MAX_VALUE, Byte.MAX_VALUE, 0);

    // ========================================================================

    // ========================================================================

    /**
     * Default constructor.
     */
    public TmfTimestamp() {
        this(0, (byte) 0, 0);
    }

    /**
     * Simple constructor.
     */
    public TmfTimestamp(long value) {
        this(value, (byte) 0, 0);
    }

    /**
     * Simple constructor with default error value
     * 
     * @param value
     * @param scale
     */
    public TmfTimestamp(long value, byte scale) {
        this(value, scale, 0);

    /**
     * Constructor with measurement error.
     * 
     * @param value
     * @param scale
     * @param precision
     */
    public TmfTimestamp(long value, byte scale, long precision) {
        fValue = value;

    /**
     * Copy constructor.
     * 
     * @param other
     */
    public TmfTimestamp(TmfTimestamp other) {
        this(other.fValue, other.fScale, other.fPrecision);

    // Operators
    // ========================================================================

    @Override
    public String toString() {
        return "[TmfTimestamp:" + fValue + "," + fScale + "," + fPrecision + "]";
    }

    /**
     * Return a shifted and scaled timestamp.
     * 

     * meaning beyond that scale difference and it's not even worth the trouble
     * to switch to BigDecimal arithmetics.
     * 
     * @param offset
     *            - the shift value (in the same scale as newScale)
     * @param newScale
     *            - the new scale
     * @return The synchronized timestamp
     */

    /*

     * difference in scale exceeds that value.
     */
    private static int MAX_SCALING = 19;

    public TmfTimestamp synchronize(long offset, byte newScale) throws ArithmeticException {
        long newValue = fValue;
        long newPrecision = fPrecision;

            if (scaleDiff > MAX_SCALING) {
                throw new ArithmeticException("Scaling exception");
            }
            // Not pretty...
            long scalingFactor = 1;
            for (int i = 0; i < scaleDiff; i++) {
                scalingFactor *= 10;
            }
            if (newScale < fScale) {


    /**
     * Compute the adjustment, in the reference scale, needed to synchronize
     * this timestamp with a reference timestamp.
     * 
     * @param reference
     *            - the reference timestamp to synchronize with
     * @return The adjustment term in the reference time scale
     * @throws TmfNumericalException
     */

    /**
     * Compare with another timestamp
     * 
     * @param other
     *            - the other timestamp
     * @param withinPrecision
     *            - indicates if precision is to be take into consideration
     * @return <li>-1: this timestamp is lower <li>0: timestamps are equal
     *         (within precision if requested) <li>1: this timestamp is higher
     * @throws TmfNumericalException
     */
    public int compareTo(final TmfTimestamp other, boolean withinPrecision) {

                    return 1;
                return 0;
            }
            return (fValue == other.fValue) ? 0 : (fValue < other.fValue) ? -1
                    : 1;
        }

        // If values have different time scales, adjust to the finest one and

            return ts1.compareTo(ts2, withinPrecision);
        } catch (ArithmeticException e) {
            if ((fValue == 0) || (other.fValue == 0)) {
                return (fValue == other.fValue) ? 0
                        : (fValue < other.fValue) ? -1 : 1;
            }
            if ((fValue > 0) && (other.fValue > 0)) {
                return (fScale < other.fScale) ? -1 : 1;

        }
    }

    /*
     * (non-Javadoc)
     * 
     * @see java.lang.Object#equals(java.lang.Object)
     */
    @Override

        return super.equals(other);
    }

    /* (non-Javadoc)
     * @see java.lang.Object#toString()
     */
    @Override
    public String toString() {
    	return "[TmfTimestamp:" + fValue + "," + fScale + "," + fPrecision + "]";
    }

}

Lines 7-13 Link Here

(-)src/org/eclipse/linuxtools/tmf/event/TmfEventField.java (-1 / +2 lines)
7	* http://www.eclipse.org/legal/epl-v10.html	7	* http://www.eclipse.org/legal/epl-v10.html
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* Francois Chouinard (fchouinard@gmail.com) - Initial API and implementation	10	* Francois Chouinard - Initial API and implementation
11	*******************************************************************************/	11	*******************************************************************************/
12		12
13	package org.eclipse.linuxtools.tmf.event;	13	package org.eclipse.linuxtools.tmf.event;
Lines 57-60 Link Here
57	public String toString() {	57	public String toString() {
58	return fValue.toString();	58	return fValue.toString();
59	}	59	}
		60
60	}	61	}

Lines 7-13 Link Here

(-)src/org/eclipse/linuxtools/tmf/event/TmfEventSource.java (-1 / +11 lines)
7	* http://www.eclipse.org/legal/epl-v10.html	7	* http://www.eclipse.org/legal/epl-v10.html
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* Francois Chouinard (fchouinard@gmail.com) - Initial API and implementation	10	* Francois Chouinard - Initial API and implementation
11	*******************************************************************************/	11	*******************************************************************************/
12		12
13	package org.eclipse.linuxtools.tmf.event;	13	package org.eclipse.linuxtools.tmf.event;
Lines 53-56 Link Here
53	public Object getSourceId() {	53	public Object getSourceId() {
54	return fSourceId;	54	return fSourceId;
55	}	55	}
		56
		57	// ========================================================================
		58	// Operators
		59	// ========================================================================
		60
		61	@Override
		62	public String toString() {
		63	return fSourceId.toString();
		64	}
		65
56	}	66	}




 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *   Francois Chouinard - Initial API and implementation
 *******************************************************************************/

package org.eclipse.linuxtools.tmf.event;

 * <p>
 * A utility class to define time ranges.
 */
public class TmfTimeRange {

    // ========================================================================
    // Attributes

	 * @param startTime
	 * @param endTime
	 */
	public TmfTimeRange(TmfTimestamp startTime, TmfTimestamp endTime) {
		fStartTime = startTime;
		fEndTime   = endTime;
	}

	public TmfTimestamp getEndTime() {
		return fEndTime;
	}

    // ========================================================================
    // Predicates
    // ========================================================================

	/**
	 * Check if the timestamp is within the time range
	 * 
	 * @param ts
	 * @return
	 */
	public boolean contains(TmfTimestamp ts) {
		boolean result = (fStartTime.compareTo(ts, true) <= 0) && (fEndTime.compareTo(ts, true) >= 0);
		return result;
	}

}

Lines 7-13 Link Here

(-)src/org/eclipse/linuxtools/tmf/event/TmfEventContent.java (-1 / +1 lines)
7	* http://www.eclipse.org/legal/epl-v10.html	7	* http://www.eclipse.org/legal/epl-v10.html
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* Francois Chouinard (fchouinard@gmail.com) - Initial API and implementation	10	* Francois Chouinard - Initial API and implementation
11	*******************************************************************************/	11	*******************************************************************************/
12		12
13	package org.eclipse.linuxtools.tmf.event;	13	package org.eclipse.linuxtools.tmf.event;

Lines 1-59 Link Here

(-)src/org/eclipse/linuxtools/tmf/event/TmfTimeWindow.java (-59 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 Ericsson
3	*
4	* All rights reserved. This program and the accompanying materials are
5	* made available under the terms of the Eclipse Public License v1.0 which
6	* accompanies this distribution, and is available at
7	* http://www.eclipse.org/legal/epl-v10.html
8	*
9	* Contributors:
10	* Francois Chouinard (fchouinard@gmail.com) - Initial API and implementation
11	*******************************************************************************/
12
13	package org.eclipse.linuxtools.tmf.event;
14
15	/**
16	* <b><u>TmfTimeWindow</u></b>
17	* <p>
18	* A utility class to define time ranges.
19	*/
20	public class TmfTimeWindow {
21
22	// ========================================================================
23	// Attributes
24	// ========================================================================
25
26	private final TmfTimestamp fStartTime;
27	private final TmfTimestamp fEndTime;
28
29	// ========================================================================
30	// Constructors
31	// ========================================================================
32
33	/**
34	* @param startTime
35	* @param endTime
36	*/
37	public TmfTimeWindow(TmfTimestamp startTime, TmfTimestamp endTime) {
38	fStartTime = startTime;
39	fEndTime = endTime;
40	}
41
42	// ========================================================================
43	// Accessors
44	// ========================================================================
45
46	/**
47	* @return The time range start time
48	*/
49	public TmfTimestamp getStartTime() {
50	return fStartTime;
51	}
52
53	/**
54	* @return The time range end time
55	*/
56	public TmfTimestamp getEndTime() {
57	return fEndTime;
58	}
59	}




 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *   Francois Chouinard - Initial API and implementation
 *******************************************************************************/

package org.eclipse.linuxtools.tmf.event;

	 * @param content
	 * @param reference
	 */
	public TmfTraceEvent(TmfTimestamp originalTS, TmfTimestamp effectiveTS, TmfEventSource source,
			TmfEventType type, TmfEventContent content, TmfEventReference reference,
			String path, String file, int line)
	{
		super(originalTS, effectiveTS, source, type,content, reference);
		fSourcePath = path;
		fFileName = file;
		fLineNumber = line;
	}

	/**
	 * The constructor.
	 * 
	 * @param timestamp
	 * @param source
	 * @param type
	 * @param content
	 * @param reference
	 */
	public TmfTraceEvent(TmfTimestamp timestamp, TmfEventSource source, TmfEventType type,
			TmfEventContent content, TmfEventReference reference,
			String path, String file, int line)

Lines 7-13 Link Here

(-)src/org/eclipse/linuxtools/tmf/event/TmfEventFormat.java (-1 / +2 lines)
7	* http://www.eclipse.org/legal/epl-v10.html	7	* http://www.eclipse.org/legal/epl-v10.html
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* Francois Chouinard (fchouinard@gmail.com) - Initial API and implementation	10	* Francois Chouinard - Initial API and implementation
11	*******************************************************************************/	11	*******************************************************************************/
12		12
13	package org.eclipse.linuxtools.tmf.event;	13	package org.eclipse.linuxtools.tmf.event;
Lines 68-71 Link Here
68	public TmfEventField[] parse(Object content) {	68	public TmfEventField[] parse(Object content) {
69	return new TmfEventField[] { new TmfEventField(content.toString()) };	69	return new TmfEventField[] { new TmfEventField(content.toString()) };
70	}	70	}
		71
71	}	72	}




 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *   Francois Chouinard - Initial API and implementation
 *******************************************************************************/

package org.eclipse.linuxtools.tmf.event;

/**
 * <b><u>TmfEvent</u></b>
 * <p>
 * The basic event structure in the TMF. In its canonical form, an event has:
 * <p>
 * In its canonical form, an event has:
 * <ul>
 * <li> a normalized timestamp
 * <li> a source (reporter)

    // Attributes
    // ========================================================================

	private final TmfTimestamp fEffectiveTimestamp;
	private final TmfTimestamp fOriginalTimestamp;
	private final TmfEventSource fSource;
	private final TmfEventType fType;
	private final TmfEventContent fContent;

	 * @param content
	 * @param reference
	 */
	public TmfEvent(TmfTimestamp originalTS, TmfTimestamp effectiveTS, TmfEventSource source,
			TmfEventType type, TmfEventContent content, TmfEventReference reference)
	{
		fOriginalTimestamp = originalTS;
		fEffectiveTimestamp = effectiveTS;
		fSource = source;
		fType = type;
		fContent = content;
		fReference = reference;
	}

	/**
	 * @param timestamp
	 * @param source
	 * @param type
	 * @param content
	 * @param reference
	 */
	public TmfEvent(TmfTimestamp timestamp, TmfEventSource source,
			TmfEventType type, TmfEventContent content, TmfEventReference reference)
	{
		fOriginalTimestamp = fEffectiveTimestamp = timestamp;
		fSource = source;
		fType = type;
		fContent = content;

	 * @return
	 */
	public TmfTimestamp getTimestamp() {
		return fEffectiveTimestamp;
	}

	/**
	 * @return
	 */
	public TmfTimestamp getOriginalTimestamp() {
		return fOriginalTimestamp;
	}

	/**

	public TmfEventReference getReference() {
		return fReference;
	}

}

Lines 7-13 Link Here

(-)src/org/eclipse/linuxtools/tmf/event/TmfEventReference.java (-1 / +11 lines)
7	* http://www.eclipse.org/legal/epl-v10.html	7	* http://www.eclipse.org/legal/epl-v10.html
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* Francois Chouinard (fchouinard@gmail.com) - Initial API and implementation	10	* Francois Chouinard - Initial API and implementation
11	*******************************************************************************/	11	*******************************************************************************/
12		12
13	package org.eclipse.linuxtools.tmf.event;	13	package org.eclipse.linuxtools.tmf.event;
Lines 46-49 Link Here
46	public Object getValue() {	46	public Object getValue() {
47	return fReference;	47	return fReference;
48	}	48	}
		49
		50	// ========================================================================
		51	// Operators
		52	// ========================================================================
		53
		54	@Override
		55	public String toString() {
		56	return fReference.toString();
		57	}
		58
49	}	59	}




 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *   Francois Chouinard - Initial API and implementation
 *******************************************************************************/

package org.eclipse.linuxtools.tmf;

import org.osgi.framework.BundleContext;

/**
 * <b><u>TmfCorePlugin</u></b>
 * <p>
 * The activator class controls the plug-in life cycle
 */
public class TmfCorePlugin extends AbstractUIPlugin {

    // ========================================================================
    // Attributes

	public static final String PLUGIN_ID = "org.eclipse.linuxtools.tmf";

	// The shared instance
	private static TmfCorePlugin plugin;
	
    // ========================================================================
    // Constructors

	/**
	 * The constructor
	 */
	public TmfCorePlugin() {
	}

    // ========================================================================

    /**
     * @return the shared instance
     */
    public static TmfCorePlugin getDefault() {
        return plugin;
    }





import java.util.Vector;

import org.eclipse.linuxtools.tmf.event.TmfEvent;
import org.eclipse.linuxtools.tmf.event.TmfTimeRange;

/**
 * <b><u>TmfEventRequest</u></b>

    // Attributes
    // ========================================================================

    private final TmfTimeRange fRange;     // The requested events timestamp range
    private final long fOffset;             // The synchronization offset to apply
    private final int  fNbRequestedEvents;  // The number of events to read (-1 == the whole range)
    private final int  fBlockSize;          // The maximum number of events per chunk

     * @param offset
     * @param nbEvents
     */
    public TmfEventRequest(TmfTimeRange range, long offset, int nbEvents) {
        this(range, offset, nbEvents, DEFAULT_BLOCK_SIZE);
    }


     * @param nbEvents
     * @param maxBlockSize Size of the largest blocks expected
     */
    public TmfEventRequest(TmfTimeRange range, long offset, int nbEvents, int maxBlockSize) {
        fRange = range;
        fOffset = offset;
        fNbRequestedEvents = nbEvents;

    /**
     * @return the requested time range
     */
    public TmfTimeRange getRange() {
        return fRange;
    }


Lines 16-22 Link Here

(-)src/org/eclipse/linuxtools/tmf/eventlog/TmfTrace.java (-2 / +2 lines)
16	import java.util.Vector;	16	import java.util.Vector;
17		17
18	import org.eclipse.linuxtools.tmf.event.TmfEvent;	18	import org.eclipse.linuxtools.tmf.event.TmfEvent;
19	import org.eclipse.linuxtools.tmf.event.TmfTimeWindow;	19	import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
20	import org.eclipse.linuxtools.tmf.event.TmfTimestamp;	20	import org.eclipse.linuxtools.tmf.event.TmfTimestamp;
21		21
22	/**	22	/**
Lines 79-85 Link Here
79	return fEpoch;	79	return fEpoch;
80	}	80	}
81		81
82	public TmfTimeWindow getTimeRange() {	82	public TmfTimeRange getTimeRange() {
83	return fStream.getTimeRange();	83	return fStream.getTimeRange();
84	}	84	}
85		85




import java.util.Vector;

import org.eclipse.linuxtools.tmf.event.TmfEvent;
import org.eclipse.linuxtools.tmf.event.TmfTimeRange;
import org.eclipse.linuxtools.tmf.event.TmfTimestamp;

/**

    private int fNbEvents = 0;

    // The time span of the event stream 
    private TmfTimeRange fTimeRange = new TmfTimeRange(TmfTimestamp.BigBang, TmfTimestamp.BigBang);
    
    // ========================================================================
    // Constructors

    /**
     * @return
     */
    public TmfTimeRange getTimeRange() {
        return fTimeRange;
    }


                    location = getCurrentLocation();
                    event = getNextEvent();
                }
                fTimeRange = new TmfTimeRange(startTime, lastTime);
            }
            seek(0);
        } catch (IOException e) {

Lines 3-9 Link Here

(-)META-INF/MANIFEST.MF (-2 / +3 lines)
3	Bundle-Name: TMF	3	Bundle-Name: TMF
4	Bundle-SymbolicName: org.eclipse.linuxtools.tmf	4	Bundle-SymbolicName: org.eclipse.linuxtools.tmf
5	Bundle-Version: 0.0.1	5	Bundle-Version: 0.0.1
6	Bundle-Activator: org.eclipse.linuxtools.tmf.Activator	6	Bundle-Activator: org.eclipse.linuxtools.tmf.TmfCorePlugin
7	Bundle-Vendor: Eclipse	7	Bundle-Vendor: Eclipse
8	Require-Bundle: org.eclipse.ui,	8	Require-Bundle: org.eclipse.ui,
9	org.eclipse.core.runtime,	9	org.eclipse.core.runtime,
Lines 11-15 Link Here
11	Bundle-RequiredExecutionEnvironment: J2SE-1.5	11	Bundle-RequiredExecutionEnvironment: J2SE-1.5
12	Bundle-ActivationPolicy: lazy	12	Bundle-ActivationPolicy: lazy
13	Import-Package: org.junit.runner	13	Import-Package: org.junit.runner
14	Export-Package: org.eclipse.linuxtools.tmf.event,	14	Export-Package: org.eclipse.linuxtools.tmf,
		15	org.eclipse.linuxtools.tmf.event,
15	org.eclipse.linuxtools.tmf.eventlog	16	org.eclipse.linuxtools.tmf.eventlog

Return to bug 287562

Lines 7-13 Link Here

(-)src/org/eclipse/linuxtools/tmf/TmfCorePlugin.java (-6 / +6 lines)
7	* http://www.eclipse.org/legal/epl-v10.html	7	* http://www.eclipse.org/legal/epl-v10.html
8	*	8	*
9	* Contributors:	9	* Contributors:
10	* Francois Chouinard (fchouinard@gmail.com) - Initial API and implementation	10	* Francois Chouinard - Initial API and implementation
11	*******************************************************************************/	11	*******************************************************************************/
12		12
13	package org.eclipse.linuxtools.tmf;	13	package org.eclipse.linuxtools.tmf;
Lines 16-26 Link Here
16	import org.osgi.framework.BundleContext;	16	import org.osgi.framework.BundleContext;
17		17
18	/**	18	/**
19	* <b><u>Activator</u></b>	19	* <b><u>TmfCorePlugin</u></b>
20	* <p>	20	* <p>
21	* The activator class controls the plug-in life cycle	21	* The activator class controls the plug-in life cycle
22	*/	22	*/
23	public class Activator extends AbstractUIPlugin {	23	public class TmfCorePlugin extends AbstractUIPlugin {
24		24
25	// ========================================================================	25	// ========================================================================
26	// Attributes	26	// Attributes
Lines 30-36 Link Here
30	public static final String PLUGIN_ID = "org.eclipse.linuxtools.tmf";	30	public static final String PLUGIN_ID = "org.eclipse.linuxtools.tmf";
31		31
32	// The shared instance	32	// The shared instance
33	private static Activator plugin;	33	private static TmfCorePlugin plugin;
34		34
35	// ========================================================================	35	// ========================================================================
36	// Constructors	36	// Constructors
Lines 39-45 Link Here
39	/**	39	/**
40	* The constructor	40	* The constructor
41	*/	41	*/
42	public Activator() {	42	public TmfCorePlugin() {
43	}	43	}
44		44
45	// ========================================================================	45	// ========================================================================
Lines 49-55 Link Here
49	/**	49	/**
50	* @return the shared instance	50	* @return the shared instance
51	*/	51	*/
52	public static Activator getDefault() {	52	public static TmfCorePlugin getDefault() {
53	return plugin;	53	return plugin;
54	}	54	}
55		55