Merge branch 'master' into TmfTraceModel-new
authorFrancois Chouinard <fchouinard@gmail.com>
Tue, 24 Apr 2012 18:54:16 +0000 (14:54 -0400)
committerFrancois Chouinard <fchouinard@gmail.com>
Tue, 24 Apr 2012 18:54:16 +0000 (14:54 -0400)
Conflicts:
lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java
lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenExperimentHandler.java
lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/EventsViewEditor.java
lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java
lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java

1  2 
org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/trace/TmfTrace.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/OpenExperimentHandler.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/EventsViewEditor.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventsTable.java
org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/events/TmfEventsView.java

index 5ea35f60a701bfb27f75a06010849dcc24520365,bec3d70f4adf62b052a65b34cc5aad9ffb2c7b56..86e38d5d3e46d2a8ff8e3d29499424976b1e8cce
@@@ -55,9 -51,9 +55,9 @@@ public abstract class TmfTrace<T extend
      // ------------------------------------------------------------------------
  
      /**
 -     * The default number of events in an index page. Can be used as block size.
 +     * The default trace cache size
       */
-     public static final int DEFAULT_TRACE_CACHE_SIZE = 1000;
 -    public static final int DEFAULT_INDEX_PAGE_SIZE = 50000;
++    public static final int DEFAULT_TRACE_CACHE_SIZE = 50000;
  
      // ------------------------------------------------------------------------
      // Attributes
index 99a1dca40b76aa7a31b5a7c8610a150f05fc038a,f4dd9242369501e939a555d7b497628ba5058066..e17e49514e2bcd2b1d6f34aa857fe57610c603ae
@@@ -156,7 -164,7 +155,7 @@@ public class OpenExperimentHandler exte
              }
  
              // Create the experiment
-             final TmfExperiment experiment = new TmfExperiment(TmfEvent.class, fExperiment.getName(), traces, cacheSize);
 -            TmfExperiment experiment = new TmfExperiment(ITmfEvent.class, fExperiment.getName(), traces, cacheSize);
++            final TmfExperiment experiment = new TmfExperiment(ITmfEvent.class, fExperiment.getName(), traces, cacheSize);
              experiment.setBookmarksFile(file);
  
              if (useEditor) {
index 217aa36d08f603af9d6b62c527779910b716ba96,4c2876eb3179999f728422f9fae0f1fa59710a3f..61a7f37b8a0d283e7fe54e5937ef042178704dab
@@@ -133,13 -135,15 +132,13 @@@ public class EventsViewEditor extends T
                                      throw new PartInitException(Messages.OpenExperimentHandler_NoTraceType);
                                  }
                                  try {
 -                                    trace.initTrace(traceElement.getName(), traceElement.getLocation().getPath(), traceEvent.getClass());
 -                                } catch (FileNotFoundException e) {
 +                                    trace.initTrace(traceElement.getResource(), traceElement.getLocation().getPath(), traceEvent.getClass());
 +                                } catch (final FileNotFoundException e) {
                                  }
 -                                trace.setResource(traceElement.getResource());
 -                                cacheSize = Math.min(cacheSize, trace.getIndexPageSize());
 +                                cacheSize = Math.min(cacheSize, trace.getCacheSize());
                                  traces[i] = trace;
                              }
-                             final TmfExperiment experiment = new TmfExperiment(TmfEvent.class, experimentElement.getName(), traces, cacheSize);
 -                            TmfExperiment experiment = new TmfExperiment(ITmfEvent.class, experimentElement.getName(), traces, cacheSize);
++                            final TmfExperiment experiment = new TmfExperiment(ITmfEvent.class, experimentElement.getName(), traces, cacheSize);
                              experiment.setBookmarksFile(fFile);
                              fTrace = experiment;
                              TmfExperiment.setCurrentExperiment(experiment);
index e9f9e9cad0c3992d91b3e713cd651358d5053b67,491c3a0c34aa03e21f8abb491fc2b9ec6baf9e57..1b613fe7f8509e2df47561b6702520d9d7f82c13
@@@ -127,13 -130,15 +127,13 @@@ public class TmfEventsEditor extends Tm
                                      throw new PartInitException(Messages.OpenExperimentHandler_NoTraceType);\r
                                  }\r
                                  try {\r
 -                                    trace.initTrace(traceElement.getName(), traceElement.getLocation().getPath(), traceEvent.getClass());\r
 -                                } catch (FileNotFoundException e) {\r
 +                                    trace.initTrace(traceElement.getResource(), traceElement.getLocation().getPath(), traceEvent.getClass());\r
 +                                } catch (final FileNotFoundException e) {\r
                                  }\r
 -                                trace.setResource(traceElement.getResource());\r
 -                                cacheSize = Math.min(cacheSize, trace.getIndexPageSize());\r
 +                                cacheSize = Math.min(cacheSize, trace.getCacheSize());\r
                                  traces[i] = trace;\r
                              }\r
-                             final TmfExperiment experiment = new TmfExperiment(TmfEvent.class, experimentElement.getName(), traces, cacheSize);\r
 -                            TmfExperiment experiment = new TmfExperiment(ITmfEvent.class, experimentElement.getName(), traces, cacheSize);\r
++                            final TmfExperiment experiment = new TmfExperiment(ITmfEvent.class, experimentElement.getName(), traces, cacheSize);\r
                              experiment.setBookmarksFile(fFile);\r
                              fTrace = experiment;\r
                              experiment.initTrace(null, null, null);\r
          if (signal.getTraceResource().equals(fFile)) {\r
              broadcast(new TmfTraceClosedSignal(this, fTrace));\r
              try {\r
 -                String name = fTrace.getName();\r
 +                fTrace.getName();\r
                  fTrace = null;\r
 -                String traceTypeId = fFile.getPersistentProperty(TmfTraceElement.TRACETYPE);\r
 -                if (traceTypeId != null) {\r
 -                    for (IConfigurationElement ce : TmfTraceType.getTypeElements()) {\r
 +                final String traceTypeId = fFile.getPersistentProperty(TmfTraceElement.TRACETYPE);\r
 +                if (traceTypeId != null)\r
 +                    for (final IConfigurationElement ce : TmfTraceType.getTypeElements())\r
                          if (traceTypeId.equals(ce.getAttribute(TmfTraceType.ID_ATTR))) {\r
                              fTrace = (ITmfTrace<?>) ce.createExecutableExtension(TmfTraceType.TRACE_TYPE_ATTR);\r
-                             final TmfEvent event = (TmfEvent) ce.createExecutableExtension(TmfTraceType.EVENT_TYPE_ATTR);\r
 -                            ITmfEvent event = (TmfEvent) ce.createExecutableExtension(TmfTraceType.EVENT_TYPE_ATTR);\r
 -                            String path = fFile.getLocationURI().getPath();\r
 -                            fTrace.initTrace(name, path, event.getClass());\r
 -                            fTrace.indexTrace(false);\r
++                            final ITmfEvent event = (TmfEvent) ce.createExecutableExtension(TmfTraceType.EVENT_TYPE_ATTR);\r
 +                            final String path = fFile.getLocationURI().getPath();\r
 +                            fTrace.initTrace(null, path, event.getClass());\r
                              break;\r
                          }\r
 -                    }\r
 -                }\r
 -            } catch (InvalidRegistryObjectException e) {\r
 +            } catch (final InvalidRegistryObjectException e) {\r
                  e.printStackTrace();\r
 -            } catch (FileNotFoundException e) {\r
 +            } catch (final FileNotFoundException e) {\r
                  e.printStackTrace();\r
 -            } catch (CoreException e) {\r
 +            } catch (final CoreException e) {\r
                  e.printStackTrace();\r
              }\r
              fEventsTable.dispose();\r
index d4a82ec8c0c246c181491057cac0474917f63439,c99414807e72487bef3698204f3df9ed85334a2a..81f47536f61b0966c5d0ace5aded521abd8940a8
@@@ -1007,21 -1053,24 +1006,21 @@@ ITmfEventsFilterProvider 
          @SuppressWarnings("unchecked")\r
          @Override\r
          public void run() {\r
 -            if (fTrace == null) {\r
 +            if (fTrace == null)\r
                  return;\r
 -            }\r
 -            int nbRequested = (int) (fTrace.getNbEvents() - fFilterCheckCount);\r
 -            if (nbRequested <= 0) {\r
 +            final int nbRequested = (int) (fTrace.getNbEvents() - fFilterCheckCount);\r
 +            if (nbRequested <= 0)\r
                  return;\r
-             request = new TmfEventRequest<TmfEvent>(TmfEvent.class, TmfTimeRange.ETERNITY, (int) fFilterCheckCount,\r
 -            }\r
+             request = new TmfEventRequest<ITmfEvent>(ITmfEvent.class, TmfTimeRange.ETERNITY, (int) fFilterCheckCount,\r
 -                    nbRequested, fTrace.getIndexPageSize(), ExecutionType.BACKGROUND) {\r
 +                    nbRequested, fTrace.getCacheSize(), ExecutionType.BACKGROUND) {\r
                  @Override\r
-                 public void handleData(final TmfEvent event) {\r
 -                public void handleData(ITmfEvent event) {\r
++                public void handleData(final ITmfEvent event) {\r
                      super.handleData(event);\r
 -                    if (request.isCancelled()) {\r
 +                    if (request.isCancelled())\r
                          return;\r
 -                    }\r
                      if (filter.matches(event)) {\r
 -                        long rank = fFilterCheckCount;\r
 -                        int index = (int) fFilterMatchCount;\r
 +                        final long rank = fFilterCheckCount;\r
 +                        final int index = (int) fFilterMatchCount;\r
                          fFilterMatchCount++;\r
                          fCache.storeEvent(event.clone(), rank, index);\r
                          refreshTable();\r
                      fFilterCheckCount++;\r
                  }\r
              };\r
-             ((ITmfDataProvider<TmfEvent>) fTrace).sendRequest(request);\r
+             ((ITmfDataProvider<ITmfEvent>) fTrace).sendRequest(request);\r
              try {\r
                  request.waitForCompletion();\r
 -            } catch (InterruptedException e) {\r
 +            } catch (final InterruptedException e) {\r
              }\r
              refreshTable();\r
          }\r
          protected int direction;\r
          protected long rank;\r
          protected long foundRank = -1;\r
-         protected TmfDataRequest<TmfEvent> request;\r
+         protected TmfDataRequest<ITmfEvent> request;\r
  \r
 -        public SearchThread(ITmfFilterTreeNode searchFilter, ITmfFilterTreeNode eventFilter, int startIndex,\r
 -                long currentRank, int direction) {\r
 +        public SearchThread(final ITmfFilterTreeNode searchFilter, final ITmfFilterTreeNode eventFilter, final int startIndex,\r
 +                final long currentRank, final int direction) {\r
              super(Messages.TmfEventsTable_SearchingJobName);\r
              this.searchFilter = searchFilter;\r
              this.eventFilter = eventFilter;\r
                          foundRank = event.rank;\r
                          break;\r
                      }\r
 -                    if (direction == Direction.FORWARD) {\r
 +                    if (direction == Direction.FORWARD)\r
                          idx++;\r
 -                    } else {\r
 +                    else\r
                          idx--;\r
 -                    }\r
                  }\r
 -                if (foundRank == -1) {\r
 +                if (foundRank == -1)\r
                      if (direction == Direction.FORWARD) {\r
                          rank++;\r
 -                        if (rank > (fTrace.getNbEvents() - 1)) {\r
 +                        if (rank > (fTrace.getNbEvents() - 1))\r
                              rank = 0;\r
 -                        }\r
                      } else {\r
                          rank--;\r
 -                        if (rank < 0) {\r
 +                        if (rank < 0)\r
                              rank = (int) fTrace.getNbEvents() - 1;\r
 -                        }\r
                      }\r
 -                }\r
              }\r
 -            int startRank = (int) rank;\r
 +            final int startRank = (int) rank;\r
              boolean wrapped = false;\r
              while (!monitor.isCanceled() && (foundRank == -1) && (fTrace != null)) {\r
--                int nbRequested = (direction == Direction.FORWARD ? Integer.MAX_VALUE : Math.min((int) rank + 1,\r
-                         fTrace.getCacheSize()));\r
-                 if (direction == Direction.BACKWARD)\r
 -                        fTrace.getIndexPageSize()));\r
++                int nbRequested = (direction == Direction.FORWARD ? Integer.MAX_VALUE : Math.min((int) rank + 1, fTrace.getCacheSize()));\r
+                 if (direction == Direction.BACKWARD) {\r
 -                    rank = Math.max(0, rank - fTrace.getIndexPageSize() + 1);\r
 -\r
 +                    rank = Math.max(0, rank - fTrace.getCacheSize() + 1);\r
-                 request = new TmfDataRequest<TmfEvent>(TmfEvent.class, (int) rank, nbRequested) {\r
+                 }\r
+                 request = new TmfDataRequest<ITmfEvent>(ITmfEvent.class, (int) rank, nbRequested) {\r
                      long currentRank = rank;\r
  \r
                      @Override\r
-                     public void handleData(final TmfEvent event) {\r
 -                    public void handleData(ITmfEvent event) {\r
++                    public void handleData(final ITmfEvent event) {\r
                          super.handleData(event);\r
                          if (searchFilter.matches(event) && ((eventFilter == null) || eventFilter.matches(event))) {\r
                              foundRank = currentRank;\r
                          currentRank++;\r
                      }\r
                  };\r
-                 ((ITmfDataProvider<TmfEvent>) fTrace).sendRequest(request);\r
+                 ((ITmfDataProvider<ITmfEvent>) fTrace).sendRequest(request);\r
                  try {\r
                      request.waitForCompletion();\r
 -                    if (request.isCancelled()) {\r
 +                    if (request.isCancelled())\r
                          return Status.OK_STATUS;\r
 -                    }\r
 -                } catch (InterruptedException e) {\r
 +                } catch (final InterruptedException e) {\r
                      synchronized (fSearchSyncObj) {\r
                          fSearchThread = null;\r
                      }\r
                  TmfTimestamp ts = new TmfTimestamp(signal.getCurrentTime());\r
  \r
                  @Override\r
-                 public void handleData(final TmfEvent event) {\r
 -                public void handleData(ITmfEvent event) {\r
++                public void handleData(final ITmfEvent event) {\r
                      super.handleData(event);\r
                  }\r
  \r
index 0d20170c43cb10f6fba26db9d68a3a5377d1627d,5ee55a0aa085240f80d4a808bed9e8163bc0615e..375c0a5e1d20442f24349e4cdfb49684b665ac95
@@@ -239,4 -239,4 +239,4 @@@ public class TmfEventsView extends TmfV
                }
        }
  
--}
++}
This page took 0.033106 seconds and 5 git commands to generate.