This is an automated email from the ASF dual-hosted git repository. shaojunwang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-teaclave-java-tee-sdk.git
commit f9eb4e86c284c82e054b80f3f2f6feb6d39edcb4 Author: cengfeng.lzy <[email protected]> AuthorDate: Mon Aug 22 15:25:09 2022 +0800 Fix option setting bug Summary: Fix option setting bug Reviewers: lei.yul, jeffery.wsj, sanhong.lsh Issue: https://aone.alibaba-inc.com/task/44301842 CR: https://code.aone.alibaba-inc.com/java-tee/JavaEnclave/codereview/9842273 --- .../confidentialcomputing/enclave/EnclaveEntry.java | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/sdk/enclave/src/main/java/com/alibaba/confidentialcomputing/enclave/EnclaveEntry.java b/sdk/enclave/src/main/java/com/alibaba/confidentialcomputing/enclave/EnclaveEntry.java index f87524c..1c0d59f 100644 --- a/sdk/enclave/src/main/java/com/alibaba/confidentialcomputing/enclave/EnclaveEntry.java +++ b/sdk/enclave/src/main/java/com/alibaba/confidentialcomputing/enclave/EnclaveEntry.java @@ -7,30 +7,18 @@ import com.alibaba.confidentialcomputing.enclave.framework.ServiceMethodInvoker; import com.alibaba.confidentialcomputing.enclave.framework.UnloadServiceInvoker; import com.oracle.svm.core.IsolateArgumentParser; import com.oracle.svm.core.SubstrateGCOptions; -import com.oracle.svm.core.SubstrateOptions; import com.oracle.svm.core.annotate.Uninterruptible; -import com.oracle.svm.core.c.CGlobalData; -import com.oracle.svm.core.c.CGlobalDataFactory; import com.oracle.svm.core.c.function.CEntryPointActions; import com.oracle.svm.core.c.function.CEntryPointCreateIsolateParameters; import com.oracle.svm.core.c.function.CEntryPointNativeFunctions; import com.oracle.svm.core.c.function.CEntryPointOptions; -import com.oracle.svm.core.headers.LibC; -import org.graalvm.compiler.hotspot.replacements.Log; import org.graalvm.nativeimage.CurrentIsolate; import org.graalvm.nativeimage.ImageSingletons; import org.graalvm.nativeimage.Isolate; -import org.graalvm.nativeimage.PinnedObject; import org.graalvm.nativeimage.StackValue; -import org.graalvm.nativeimage.UnmanagedMemory; import org.graalvm.nativeimage.c.function.CEntryPoint; -import org.graalvm.nativeimage.c.function.CFunction; -import org.graalvm.nativeimage.c.struct.SizeOf; -import org.graalvm.nativeimage.c.type.CCharPointer; import org.graalvm.nativeimage.c.type.CCharPointerPointer; import org.graalvm.nativeimage.c.type.CTypeConversion; -import org.graalvm.word.UnsignedWord; -import org.graalvm.word.WordFactory; /** * This class defines the entry points for native image (shared library) deployed in TEE enclave. @@ -62,12 +50,9 @@ public class EnclaveEntry { if (thread.isNonNull()) { thread.write(CurrentIsolate.getCurrentThread()); } - int Xmx = IsolateArgumentParser.getIntOptionValue(IsolateArgumentParser.getOptionIndex(SubstrateGCOptions.MaxHeapSize)); - SubstrateGCOptions.MaxHeapSize.update((long) Xmx); - int Xms = IsolateArgumentParser.getIntOptionValue(IsolateArgumentParser.getOptionIndex(SubstrateGCOptions.MinHeapSize)); - SubstrateGCOptions.MaxHeapSize.update((long) Xms); - int Xmn = IsolateArgumentParser.getIntOptionValue(IsolateArgumentParser.getOptionIndex(SubstrateGCOptions.MaxNewSize)); - SubstrateGCOptions.MaxHeapSize.update((long) Xmn); + SubstrateGCOptions.MaxHeapSize.update((long) IsolateArgumentParser.getIntOptionValue(IsolateArgumentParser.getOptionIndex(SubstrateGCOptions.MaxHeapSize))); + SubstrateGCOptions.MinHeapSize.update((long) IsolateArgumentParser.getIntOptionValue(IsolateArgumentParser.getOptionIndex(SubstrateGCOptions.MinHeapSize))); + SubstrateGCOptions.MaxNewSize.update((long) IsolateArgumentParser.getIntOptionValue(IsolateArgumentParser.getOptionIndex(SubstrateGCOptions.MaxNewSize))); return CEntryPointActions.leave(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
