Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add testcases for cpu affinity and wait queue #2

Merged
merged 8 commits into from
Oct 17, 2024

Conversation

hky1999
Copy link
Contributor

@hky1999 hky1999 commented Oct 14, 2024

No description provided.

rust/task/affinity/Cargo.toml Outdated Show resolved Hide resolved
rust/task/affinity/src/main.rs Outdated Show resolved Hide resolved
rust/task/wait_queue/src/main.rs Outdated Show resolved Hide resolved
equation314
equation314 previously approved these changes Oct 17, 2024
@hky1999
Copy link
Contributor Author

hky1999 commented Oct 17, 2024

I am going to revert changes made to https://github.com/arceos-org/arceos-apps/pull/2/files#diff-49f1cdcb59bb6689997e8ca6bf258ecef6a2ccb355b1f4dcca1af1765cb8013b, which will cause ci failures.

@equation314

After we merge PR arceos-org/arceos#183 from ArceOS, we'll have to rerun ci here

@equation314
Copy link
Member

I am going to revert changes made to https://github.com/arceos-org/arceos-apps/pull/2/files#diff-49f1cdcb59bb6689997e8ca6bf258ecef6a2ccb355b1f4dcca1af1765cb8013b, which will cause ci failures.

@equation314

After we merge PR arceos-org/arceos#183 from ArceOS, we'll have to rerun ci here

After the CI pass, we need to revert ArceOS branch to `main‘ and wait for ArceOS's update, then rerun the CI.

@hky1999
Copy link
Contributor Author

hky1999 commented Oct 17, 2024

I am going to revert changes made to https://github.com/arceos-org/arceos-apps/pull/2/files#diff-49f1cdcb59bb6689997e8ca6bf258ecef6a2ccb355b1f4dcca1af1765cb8013b, which will cause ci failures.
@equation314
After we merge PR arceos-org/arceos#183 from ArceOS, we'll have to rerun ci here

After the CI pass, we need to revert ArceOS branch to `main‘ and wait for ArceOS's update, then rerun the CI.

I do not get it, the CI has already passed.. right?

@equation314
Copy link
Member

We want to keep ArceOS branch in get_deps.sh main. But if we do it, the CI will temporarily fail before arceos-org/arceos#183 was merged.

@hky1999
Copy link
Contributor Author

hky1999 commented Oct 17, 2024

We want to keep ArceOS branch in get_deps.sh main. But if we do it, the CI will temporarily fail before arceos-org/arceos#183 was merged.

Yep, my opinion is that we can just revert ArceOS branch in get_deps.sh as main in this PR (althrough CI will temporarily fail here), and rerun CI here (after this PR is merged) after arceos-org/arceos#183 is merged.

@equation314
Copy link
Member

Yes, we're talking about one thing.

@hky1999
Copy link
Contributor Author

hky1999 commented Oct 17, 2024

Yes, we're talking about one thing.

reverted in commit [warn] revert arceos branch in get_deps.sh as main, which will cause … should we use a squash here or I combine the commits manually

@equation314 equation314 merged commit da1caa5 into main Oct 17, 2024
12 of 24 checks passed
@equation314 equation314 deleted the affinity_waitqueue branch October 17, 2024 23:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants