michaelkuc6/blog_os
1
0
Fork 0
mirror of https://github.com/phil-opp/blog_os.git synced 2025-12-16 22:37:49 +00:00
Code Issues Projects Releases Wiki Activity

Update to crossbeam-queue v0.3.11

Browse Source
This commit is contained in:
Philipp Oppermann
2024-05-30 11:03:30 +02:00
parent a2ca911f4e
commit df2c149e79
4 changed files with 9 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Cargo.lock generated
View File

@@ -44,12 +44,6 @@ version = "0.9.29"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "365861702868e2a37b4247aaecc7bd8f4389baec8d025497ad8ba7ff37ee9440" checksum = "365861702868e2a37b4247aaecc7bd8f4389baec8d025497ad8ba7ff37ee9440"
[[package]]
name = "cfg-if"
version = "0.1.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
[[package]] [[package]]
name = "conquer-once" name = "conquer-once"
version = "0.2.1" version = "0.2.1"
@@ -67,24 +61,18 @@ checksum = "654fb2472cc369d311c547103a1fa81d467bef370ae7a0680f65939895b1182a"
[[package]] [[package]]
name = "crossbeam-queue" name = "crossbeam-queue"
version = "0.2.3" version = "0.3.11"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
dependencies = [ dependencies = [
"cfg-if",
"crossbeam-utils", "crossbeam-utils",
"maybe-uninit",
] ]
[[package]] [[package]]
name = "crossbeam-utils" name = "crossbeam-utils"
version = "0.7.2" version = "0.8.20"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
dependencies = [
"autocfg",
"cfg-if",
]
[[package]] [[package]]
name = "futures-core" name = "futures-core"
@@ -138,12 +126,6 @@ dependencies = [
"scopeguard", "scopeguard",
] ]
[[package]]
name = "maybe-uninit"
version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
[[package]] [[package]]
name = "pc-keyboard" name = "pc-keyboard"
version = "0.7.0" version = "0.7.0"

2
Cargo.toml
View File

@@ -27,7 +27,7 @@ version = "1.0"
features = ["spin_no_std"] features = ["spin_no_std"]
[dependencies.crossbeam-queue] [dependencies.crossbeam-queue]
version = "0.2.1" version = "0.3.11"
default-features = false default-features = false
features = ["alloc"] features = ["alloc"]

2
src/task/executor.rs
View File

@@ -41,7 +41,7 @@ impl Executor {
waker_cache, waker_cache,
} = self; } = self;
while let Ok(task_id) = task_queue.pop() { while let Some(task_id) = task_queue.pop() {
let task = match tasks.get_mut(&task_id) { let task = match tasks.get_mut(&task_id) {
Some(task) => task, Some(task) => task,
None => continue, // task no longer exists None => continue, // task no longer exists

6
src/task/keyboard.rs
View File

@@ -51,17 +51,17 @@ impl Stream for ScancodeStream {
.expect("scancode queue not initialized"); .expect("scancode queue not initialized");
// fast path // fast path
if let Ok(scancode) = queue.pop() { if let Some(scancode) = queue.pop() {
return Poll::Ready(Some(scancode)); return Poll::Ready(Some(scancode));
} }
WAKER.register(&cx.waker()); WAKER.register(&cx.waker());
match queue.pop() { match queue.pop() {
Ok(scancode) => { Some(scancode) => {
WAKER.take(); WAKER.take();
Poll::Ready(Some(scancode)) Poll::Ready(Some(scancode))
} }
Err(crossbeam_queue::PopError) => Poll::Pending, None => Poll::Pending,
} }
} }
} }