fix: update usertest cases and workflow.yml

Author: Ivans-11

.github/workflows/workflow.yml

@@ -71,5 +71,5 @@ jobs:
 
       - name: Run exercise in QEMU and check output (ch${{ matrix.ch }})
         run: |
-          timeout 3m cargo qemu --ch ${{ matrix.ch }} --exercise --nobios --ci 2>&1 \
+          timeout 6m cargo qemu --ch ${{ matrix.ch }} --exercise --nobios --ci 2>&1 \
             | python3 checker/check/ch${{ matrix.ch }}.py

user/src/bin/ch8_deadlock_sem1.rs

@@ -94,7 +94,7 @@ extern "C" fn main() -> i32 {
     let mut tids = [0usize; THREAD_N];
 
     for i in 0..THREAD_N {
-        tids[i] = thread_create(deadlock_test as usize, 0) as usize;
+        tids[i] = thread_create(deadlock_test as *const () as usize, 0) as usize;
     }
 
     sleep(500);

user/src/bin/ch8_deadlock_sem2.rs

@@ -54,7 +54,7 @@ extern "C" fn main() -> i32 {
     let mut tids = [0usize; THREAD_N];
 
     for i in 0..THREAD_N {
-        tids[i] = thread_create(deadlock_test as usize, i) as usize;
+        tids[i] = thread_create(deadlock_test as *const () as usize, i) as usize;
     }
 
     sleep(1000);

user/src/bin/mpsc_sem.rs

@@ -59,11 +59,11 @@ pub extern "C" fn main() -> i32 {
     let mut threads = Vec::new();
     for i in 0..PRODUCER_COUNT {
         threads.push(thread_create(
-            producer as usize,
+            producer as *const () as usize,
             &ids.as_slice()[i] as *const _ as usize,
         ));
     }
-    threads.push(thread_create(consumer as usize, 0));
+    threads.push(thread_create(consumer as *const () as usize, 0));
     // wait for all threads to complete
     for thread in threads.iter() {
         waittid(*thread as usize);

user/src/bin/phil_din_mutex.rs

@@ -72,7 +72,7 @@ pub extern "C" fn main() -> i32 {
     for i in 0..N {
         assert_eq!(mutex_create(true), i as isize);
         v.push(thread_create(
-            philosopher_dining_problem as usize,
+            philosopher_dining_problem as *const () as usize,
             &ids.as_slice()[i] as *const _ as usize,
         ));
     }

user/src/bin/race_adder_mutex_blocking.rs

@@ -36,7 +36,7 @@ pub extern "C" fn main() -> i32 {
     assert_eq!(mutex_create(true), 0);
     let mut v = Vec::new();
     for _ in 0..THREAD_COUNT {
-        v.push(thread_create(f as usize, 0) as usize);
+        v.push(thread_create(f as *const () as usize, 0) as usize);
     }
     let mut time_cost = Vec::new();
     for tid in v.iter() {

user/src/bin/sync_sem.rs

@@ -33,8 +33,8 @@ pub extern "C" fn main() -> i32 {
     assert_eq!(semaphore_create(0) as usize, SEM_SYNC);
     // create threads
     let threads = vec![
-        thread_create(first as usize, 0),
-        thread_create(second as usize, 0),
+        thread_create(first as *const () as usize, 0),
+        thread_create(second as *const () as usize, 0),
     ];
     // wait for all threads to complete
     for thread in threads.iter() {

user/src/bin/test_condvar.rs

@@ -49,8 +49,8 @@ pub extern "C" fn main() -> i32 {
     assert_eq!(mutex_create(true) as usize, MUTEX_ID);
     // create threads
     let threads = vec![
-        thread_create(first as usize, 0),
-        thread_create(second as usize, 0),
+        thread_create(first as *const () as usize, 0),
+        thread_create(second as *const () as usize, 0),
     ];
     // wait for all threads to complete
     for thread in threads.iter() {

user/src/bin/threads.rs

@@ -32,15 +32,15 @@ pub fn thread_c() -> isize {
 #[no_mangle]
 pub extern "C" fn main() -> i32 {
     let mut v = vec![
-        thread_create(thread_a as usize, 0),
-        thread_create(thread_b as usize, 0),
-        thread_create(thread_c as usize, 0),
+        thread_create(thread_a as *const () as usize, 0),
+        thread_create(thread_b as *const () as usize, 0),
+        thread_create(thread_c as *const () as usize, 0),
     ];
     println!("v :{:?}", v);
     let max_len = 5;
     for i in 0..max_len {
         println!("create tid: {}", i + 4);
-        let tid = thread_create(thread_b as usize, 0);
+        let tid = thread_create(thread_b as *const () as usize, 0);
         println!("create tid: {} end", i + 4);
         v.push(tid);
     }

user/src/bin/threads_arg.rs

@@ -31,7 +31,7 @@ pub extern "C" fn main() -> i32 {
     ];
     for arg in args.iter() {
         v.push(thread_create(
-            thread_print as usize,
+            thread_print as *const () as usize,
             arg as *const _ as usize,
         ));
     }