Skip to content

Commit dea96e8

Browse files
committed
[GR-35375] Backport: multithreading fixes.
PullRequest: graalpython/2076
2 parents b1a32d8 + d71539e commit dea96e8

File tree

6 files changed

+4
-14
lines changed

6 files changed

+4
-14
lines changed

ci.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "overlay": "55445982aa4ce8431ee557ba5becc515ab9544f8" }
1+
{ "overlay": "0bd015e17c677e60f06057718a60243b68b6d72a" }

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/engine/SharedEngineMultithreadingBenchmarkTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,11 @@
4949

5050
import org.graalvm.polyglot.Engine;
5151
import org.graalvm.polyglot.Source;
52-
import org.junit.Ignore;
5352
import org.junit.Test;
5453

5554
import com.oracle.graal.python.test.PythonTests;
5655

5756
public class SharedEngineMultithreadingBenchmarkTest extends SharedEngineMultithreadingTestBase {
58-
@Ignore
5957
@Test
6058
public void testRichardsInParallelInMultipleContexts() throws Throwable {
6159
try (Engine engine = Engine.newBuilder().build()) {

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/engine/SharedEngineMultithreadingImportsTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,11 @@
4646

4747
import org.graalvm.polyglot.Engine;
4848
import org.junit.Assert;
49-
import org.junit.Ignore;
5049
import org.junit.Test;
5150

5251
public class SharedEngineMultithreadingImportsTest extends SharedEngineMultithreadingTestBase {
5352
private static final int RUNS_COUNT = RUNS_COUNT_FACTOR;
5453

55-
@Ignore
5654
@Test
5755
public void testImportsInParallel() throws InterruptedException, ExecutionException {
5856
ExecutorService executorService = createExecutorService();

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/engine/SharedEngineMultithreadingShapeTransitionsTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,13 @@
5151
import org.graalvm.polyglot.Source;
5252
import org.graalvm.polyglot.Value;
5353
import org.junit.Assert;
54-
import org.junit.Ignore;
5554
import org.junit.Test;
5655

5756
public class SharedEngineMultithreadingShapeTransitionsTest extends SharedEngineMultithreadingTestBase {
5857
private static final int RUNS_COUNT = RUNS_COUNT_FACTOR;
5958
private static final int PROPERTIES_COUNT = 20;
6059
private static final int SHARED_PREFIX_COUNT = PROPERTIES_COUNT - 10;
6160

62-
@Ignore
6361
@Test
6462
public void testShapeTransitionsInParallel() throws InterruptedException, ExecutionException {
6563
ExecutorService executorService = createExecutorService();

graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/engine/SharedEngineMultithreadingSimpleLambdaTest.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,11 @@
4747
import org.graalvm.polyglot.Source;
4848
import org.graalvm.polyglot.Value;
4949
import org.junit.Assert;
50-
import org.junit.Ignore;
5150
import org.junit.Test;
5251

5352
public class SharedEngineMultithreadingSimpleLambdaTest extends SharedEngineMultithreadingTestBase {
5453
private static final int RUNS_COUNT = 2 * RUNS_COUNT_FACTOR;
5554

56-
@Ignore
5755
@Test
5856
public void testLambdaInParallelCtxCreatedInMainThread() throws InterruptedException, ExecutionException {
5957
ExecutorService executorService = createExecutorService();
@@ -85,7 +83,6 @@ public void testLambdaInParallelCtxCreatedInMainThread() throws InterruptedExcep
8583
}
8684
}
8785

88-
@Ignore
8986
@Test
9087
public void testLambdaInParallelCtxCreatedInWorkerThread() throws InterruptedException, ExecutionException {
9188
ExecutorService executorService = createExecutorService();
@@ -112,7 +109,6 @@ public void testLambdaInParallelCtxCreatedInWorkerThread() throws InterruptedExc
112109
}
113110
}
114111

115-
@Ignore
116112
@Test
117113
public void testLambdaInParallelSharedContexts() throws InterruptedException, ExecutionException {
118114
ExecutorService executorService = createExecutorService();

mx.graalpython/suite.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,23 @@
4444
},
4545
{
4646
"name": "tools",
47-
"version": "fa8db34069fcf2525c435b729c15b870110462dc",
47+
"version": "a8e3d29028a6d86bf8fda82462443f5cea64f1e3",
4848
"subdir": True,
4949
"urls": [
5050
{"url": "https://github.com/oracle/graal", "kind": "git"},
5151
],
5252
},
5353
{
5454
"name": "sulong",
55-
"version": "fa8db34069fcf2525c435b729c15b870110462dc",
55+
"version": "a8e3d29028a6d86bf8fda82462443f5cea64f1e3",
5656
"subdir": True,
5757
"urls": [
5858
{"url": "https://github.com/oracle/graal", "kind": "git"},
5959
]
6060
},
6161
{
6262
"name": "regex",
63-
"version": "fa8db34069fcf2525c435b729c15b870110462dc",
63+
"version": "a8e3d29028a6d86bf8fda82462443f5cea64f1e3",
6464
"subdir": True,
6565
"urls": [
6666
{"url": "https://github.com/oracle/graal", "kind": "git"},

0 commit comments

Comments
 (0)