[GR-2617] Replace/remove calls to C functions that are not thread-safe or considered unsafe.

PullRequest: graal/23261

Author: peter-hofer

substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixProcessPropertiesSupport.java

@@ -116,8 +116,8 @@ public void exec(Path executable, String[] args) {
         try (CTypeConversion.CCharPointerHolder pathHolder = CTypeConversion.toCString(executable.toString());
                         CTypeConversion.CCharPointerPointerHolder argvHolder = CTypeConversion.toCStrings(args)) {
             if (Unistd.execv(pathHolder.get(), argvHolder.get()) != 0) {
-                String msg = PosixUtils.lastErrorString("Executing " + executable + " with arguments " + String.join(" ", args) + " failed");
-                throw new RuntimeException(msg);
+                String errnoString = PosixUtils.strerrorErrno();
+                throw new RuntimeException(String.format("Executing %s with arguments %s failed: %s", executable, String.join(" ", args), errnoString));
             }
         }
     }
@@ -138,9 +138,9 @@ public void exec(Path executable, String[] args, Map<String, String> env) {
                         CTypeConversion.CCharPointerPointerHolder argvHolder = CTypeConversion.toCStrings(args);
                         CTypeConversion.CCharPointerPointerHolder envpHolder = CTypeConversion.toCStrings(envArray)) {
             if (Unistd.execve(pathHolder.get(), argvHolder.get(), envpHolder.get()) != 0) {
+                String errnoString = PosixUtils.strerrorErrno();
                 String envString = env.entrySet().stream().map(e -> e.getKey() + "=" + e.getValue()).collect(Collectors.joining(" "));
-                String msg = PosixUtils.lastErrorString("Executing " + executable + " with arguments " + String.join(" ", args) + " and environment " + envString + " failed");
-                throw new RuntimeException(msg);
+                throw new RuntimeException(String.format("Executing %s with arguments %s and environment %s failed: %s", executable, String.join(" ", args), envString, errnoString));
             }
         }
     }

substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixSignalHandlerSupport.java

@@ -24,11 +24,11 @@
  */
 package com.oracle.svm.core.posix;
 
-import static com.oracle.svm.guest.staging.Uninterruptible.CALLED_FROM_UNINTERRUPTIBLE_CODE;
 import static com.oracle.svm.core.jdk.Target_jdk_internal_misc_Signal.Constants.DEFAULT_HANDLER;
 import static com.oracle.svm.core.jdk.Target_jdk_internal_misc_Signal.Constants.DISPATCH_HANDLER;
 import static com.oracle.svm.core.jdk.Target_jdk_internal_misc_Signal.Constants.ERROR_HANDLER;
 import static com.oracle.svm.core.jdk.Target_jdk_internal_misc_Signal.Constants.IGNORE_HANDLER;
+import static com.oracle.svm.guest.staging.Uninterruptible.CALLED_FROM_UNINTERRUPTIBLE_CODE;
 
 import java.util.HashMap;
 import java.util.List;
@@ -50,7 +50,6 @@
 
 import com.oracle.svm.core.SubstrateOptions;
 import com.oracle.svm.core.SubstrateOptions.ConcealedOptions;
-import com.oracle.svm.guest.staging.Uninterruptible;
 import com.oracle.svm.core.c.CGlobalData;
 import com.oracle.svm.core.c.CGlobalDataFactory;
 import com.oracle.svm.core.c.function.CEntryPointOptions;
@@ -69,7 +68,6 @@
 import com.oracle.svm.core.log.Log;
 import com.oracle.svm.core.monitor.MonitorSupport;
 import com.oracle.svm.core.posix.headers.CSunMiscSignal;
-import com.oracle.svm.core.posix.headers.Errno;
 import com.oracle.svm.core.posix.headers.Signal;
 import com.oracle.svm.core.posix.headers.Signal.SignalDispatcher;
 import com.oracle.svm.core.posix.headers.Signal.SignalEnum;
