Skip to content

Commit 35d88b0

Browse files
tuanvtdeptre199tuanvtdeptre199
authored
Merge branch 'eclipse-tracecompass:master' into publicchildproviderandtrace
2 parents 33f098e + 794f532 commit 35d88b0

6 files changed

Lines changed: 34 additions & 16 deletions

File tree

‎TraceCompass.setup‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<setupTask
7676
xsi:type="setup:VariableTask"
7777
name="eclipse.target.platform"
78-
defaultValue="tracecompass-e4.39"
78+
defaultValue="tracecompass-e4.40"
7979
storageURI="scope://Workspace"
8080
label="Target Platform">
8181
<choice
@@ -138,6 +138,9 @@
138138
<choice
139139
value="tracecompass-e4.39"
140140
label="Trace Compass Eclipse 2026-03 - 4.39"/>
141+
<choice
142+
value="tracecompass-e4.40"
143+
label="Trace Compass Eclipse 2026-06 - 4.40"/>
141144
<choice
142145
value="tracecompass-eStaging"
143146
label="Trace Compass Eclipse Latest"/>
@@ -175,15 +178,15 @@
175178
<setupTask
176179
xsi:type="pde:TargetPlatformTask"
177180
id="tracecompass-baseline-resolve"
178-
name="tracecompass-baseline-11.3.0"
181+
name="tracecompass-baseline-12.0.0"
179182
activate="false">
180183
<description>Trace Compass Baseline</description>
181184
</setupTask>
182185
<setupTask
183186
xsi:type="pde:APIBaselineFromTargetTask"
184-
id="tracecompass-baseline-11.3.0"
187+
id="tracecompass-baseline-12.0.0"
185188
name="Trace Compass Baseline"
186-
targetName="tracecompass-baseline-11.3.0">
189+
targetName="tracecompass-baseline-12.0.0">
187190
<description>Trace Compass Baseline</description>
188191
</setupTask>
189192
<setupTask

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<tycho-use-project-settings>true</tycho-use-project-settings>
5858
<tycho.scmUrl>scm:git:https://github.com/eclipse-tracecompass/org.eclipse.tracecompass</tycho.scmUrl>
5959
<cbi-plugins.version>1.5.4</cbi-plugins.version>
60-
<target-platform>tracecompass-e4.39</target-platform>
60+
<target-platform>tracecompass-e4.40</target-platform>
6161

6262
<rcptt-version>2.8.1</rcptt-version>
6363
<!-- Disable GTK3 because it's not quite usable yet and it can make the tests hang (bug in IcedTea http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1736) -->

releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-11.3.0.target renamed to releng/org.eclipse.tracecompass.target/baseline/tracecompass-baseline-12.0.0.target

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<?pde version="3.8"?><target name="tracecompass-baseline-11.3.0" sequenceNumber="1">
2+
<?pde version="3.8"?><target name="tracecompass-baseline-12.0.0" sequenceNumber="1">
33
<locations>
44
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
55
<unit id="org.eclipse.tracecompass.analysis.counters.core" version="0.0.0"/>
@@ -46,11 +46,11 @@
4646
<unit id="org.eclipse.tracecompass.tmf.remote.core" version="0.0.0"/>
4747
<unit id="org.eclipse.tracecompass.tmf.remote.ui" version="0.0.0"/>
4848
<unit id="org.eclipse.tracecompass.tmf.ui" version="0.0.0"/>
49-
<repository location="https://download.eclipse.org/tracecompass/releases/11.3.0/repository/"/>
49+
<repository location="https://download.eclipse.org/tracecompass/releases/12.0.0/repository/"/>
5050
</location>
5151
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
5252
<unit id="org.eclipse.core.runtime" version="0.0.0"/>
53-
<repository location="https://download.eclipse.org/releases/2026-03"/>
53+
<repository location="https://download.eclipse.org/releases/2026-06"/>
5454
</location>
5555
</locations>
5656
</target>

‎releng/org.eclipse.tracecompass.target/tracecompass-e4.40.target‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.40" sequenceNumber="5">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-e4.40" sequenceNumber="6">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
44
<repository location="https://download.eclipse.org/justj/jres/21/updates/release/21.0.11/"/>
@@ -10,7 +10,7 @@
1010
<unit id="org.eclipse.remote.ui" version="0.0.0"/>
1111
<unit id="org.eclipse.remote.jsch.core" version="0.0.0"/>
1212
<unit id="org.eclipse.remote.jsch.ui" version="0.0.0"/>
13-
<repository location="https://download.eclipse.org/tools/cdt/builds/12.5/cdt-12.5.0-rc2/"/>
13+
<repository location="https://download.eclipse.org/tools/cdt/releases/12.5/cdt-12.5.0/"/>
1414
</location>
1515
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
1616
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -90,7 +90,7 @@
9090
<unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
9191
<unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
9292
<unit id="org.eclipse.osgi.services" version="0.0.0"/>
93-
<repository location="https://download.eclipse.org/eclipse/updates/4.40-I-builds/I20260601-0713/"/>
93+
<repository location="https://download.eclipse.org/eclipse/updates/4.40/R-4.40-202606010713/"/>
9494
</location>
9595
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
9696
<unit id="org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ctf" version="1.7.2"/>
@@ -100,7 +100,7 @@
100100
<unit id="org.eclipse.wst.xml.core" version="0.0.0"/>
101101
<unit id="org.eclipse.wst.xml.ui" version="0.0.0"/>
102102
<unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
103-
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.42.0/S-3.42RC1-20260602145033/repository/"/>
103+
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.42.0/R-3.42.0-20260602145033/repository/"/>
104104
</location>
105105
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
106106
<unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>

‎releng/org.eclipse.tracecompass.target/tracecompass-eStaging.target‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="270">
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="tracecompass-eStaging" sequenceNumber="271">
22
<locations>
33
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
44
<repository location="https://download.eclipse.org/justj/jres/21/updates/release/21.0.11/"/>
@@ -10,7 +10,7 @@
1010
<unit id="org.eclipse.remote.ui" version="0.0.0"/>
1111
<unit id="org.eclipse.remote.jsch.core" version="0.0.0"/>
1212
<unit id="org.eclipse.remote.jsch.ui" version="0.0.0"/>
13-
<repository location="https://download.eclipse.org/tools/cdt/builds/12.5/cdt-12.5.0-rc2/"/>
13+
<repository location="https://download.eclipse.org/tools/cdt/releases/12.5/cdt-12.5.0/"/>
1414
</location>
1515
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
1616
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
@@ -90,7 +90,7 @@
9090
<unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
9191
<unit id="org.eclipse.e4.ui.progress" version="0.0.0"/>
9292
<unit id="org.eclipse.osgi.services" version="0.0.0"/>
93-
<repository location="https://download.eclipse.org/eclipse/updates/4.40-I-builds/I20260601-0713/"/>
93+
<repository location="https://download.eclipse.org/eclipse/updates/4.40/R-4.40-202606010713/"/>
9494
</location>
9595
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
9696
<unit id="org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ctf" version="1.7.2"/>
@@ -100,7 +100,7 @@
100100
<unit id="org.eclipse.wst.xml.core" version="0.0.0"/>
101101
<unit id="org.eclipse.wst.xml.ui" version="0.0.0"/>
102102
<unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
103-
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.42.0/S-3.42RC1-20260602145033/repository/"/>
103+
<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.42.0/R-3.42.0-20260602145033/repository/"/>
104104
</location>
105105
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
106106
<unit id="org.eclipse.emf.common.feature.group" version="0.0.0"/>

‎tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/trace/TmfTrace.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -850,6 +850,19 @@ private IStatus refreshAnalysisModulesImpl() {
850850
Set<String> oldAnalysisModulesKeys = new HashSet<>(previousAnalysisModules.keySet());
851851
Set<String> keys = new HashSet<>(newAnalysisModules.keySet());
852852

853+
/* Get all modules in the fAnalysisModules Map to allow
854+
for dependent analysis builds */
855+
synchronized(fAnalysisModules){
856+
for (String key : keys) {
857+
if (!fAnalysisModules.containsKey(key)) {
858+
IAnalysisModule module = newAnalysisModules.get(key);
859+
if (module != null) {
860+
fAnalysisModules.put(key, module);
861+
}
862+
}
863+
}
864+
}
865+
853866
for (String key : keys) {
854867
IAnalysisModule module = newAnalysisModules.remove(key);
855868
if (!oldAnalysisModulesKeys.contains(key)) {
@@ -861,6 +874,8 @@ private IStatus refreshAnalysisModulesImpl() {
861874
} else {
862875
oldAnalysisModulesKeys.remove(key);
863876
if (module != null) {
877+
/* Remove the newly computed analysis module since it already
878+
was done previously*/
864879
module.dispose();
865880
}
866881
}

0 commit comments

Comments
 (0)