Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Loskutov2019-01-21 16:18:38 -0500
committerAndrey Loskutov2019-01-21 16:18:38 -0500
commit57aef1646fef9009290374dec1cc83d8db9e8e0b (patch)
treec4fd8a121a8c891fc88f21a0b4fee711c471cf7b
parent4b4ffed479c0cab62f623a53a076d117e03b0e03 (diff)
downloadeclipse.platform.text-57aef1646fef9009290374dec1cc83d8db9e8e0b.tar.gz
eclipse.platform.text-57aef1646fef9009290374dec1cc83d8db9e8e0b.tar.xz
eclipse.platform.text-57aef1646fef9009290374dec1cc83d8db9e8e0b.zip
seedJobsCount over 1 on a JobGroup can cause endless waits, see bug 543629 comment 2 and bug 543660. Therefore use 1 for seedJobsCount in TextSearchVisitor.search() to avoid jobGroup.join(0) call block forever if we schedule more jobs as seedJobsCount and all jobs <= seedJobsCount finish before jobs > seedJobsCount start. Change-Id: Ib57687c8389bb8a620e1f4e7c82c52c6cd219b46 Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
-rw-r--r--org.eclipse.search/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.search/pom.xml4
-rw-r--r--org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java6
3 files changed, 8 insertions, 4 deletions
diff --git a/org.eclipse.search/META-INF/MANIFEST.MF b/org.eclipse.search/META-INF/MANIFEST.MF
index 6b98b4916..e1f7826ae 100644
--- a/org.eclipse.search/META-INF/MANIFEST.MF
+++ b/org.eclipse.search/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.search; singleton:=true
-Bundle-Version: 3.11.400.qualifier
+Bundle-Version: 3.11.500.qualifier
Bundle-Activator: org.eclipse.search.internal.ui.SearchPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
diff --git a/org.eclipse.search/pom.xml b/org.eclipse.search/pom.xml
index 76ae3cefe..65b6cc065 100644
--- a/org.eclipse.search/pom.xml
+++ b/org.eclipse.search/pom.xml
@@ -5,7 +5,7 @@
are made available under the terms of the Eclipse Distribution License v1.0
which accompanies this distribution, and is available at
http://www.eclipse.org/org/documents/edl-v10.php
-
+
Contributors:
Igor Fedorenko - initial implementation
-->
@@ -18,6 +18,6 @@
</parent>
<groupId>org.eclipse.search</groupId>
<artifactId>org.eclipse.search</artifactId>
- <version>3.11.400-SNAPSHOT</version>
+ <version>3.11.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java b/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java
index 24a9b4ef2..d7cb7cca8 100644
--- a/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java
+++ b/org.eclipse.search/search/org/eclipse/search/internal/core/text/TextSearchVisitor.java
@@ -333,7 +333,11 @@ public class TextSearchVisitor {
if (jobCount > MAX_JOBS_COUNT) {
jobCount= MAX_JOBS_COUNT;
}
- final JobGroup jobGroup= new TextSearchJobGroup("Text Search", maxThreads, jobCount); //$NON-NLS-1$
+
+ // Seed count over 1 can cause endless waits, see bug 543629 comment 2
+ // TODO use seed = jobCount after the bug 543660 in JobGroup is fixed
+ final int seed = 1;
+ final JobGroup jobGroup = new TextSearchJobGroup("Text Search", maxThreads, seed); //$NON-NLS-1$
long startTime= TRACING ? System.currentTimeMillis() : 0;
Job monitorUpdateJob= new Job(SearchMessages.TextSearchVisitor_progress_updating_job) {

Back to the top