Merge branch 'master' into griffin/improve/add-comments-5

Author: Chronostasys

.github/workflows/test.yml

@@ -142,7 +142,7 @@ jobs:
           args: nextest --workspace --all-features --lcov --output-path lcov.info --profile ci -vv
 
       - name: Upload coverage to Codecov
-        uses: codecov/[email protected].4
+        uses: codecov/[email protected].5
         with:
           token: ${{ secrets.CODE_COV }}
           files: lcov.info

Cargo.lock

@@ -10,3 +10,4 @@ use std::libc;
 use std::buf;
 use std::err;
 use std::thread;
+use std::rand;

planglib/std/__private.pi

@@ -15,3 +15,10 @@ const O_CREAT:i32;
 
 
 pub fn LibC__memcpy(dest:*u8, src:*u8, n:u64) *u8;
+
+/// `buf`: `*u8` - buffer to fill with random data  
+/// `buflen`: `u64` - length of buffer(in bytes)  
+/// `flags`: `u32` - flags to pass to getrandom syscall  
+///  - `0`: `GRND_RANDOM` - use /dev/random  
+///  - `1`: `GRND_NONBLOCK` - return EAGAIN if not enough entropy
+pub fn LibC__getrandom(buf:*u8, buflen:u64, flags:u32) i64;

planglib/std/libc.pi

@@ -0,0 +1,24 @@
+use std::libc::*;
+use core::panic;
+pub fn randi64() i64 {
+    let ret = 0;
+    let ptr = unsafe_cast<u8>(&ret);
+    // 生成的随机数存储在ptr，8 bytes，使用/dev/random
+    // 0阻塞，1非阻塞
+    LibC__getrandom(ptr, 8 as u64, 0 as u32);
+    return ret;
+}
+
+/// 生成 `[0, max)` 的随机数，`max` 必须大于 `0`，否则 `panic`
+pub fn randi64n(max: i64) i64 {
+    panic::assert(max > 0);
+    let ret = (randi64() as u64) % (max as u64);
+    return ret as i64;
+}
+
+/// 生成 `[min, max)` 的随机数，`min` 必须小于 `max`，否则 `panic`
+pub fn randi64r(min: i64, max: i64) i64 {
+    panic::assert(min < max);
+    let ret = randi64n(max - min) + min;
+    return ret;
+}

planglib/std/rand.pi

@@ -30,6 +30,7 @@ use std::io;
 use std::cols::hashtable;
 use project1::test::inference;
 use project1::test::futuretest;
+use project1::test::rand;
 
 use core::hash::pl_hash::*;
 // use std::cols::hashtable::new_hash_table;

test/main.pi

@@ -0,0 +1,9 @@
+use std::rand::*;
+use core::panic::*;
+pub fn test_rand() void {
+    let r1 = randi64n(5);
+    assert(r1 >= 0 && r1 < 5);
+    let r2 = randi64r(2, 9);
+    assert(r2 >= 2 && r2 < 9);
+    return;
+}

test/test/rand.pi

@@ -14,6 +14,8 @@ log = { version = "0.4", features = ["std"] }
 libc = "0.2"
 bytecount = "0.6.3"
 context = "3.0.0"
+[target.'cfg(windows)'.dependencies]
+winapi = { version = "0.3", features = ["winuser", "wincrypt"] }
 
 [dev-dependencies]
 rand = "0.8"

vm/Cargo.toml

@@ -1,6 +1,7 @@
 #![allow(clippy::useless_conversion)]
 use std::ffi::CString;
-
+#[cfg(target_os = "windows")]
+extern crate winapi;
 use internal_macro::is_runtime;
 
 struct LibC {}
@@ -87,4 +88,73 @@ impl LibC {
     ) -> *mut libc::c_void {
         unsafe { libc::memcpy(dest, src, n) }
     }
+
+    fn getrandom(
+        buf: *mut libc::c_void,
+        buflen: libc::size_t,
+        flags: libc::c_uint,
+    ) -> libc::ssize_t {
+        getrandom_inner(buf, buflen, flags)
+    }
+}
+
+#[cfg(target_os = "linux")]
+fn getrandom_inner(
+    buf: *mut libc::c_void,
+    buflen: libc::size_t,
+    flags: libc::c_uint,
+) -> libc::ssize_t {
+    unsafe { libc::syscall(libc::SYS_getrandom, buf, buflen, flags) as libc::ssize_t }
+}
+
+#[cfg(target_os = "macos")]
+extern "C" {
+    // Supported as of macOS 10.12+.
+    fn getentropy(buf: *mut u8, size: libc::size_t) -> libc::c_int;
+}
+#[cfg(target_os = "macos")]
+fn getrandom_inner(
+    buf: *mut libc::c_void,
+    buflen: libc::size_t,
+    _flags: libc::c_uint,
+) -> libc::ssize_t {
+    unsafe {
+        if getentropy(buf as *mut u8, buflen) == 0 {
+            return buflen as libc::ssize_t;
+        } else {
+            return -1;
+        }
+    }
+}
+
+#[cfg(target_os = "windows")]
+fn getrandom_inner(
+    buf: *mut libc::c_void,
+    buflen: libc::size_t,
+    _flags: libc::c_uint,
+) -> libc::ssize_t {
+    use core::ptr::null_mut;
+    use winapi::um::wincrypt::{
+        CryptAcquireContextA, CryptGenRandom, CryptReleaseContext, CRYPT_VERIFYCONTEXT, HCRYPTPROV,
+        PROV_RSA_FULL,
+    };
+    let mut hcryptprov: HCRYPTPROV = 0;
+    unsafe {
+        if CryptAcquireContextA(
+            &mut hcryptprov,
+            null_mut(),
+            null_mut(),
+            PROV_RSA_FULL,
+            CRYPT_VERIFYCONTEXT,
+        ) == 0
+        {
+            return -1;
+        }
+        if CryptGenRandom(hcryptprov, buflen as u32, buf as *mut u8) == 0 {
+            CryptReleaseContext(hcryptprov, 0);
+            return -1;
+        }
+        CryptReleaseContext(hcryptprov, 0);
+    }
+    0
 }