2010-06-05 fchouinard@gmail.com Contributions for bugs 292965, 292963, 293102,...

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

diff --git a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/Tracer.java b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/Tracer.java
index cc49ebe4220482a35bf675e1f603116867f4dde2..7a58ee356bd7d8c5882c6ac47af42a3202c1cd60 100644 (file)
--- a/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/Tracer.java
+++ b/org.eclipse.linuxtools.tmf/src/org/eclipse/linuxtools/tmf/Tracer.java
@@ -22,7 +22,6 @@ public class Tracer {
        static Boolean REQUEST   = Boolean.FALSE;\r
        static Boolean SIGNAL    = Boolean.FALSE;\r
        static Boolean EVENT     = Boolean.FALSE;\r
-       static Boolean EXCEPTION = Boolean.FALSE;\r
 \r
        private static BufferedWriter fTraceLog = null;\r
 \r
@@ -83,12 +82,6 @@ public class Tracer {
                        isTracing |= EVENT;\r
                }\r
 \r
-               traceKey = Platform.getDebugOption(pluginID + "/exception");\r
-               if (traceKey != null) {\r
-                       EXCEPTION = (Boolean.valueOf(traceKey)).booleanValue();\r
-                       isTracing |= EXCEPTION;\r
-               }\r
-\r
                // Create trace log file if needed\r
                if (isTracing) {\r
                        fTraceLog = openLogFile("trace.log");\r
@@ -112,10 +105,6 @@ public class Tracer {
                return EVENT;\r
        }\r
        \r
-       public static boolean isExceptionTraced() {\r
-               return EXCEPTION;\r
-       }\r
-\r
        // Tracers\r
        public static void trace(String msg) {\r
                long currentTime = System.currentTimeMillis();\r
@@ -143,7 +132,10 @@ public class Tracer {
        }\r
 \r
        public static void traceRequest(ITmfDataRequest<?> request, String msg) {\r
-               String message = ("[REQ] Thread=" + Thread.currentThread().getId() + " Req=" + request.getRequestId() + ", Type=" + request.getDataType().getSimpleName() + " " + msg);\r
+               String message = ("[REQ] Thread=" + Thread.currentThread().getId() + " Req=" + request.getRequestId() + \r
+                               (request.getExecType() == ITmfDataRequest.ExecutionType.LONG ? "(long)" : "(short)") +\r
+                               ", Type=" + request.getClass().getName() + \r
+                               ", DataType=" + request.getDataType().getSimpleName() + " " + msg);\r
                trace(message);\r
        }\r
 \r
@@ -152,9 +144,6 @@ public class Tracer {
                trace(message);\r
        }\r
 \r
-       public static void traceException(Exception e) {\r
-       }\r
-\r
        public static void traceError(String msg) {\r
                String message = ("[ERR] Thread=" + Thread.currentThread().getId() + " " + msg);\r
                trace(message);\r