@@ -82,6 +80,7 @@
 import com.oracle.svm.shared.singletons.traits.SingletonLayeredInstallationKind.InitialLayerOnly;
 import com.oracle.svm.shared.singletons.traits.SingletonTraits;
 import com.oracle.svm.core.util.VMError;
+import com.oracle.svm.guest.staging.Uninterruptible;
 
 import jdk.graal.compiler.api.replacements.Fold;
 
@@ -207,7 +206,7 @@ private void ensureInitialized() throws IllegalArgumentException {
             throw new IllegalArgumentException("Java signal handler mechanism is already used by another isolate.");
         } else {
             int errno = LibC.errno();
-            Log.log().string("CSunMiscSignal.open() failed.").string("  errno: ").signed(errno).string("  ").string(Errno.strerror(errno)).newline();
+            Log.log().string("CSunMiscSignal.open() failed.").string("  errno: ").signed(errno).string("  ").string(PosixUtils.strerror(errno)).newline();
             throw VMError.shouldNotReachHere("CSunMiscSignal.open() failed.");
         }
     }

substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/PosixUtils.java

@@ -80,19 +80,23 @@ public static void setFD(FileDescriptor descriptor, int fd) {
         SubstrateUtil.cast(descriptor, Target_java_io_FileDescriptor.class).fd = fd;
     }
 
-    /** Return the error string for the last error, or a default message. */
-    public static String lastErrorString(String defaultMsg) {
+    public static String strerrorErrno() {
         int errno = LibC.errno();
-        return errorString(errno, defaultMsg);
+        return strerror(errno);
     }
 
-    /** Return the error string for the given error number, or a default message. */
-    public static String errorString(int errno, String defaultMsg) {
-        String result = "";
-        if (errno != 0) {
-            result = CTypeConversion.toJavaString(Errno.strerror(errno));
+    public static String strerror(int errno) {
+        UnsignedWord size = Word.unsigned(1024);
+        CCharPointer buf = NullableNativeMemory.malloc(size, NmtCategory.Internal);
+        if (buf.isNull()) {
+            return "[could not allocate memory for error string]";
+        }
+        try {
+            CCharPointer cstr = Errno.strerror_r(errno, buf, size);
+            return CTypeConversion.toJavaString(cstr);
+        } finally {
+            NullableNativeMemory.free(buf);
         }
-        return result.length() != 0 ? result : defaultMsg;
     }
 
     public static int getpid() {

substratevm/src/com.oracle.svm.core.posix/src/com/oracle/svm/core/posix/headers/Errno.java

@@ -28,6 +28,7 @@
 import org.graalvm.nativeimage.c.constant.CConstant;
 import org.graalvm.nativeimage.c.function.CFunction;
 import org.graalvm.nativeimage.c.type.CCharPointer;
+import org.graalvm.word.UnsignedWord;
 
 // Checkstyle: stop
 
@@ -65,5 +66,5 @@ public class Errno {
     public static native int EINVAL();
 
     @CFunction
-    public static native CCharPointer strerror(int errnum);
+    public static native CCharPointer strerror_r(int errnum, CCharPointer buf, UnsignedWord size);
 }

substratevm/src/com.oracle.svm.core.windows/src/com/oracle/svm/core/windows/headers/WindowsLibC.java

@@ -77,12 +77,6 @@ public class WindowsLibC {
     @CFunction(transition = CFunction.Transition.NO_TRANSITION)
     public static native int strcmp(PointerBase s1, PointerBase s2);
 
-    @CFunction(transition = CFunction.Transition.NO_TRANSITION)
-    public static native CCharPointer strcpy(CCharPointer dst, CCharPointer src);
-
-    @CFunction(transition = CFunction.Transition.NO_TRANSITION)
-    public static native CCharPointer strncpy(CCharPointer dst, CCharPointer src, UnsignedWord len);
-
     @CFunction(value = "_strdup", transition = CFunction.Transition.NO_TRANSITION)
     public static native CCharPointer strdup(CCharPointer src);