Skip to content

Commit f05268e

Browse files
OracleLabsAutomationelkorchi
authored andcommitted
[GR-59108] Backport to 24.1: Shared engine cannot be used with GraalPyResources.
PullRequest: graalpython/3564
2 parents 1cc5224 + cbebe1e commit f05268e

File tree

2 files changed

+61
-3
lines changed

2 files changed

+61
-3
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
/*
2+
* Copyright (c) 2024, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
package org.graalvm.python.embedding.utils.test;
42+
43+
import org.graalvm.polyglot.Engine;
44+
import org.graalvm.python.embedding.utils.GraalPyResources;
45+
import org.graalvm.python.embedding.utils.VirtualFileSystem;
46+
import org.junit.Test;
47+
48+
import java.nio.file.Path;
49+
50+
public class GraalPyResourcesTests {
51+
52+
@Test
53+
public void sharedEngine() {
54+
// simply check if we are able to create a context with a shared engine
55+
Engine sharedEngine = Engine.newBuilder().build();
56+
GraalPyResources.contextBuilder().engine(sharedEngine).build().close();
57+
GraalPyResources.contextBuilder().engine(sharedEngine).build().close();
58+
GraalPyResources.contextBuilder(Path.of("test")).engine(sharedEngine).build().close();
59+
GraalPyResources.contextBuilder(VirtualFileSystem.newBuilder().build()).engine(sharedEngine).build().close();
60+
}
61+
}

graalpython/org.graalvm.python.embedding/src/org/graalvm/python/embedding/utils/GraalPyResources.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,9 +356,6 @@ private static Context.Builder createContextBuilder() {
356356
// Force to automatically import site.py module, to make Python packages
357357
// available
358358
option("python.ForceImportSite", "true").
359-
// Do not warn if running without JIT. This can be desirable for short
360-
// running scripts to reduce memory footprint.
361-
option("engine.WarnInterpreterOnly", "false").
362359
// causes the interpreter to always assume hash-based pycs are valid
363360
option("python.CheckHashPycsMode", "never");
364361
}

0 commit comments

Comments
 (0)