test: add more tests #1

HoshimiP · 2025-12-12T13:25:51Z

adjust linker script to ensure tests run

AsakuraMizu · 2025-12-13T15:31:16Z

Let me fix the CI issue first.

AsakuraMizu · 2025-12-13T15:44:08Z

percpu.x

    _percpu_start = .;
    _percpu_end = _percpu_start + SIZEOF(.percpu);
-    .percpu 0x0 (NOLOAD) : AT(_percpu_start) {
+    .percpu (NOLOAD) : AT(_percpu_start) {


Does it also fix issues like arceos-org/percpu#5 and arceos-org/percpu#12? If so, you may also contribute it to percpu.

This change would make the load address no longer 0x0, which causes the assertions in the tests to fail. The corresponding tests would also need to be adjusted.

I see. You may adjust the test codes accordingly.

AsakuraMizu

I like the threading and panic::catch_unwind part. Though there are still issues:

There is some overlap with existing tests; let's merge them.
What is the purpose of serial_test? If it's due to data conflicts, please isolate the data used by the test cases.

AsakuraMizu · 2025-12-14T06:20:21Z

tests/tests.rs

+
+#[allow(dead_code)]
+struct Counter {
+    id: usize,


What's the purpose of id?

AsakuraMizu · 2025-12-14T06:21:29Z

tests/tests.rs

+}
+
+scope_local! {
+    static COUNTER: Arc<Counter> = Arc::new(Counter{id: 0});


What's the purpose of Arc?

I guess you may want to use an Arc<AtomicUsize>?

Copilot

Pull request overview

This PR enhances test coverage for scope-local functionality by adding three new test scenarios and fixes a linker script issue to ensure tests run properly. The changes add comprehensive testing for multi-threading, panic handling, thread isolation, and nested scope behavior.

Key Changes:

Added multi-threading and panic recovery tests to the existing shared test
Introduced new isolation test to verify thread-local scope independence
Added new nested test to verify scope stacking behavior
Fixed linker script by removing explicit 0x0 VMA address from .percpu section

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.

File	Description
tests/scope_local.rs	Adds `panic` and `thread` imports, extends `shared` test with multi-threading and panic scenarios, adds `isolation` and `nested` test functions to verify thread safety and scope nesting
percpu.x	Removes explicit `0x0` VMA address from `.percpu` section definition to allow relative positioning and ensure tests run correctly

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2025-12-17T12:07:13Z

tests/scope_local.rs


    assert_eq!(Arc::strong_count(&SHARED), 1);
+
+    let handles: Vec<_> = (0..9)


The range 0..9 creates 9 threads, which appears inconsistent with the isolation test that uses 0..10 for 10 threads. Consider using 0..10 here as well for consistency, or document why 9 threads is the intended count.

AsakuraMizu · 2025-12-17T15:29:05Z

tests/scope_local.rs

+
+                ActiveScope::set_global();


Remove this line? I remember percpu delegates to thread local if target_os = "linux"

Removing this line will cause a SIGSEGV

Removing this line will cause a SIGSEGV

That's strange, and may indicate a bug in our design.

AsakuraMizu · 2025-12-17T15:31:19Z

tests/scope_local.rs

+}
+
+#[test]
+fn isolation() {


Consider adding a test that multiple threads share one scope?

AsakuraMizu · 2025-12-20T07:33:33Z

I tested it several times locally and found the results to be unstable. This is likely related to an issue with percpu. Let's see if arceos-org/percpu#16 fixes it.

AsakuraMizu · 2025-12-20T07:36:05Z

tests/scope_local.rs

+
+    let handles: Vec<_> = (0..10)
+        .map(|_| {
+            thread::spawn(move || {
+                let mut scope = Scope::new();
+                *SHARED.scope_mut(&mut scope) = SHARED.clone();
+                assert!(Arc::strong_count(&SHARED) >= 2);
+            })
+        })
+        .collect();
+
+    for h in handles {
+        h.join().unwrap();
+    }
+
+    assert_eq!(Arc::strong_count(&SHARED), 1);
+
+    {
+        let mut scope = Scope::new();
+        *SHARED.scope_mut(&mut scope) = SHARED.clone();
+        let scope = Arc::new(scope);
+
+        let handles: Vec<_> = (0..10)
+            .map(|_| {
+                let scope = scope.clone();
+                thread::spawn(move || {
+                    unsafe { ActiveScope::set(&scope) };
+                    assert_eq!(Arc::strong_count(&SHARED), 2);
+                    assert_eq!(*SHARED, Arc::new("qwq".to_string()));
+                    ActiveScope::set_global();
+                })
+            })
+            .collect();
+
+        for h in handles {
+            h.join().unwrap();
+        }
+    }
+
+    assert_eq!(Arc::strong_count(&SHARED), 1);
+
+    let panic = panic::catch_unwind(|| {
+        let mut scope = Scope::new();
+        *SHARED.scope_mut(&mut scope) = SHARED.clone();
+        panic!("panic");
+    });
+    assert!(panic.is_err());
+
+    assert_eq!(Arc::strong_count(&SHARED), 1);


This test function is too large now. Let's break it down.

AsakuraMizu · 2025-12-20T17:14:48Z

Waiting for percpu to release a new version.

HoshimiP added 2 commits December 12, 2025 18:39

test: add more tests

e3c2658

test: correct drop count

70c7870

HoshimiP had a problem deploying to github-pages December 12, 2025 18:00 — with GitHub Actions Failure

AsakuraMizu reviewed Dec 13, 2025

View reviewed changes

AsakuraMizu requested changes Dec 14, 2025

View reviewed changes

test: format and split

5c00501

HoshimiP force-pushed the main branch 2 times, most recently from 14e03dc to 043a26c Compare December 17, 2025 09:31

AsakuraMizu requested review from AsakuraMizu and Copilot December 17, 2025 12:04

Copilot started reviewing on behalf of AsakuraMizu December 17, 2025 12:04 View session

Copilot AI reviewed Dec 17, 2025

View reviewed changes

use strong_count and merge

5a2ba55

HoshimiP force-pushed the main branch from 043a26c to 5a2ba55 Compare December 17, 2025 14:56

AsakuraMizu reviewed Dec 17, 2025

View reviewed changes

add a test for multiple threads share one scope

bad41d8

HoshimiP force-pushed the main branch from b7e8676 to bad41d8 Compare December 17, 2025 17:03

AsakuraMizu reviewed Dec 20, 2025

View reviewed changes

HoshimiP added 2 commits December 20, 2025 18:59

split test shared

c9a8842

data isolate

370dd0e

HoshimiP force-pushed the main branch from 216d4cb to 370dd0e Compare December 20, 2025 15:45


		assert_eq!(Arc::strong_count(&SHARED), 1);

		let handles: Vec<_> = (0..9)

test: add more tests #1

Are you sure you want to change the base?

test: add more tests #1

Uh oh!

Conversation

HoshimiP commented Dec 12, 2025

Uh oh!

AsakuraMizu commented Dec 13, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

AsakuraMizu left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Dec 17, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

AsakuraMizu commented Dec 20, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

AsakuraMizu commented Dec 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants