Parse PYTHONHASHSEED using OptionType

Author: msimacek

graalpython/com.oracle.graal.python.cext/src/traceback.c

@@ -50,5 +50,5 @@ int PyTraceBack_Here(PyFrameObject *frame) {
 
 UPCALL_ID(_PyTraceback_Add)
 void _PyTraceback_Add(const char *funcname, const char *filename, int lineno) {
-    return UPCALL_CEXT_VOID(_jls__PyTraceback_Add, polyglot_from_string(funcname, SRC_CS), polyglot_from_string(filename, SRC_CS), lineno);
+    UPCALL_CEXT_VOID(_jls__PyTraceback_Add, polyglot_from_string(funcname, SRC_CS), polyglot_from_string(filename, SRC_CS), lineno);
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java

@@ -48,6 +48,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentSkipListMap;
@@ -1287,30 +1288,26 @@ private void setupRuntimeInformation(boolean isPatching) {
     }
 
     private void initializeHashSecret() {
-        String hashSeed = getOption(PythonOptions.HashSeed);
-        if (hashSeed.equals("random")) {
-            getSecureRandom().nextBytes(hashSecret);
-        } else {
-            try {
-                long hashSeedValue = Long.parseLong(hashSeed);
-                if (hashSeedValue < 0 || hashSeedValue > 4294967295L) {
-                    throw new NumberFormatException();
-                }
-                // 0 disables the option, leaving the secret at 0
-                if (hashSeedValue != 0) {
-                    // Generate the whole secret from the seed number the same way as CPython
-                    // Taken from bootstrap_hash.c:lcg_urandom
-                    int x = (int) hashSeedValue;
-                    for (int i = 0; i < hashSecret.length; i++) {
-                        x *= 214013;
-                        x += 2531011;
-                        /* modulo 2 ^ (8 * sizeof(int)) */
-                        hashSecret[i] = (byte) ((x >>> 16) & 0xff);
-                    }
+        assert !ImageInfo.inImageBuildtimeCode();
+        Optional<Integer> hashSeed = getOption(PythonOptions.HashSeed);
+        if (hashSeed.isPresent()) {
+            int hashSeedValue = hashSeed.get();
+            // 0 disables the option, leaving the secret at 0
+            if (hashSeedValue != 0) {
+                // Generate the whole secret from the seed number the same way as CPython
+                // Taken from bootstrap_hash.c:lcg_urandom
+                // hashSeedValue was parsed as unsigned integer
+                int x = hashSeedValue;
+                for (int i = 0; i < hashSecret.length; i++) {
+                    x *= 214013;
+                    x += 2531011;
+                    /* modulo 2 ^ (8 * sizeof(int)) */
+                    hashSecret[i] = (byte) ((x >>> 16) & 0xff);
                 }
-            } catch (NumberFormatException e) {
-                throw new RuntimeException("PYTHONHASHSEED must be \"random\" or an integer in range [0; 4294967295]");
             }
+        } else {
+            // Generate random seed
+            getSecureRandom().nextBytes(hashSecret);
         }
     }
 

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonOptions.java

@@ -35,6 +35,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import org.graalvm.options.OptionCategory;
 import org.graalvm.options.OptionDescriptor;
@@ -136,7 +137,17 @@ private PythonOptions() {
     public static final OptionKey<String> WarnOptions = new OptionKey<>("");
 
     @Option(category = OptionCategory.USER, help = "Equivalent to setting PYTHONHASHSEED environment variable", stability = OptionStability.STABLE) //
-    public static final OptionKey<String> HashSeed = new OptionKey<>("random");
+    public static final OptionKey<Optional<Integer>> HashSeed = new OptionKey<>(Optional.empty(),
+                    new OptionType<>("HashSeed", input -> {
+                        if ("random".equals(input)) {
+                            return Optional.empty();
+                        }
+                        try {
+                            return Optional.of(Integer.parseUnsignedInt(input));
+                        } catch (NumberFormatException e) {
+                            throw new IllegalArgumentException("PYTHONHASHSEED must be \"random\" or an integer in range [0; 4294967295]");
+                        }
+                    }));
 
     @EngineOption @Option(category = OptionCategory.USER, help = "Choose the backend for the POSIX module. Valid values are 'java', 'native', 'llvm'.") //
     public static final OptionKey<String> PosixModuleBackend = new OptionKey<>("java");