Monster merge from the integration branch. Still some problems left and JUnits failing.

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf / src / org / eclipse / linuxtools / tmf / request / TmfDataRequest.java

diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java
index 8b2ce9b7c0a1eb1aba1965717c8b009d90448280..8ad88e75d0d9c8a1a2e8c62d881f75d281524ddf 100644 (file)
--- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java
+++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/request/TmfDataRequest.java
@@ -85,17 +85,19 @@ public abstract class TmfDataRequest<T extends TmfData> implements ITmfDataReque
     // Attributes
     // ------------------------------------------------------------------------
 
-    private final Class<T> fDataType;
-    private final int fRequestId;                      // A unique request ID
-    private final int fIndex;                          // The index (rank) of the requested event
-    private final int fNbRequested;            // The number of requested events (ALL_DATA for all)
-    private final int fBlockSize;              // The maximum number of events per chunk
-    private       int fNbRead;                 // The number of reads so far
+    private final Class<T>      fDataType;
+    private final ExecutionType fExecType;
+    private final int                  fRequestId;     // A unique request ID
+    private final int                  fIndex;         // The index (rank) of the requested event
+    private final int                  fNbRequested;   // The number of requested events (ALL_DATA for all)
+    private final int                  fBlockSize;     // The maximum number of events per chunk
+    private       int                  fNbRead;        // The number of reads so far
 
     private final Object lock;
-    private boolean fRequestCompleted;
-    private boolean fRequestFailed;
-    private boolean fRequestCanceled;
+    private boolean fRequestRunning   = false;
+    private boolean fRequestCompleted = false;
+    private boolean fRequestFailed    = false;
+    private boolean fRequestCanceled  = false;
 
     private T[] fData; // Data object
     
@@ -116,7 +118,11 @@ public abstract class TmfDataRequest<T extends TmfData> implements ITmfDataReque
      * @param dataType the requested data type
      */
     public TmfDataRequest(Class<T> dataType) {
-        this(dataType, 0, ALL_DATA, DEFAULT_BLOCK_SIZE);
+        this(dataType, 0, ALL_DATA, DEFAULT_BLOCK_SIZE, ExecutionType.SHORT);
+    }
+
+    public TmfDataRequest(Class<T> dataType, ExecutionType execType) {
+        this(dataType, 0, ALL_DATA, DEFAULT_BLOCK_SIZE, execType);
     }
 
     /**
@@ -124,7 +130,11 @@ public abstract class TmfDataRequest<T extends TmfData> implements ITmfDataReque
      * @param nbRequested the number of data items requested
      */
     public TmfDataRequest(Class<T> dataType, int index) {
-        this(dataType, index, ALL_DATA, DEFAULT_BLOCK_SIZE);
+        this(dataType, index, ALL_DATA, DEFAULT_BLOCK_SIZE, ExecutionType.SHORT);
+    }
+
+    public TmfDataRequest(Class<T> dataType, int index, ExecutionType execType) {
+        this(dataType, index, ALL_DATA, DEFAULT_BLOCK_SIZE, execType);
     }
 
     /**
@@ -133,7 +143,11 @@ public abstract class TmfDataRequest<T extends TmfData> implements ITmfDataReque
      * @param blockSize the number of data items per block
      */
     public TmfDataRequest(Class<T> dataType, int index, int nbRequested) {
-        this(dataType, index, nbRequested, DEFAULT_BLOCK_SIZE);
+        this(dataType, index, nbRequested, DEFAULT_BLOCK_SIZE, ExecutionType.SHORT);
+    }
+
+    public TmfDataRequest(Class<T> dataType, int index, int nbRequested, ExecutionType execType) {
+        this(dataType, index, nbRequested, DEFAULT_BLOCK_SIZE, execType);
     }
 
     /**
@@ -143,15 +157,19 @@ public abstract class TmfDataRequest<T extends TmfData> implements ITmfDataReque
      * @param blockSize the number of data items per block
      */
     public TmfDataRequest(Class<T> dataType, int index, int nbRequested, int blockSize) {
+        this(dataType, index, nbRequested, blockSize, ExecutionType.SHORT);
+    }
+
+    public TmfDataRequest(Class<T> dataType, int index, int nbRequested, int blockSize, ExecutionType execType) {
        fRequestId   = fRequestNumber++;
        fDataType    = dataType;
        fIndex       = index;
        fNbRequested = nbRequested;
        fBlockSize   = blockSize;
+       fExecType    = execType;
        fNbRead      = 0;
         lock         = new Object();
-
-        Tracer.trace("Request #" + fRequestId + " (" + getClass().getName() + ", " + fDataType.getName() + ") created");
+        if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "created");
     }
 
     /**
@@ -159,13 +177,7 @@ public abstract class TmfDataRequest<T extends TmfData> implements ITmfDataReque
      */
     @SuppressWarnings("unused")
        private TmfDataRequest(TmfDataRequest<T> other) {
-       fRequestId   = 0;
-       fDataType    = null;
-       fIndex       = 0;
-       fNbRequested = 0;
-       fBlockSize   = 0;
-       fNbRead      = 0;
-        lock         = new Object();
+       this(null, 0, ALL_DATA, DEFAULT_BLOCK_SIZE);
     }
 
     // ------------------------------------------------------------------------
@@ -186,6 +198,13 @@ public abstract class TmfDataRequest<T extends TmfData> implements ITmfDataReque
                return fIndex;
        }
 
+       /**
+        * @return the index of the first event requested
+        */
+       public ExecutionType getExecType() {
+               return fExecType;
+       }
+
     /**
      * @return the number of requested events (ALL_DATA = all)
      */
@@ -207,6 +226,13 @@ public abstract class TmfDataRequest<T extends TmfData> implements ITmfDataReque
         return fNbRead;
     }
 
+    /**
+     * @return indicates if the request is completed
+     */
+    public boolean isRunning() {
+        return fRequestRunning;
+    }
+
     /**
      * @return indicates if the request is completed
      */
@@ -273,6 +299,9 @@ public abstract class TmfDataRequest<T extends TmfData> implements ITmfDataReque
      */
     public abstract void handleData();
 
+    public void handleStarted() {
+    }
+
     /**
      * Handle the completion of the request. It is called when there is no more
      * data available either because:
@@ -285,15 +314,15 @@ public abstract class TmfDataRequest<T extends TmfData> implements ITmfDataReque
      */
     public void handleCompleted() {
        if (fRequestFailed) { 
-            Tracer.trace("Request #" + fRequestId + " failed, completed");
+            if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "failed");
                handleFailure();
        }
        else if (fRequestCanceled) {
-            Tracer.trace("Request #" + fRequestId + " cancelled, completed");
+            if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "cancelled");
                handleCancel();
        }
        else {
-                       Tracer.trace("Request #" + fRequestId + " succeeded, completed");
+            if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "succeeded");
                        handleSuccess();
        }
     }
@@ -320,11 +349,26 @@ public abstract class TmfDataRequest<T extends TmfData> implements ITmfDataReque
         }
     }
 
+    /**
+     * Called by the request processor upon starting to service the request.
+     */
+    public void start() {
+        if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "starting");
+        synchronized(lock) {
+            fRequestRunning = true;
+            lock.notify();
+        }
+        handleStarted();
+       if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "started");
+    }
+
     /**
      * Called by the request processor upon completion.
      */
     public void done() {
+        if (Tracer.isRequestTraced()) Tracer.traceRequest(this, "completing");
         synchronized(lock) {
+               fRequestRunning   = false;
             fRequestCompleted = true;
             lock.notify();
         }