From 24a6606dd961e6cea68d71c1b26d39545566e06d Mon Sep 17 00:00:00 2001 From: wyfcyx Date: Wed, 8 Feb 2023 03:17:12 +0000 Subject: [PATCH] deploy: 5fe234d2d20ca64a46ea838051140235be3f4900 --- main/os/task/id/fn.trap_cx_bottom_from_tid.html | 2 +- main/os/task/id/fn.ustack_bottom_from_tid.html | 2 +- main/os/task/id/index.html | 2 +- main/os/task/id/struct.KernelStack.html | 2 +- main/os/task/id/struct.TaskUserRes.html | 4 ++-- main/src/os/drivers/block/virtio_blk.rs.html | 2 +- main/src/os/drivers/gpu/mod.rs.html | 4 ++-- main/src/os/drivers/mod.rs.html | 3 ++- main/src/os/task/id.rs.html | 2 ++ 9 files changed, 13 insertions(+), 10 deletions(-) diff --git a/main/os/task/id/fn.trap_cx_bottom_from_tid.html b/main/os/task/id/fn.trap_cx_bottom_from_tid.html index 9ba11c29..1aef566c 100644 --- a/main/os/task/id/fn.trap_cx_bottom_from_tid.html +++ b/main/os/task/id/fn.trap_cx_bottom_from_tid.html @@ -1 +1 @@ -trap_cx_bottom_from_tid in os::task::id - Rust

Function os::task::id::trap_cx_bottom_from_tid

source · [−]
fn trap_cx_bottom_from_tid(tid: usize) -> usize
\ No newline at end of file +trap_cx_bottom_from_tid in os::task::id - Rust

Function os::task::id::trap_cx_bottom_from_tid

source · [−]
fn trap_cx_bottom_from_tid(tid: usize) -> usize
\ No newline at end of file diff --git a/main/os/task/id/fn.ustack_bottom_from_tid.html b/main/os/task/id/fn.ustack_bottom_from_tid.html index 4df9810f..9b4a0f5f 100644 --- a/main/os/task/id/fn.ustack_bottom_from_tid.html +++ b/main/os/task/id/fn.ustack_bottom_from_tid.html @@ -1 +1 @@ -ustack_bottom_from_tid in os::task::id - Rust

Function os::task::id::ustack_bottom_from_tid

source · [−]
fn ustack_bottom_from_tid(ustack_base: usize, tid: usize) -> usize
\ No newline at end of file +ustack_bottom_from_tid in os::task::id - Rust

Function os::task::id::ustack_bottom_from_tid

source · [−]
fn ustack_bottom_from_tid(ustack_base: usize, tid: usize) -> usize
\ No newline at end of file diff --git a/main/os/task/id/index.html b/main/os/task/id/index.html index af42184d..c870d4ef 100644 --- a/main/os/task/id/index.html +++ b/main/os/task/id/index.html @@ -1,2 +1,2 @@ -os::task::id - Rust

Module os::task::id

source · [−]

Structs

KSTACK_ALLOCATOR 🔒
KernelStack
PID_ALLOCATOR 🔒
PidHandle
RecycleAllocator
TaskUserRes

Constants

IDLE_PID

Functions

kernel_stack_position

Return (bottom, top) of a kernel stack in kernel space.

+os::task::id - Rust

Module os::task::id

source · [−]

Structs

KSTACK_ALLOCATOR 🔒
KernelStack
PID_ALLOCATOR 🔒
PidHandle
RecycleAllocator
TaskUserRes

Constants

IDLE_PID

Functions

kernel_stack_position

Return (bottom, top) of a kernel stack in kernel space.

kstack_alloc
pid_alloc
trap_cx_bottom_from_tid 🔒
ustack_bottom_from_tid 🔒
\ No newline at end of file diff --git a/main/os/task/id/struct.KernelStack.html b/main/os/task/id/struct.KernelStack.html index b8ccb25e..0ab4d061 100644 --- a/main/os/task/id/struct.KernelStack.html +++ b/main/os/task/id/struct.KernelStack.html @@ -1,4 +1,4 @@ -KernelStack in os::task::id - Rust

Struct os::task::id::KernelStack

source · [−]
pub struct KernelStack(pub usize);

Tuple Fields

0: usize

Implementations

Trait Implementations

Executes the destructor for this type. Read more

+KernelStack in os::task::id - Rust

Struct os::task::id::KernelStack

source · [−]
pub struct KernelStack(pub usize);

Tuple Fields

0: usize

Implementations

Trait Implementations

Executes the destructor for this type. Read more

Auto Trait Implementations

Blanket Implementations

Gets the TypeId of self. Read more

Casts the value.

Immutably borrows from an owned value. Read more

diff --git a/main/os/task/id/struct.TaskUserRes.html b/main/os/task/id/struct.TaskUserRes.html index 895778ea..5131c70e 100644 --- a/main/os/task/id/struct.TaskUserRes.html +++ b/main/os/task/id/struct.TaskUserRes.html @@ -1,8 +1,8 @@ -TaskUserRes in os::task::id - Rust

Struct os::task::id::TaskUserRes

source · [−]
pub struct TaskUserRes {
+TaskUserRes in os::task::id - Rust
Struct os::task::id::TaskUserRes
source · [−]
pub struct TaskUserRes {
     pub tid: usize,
     pub ustack_base: usize,
     pub process: Weak<ProcessControlBlock>,
-}
Fields
tid: usizeustack_base: usizeprocess: Weak<ProcessControlBlock>
Implementations
Trait Implementations
Executes the destructor for this type. Read more

+}

Fields

tid: usizeustack_base: usizeprocess: Weak<ProcessControlBlock>

Implementations

Trait Implementations

Executes the destructor for this type. Read more

Auto Trait Implementations

Blanket Implementations

Gets the TypeId of self. Read more

Casts the value.

Immutably borrows from an owned value. Read more

diff --git a/main/src/os/drivers/block/virtio_blk.rs.html b/main/src/os/drivers/block/virtio_blk.rs.html index 02dfbf26..f7e722a9 100644 --- a/main/src/os/drivers/block/virtio_blk.rs.html +++ b/main/src/os/drivers/block/virtio_blk.rs.html @@ -86,12 +86,12 @@ 86 87 
use super::BlockDevice;
-use crate::drivers::bus::virtio::VirtioHal;
 use crate::sync::{Condvar, UPIntrFreeCell};
 use crate::task::schedule;
 use crate::DEV_NON_BLOCKING_ACCESS;
 use alloc::collections::BTreeMap;
 use virtio_drivers::{BlkResp, RespStatus, VirtIOBlk, VirtIOHeader};
+use crate::drivers::bus::virtio::VirtioHal;
 
 #[allow(unused)]
 const VIRTIO0: usize = 0x10008000;
diff --git a/main/src/os/drivers/gpu/mod.rs.html b/main/src/os/drivers/gpu/mod.rs.html
index 56175a79..5ce52ea4 100644
--- a/main/src/os/drivers/gpu/mod.rs.html
+++ b/main/src/os/drivers/gpu/mod.rs.html
@@ -66,13 +66,13 @@
 66
 67
 68
-
use crate::drivers::bus::virtio::VirtioHal;
-use crate::sync::UPIntrFreeCell;
+
use crate::sync::UPIntrFreeCell;
 use alloc::{sync::Arc, vec::Vec};
 use core::any::Any;
 use embedded_graphics::pixelcolor::Rgb888;
 use tinybmp::Bmp;
 use virtio_drivers::{VirtIOGpu, VirtIOHeader};
+use crate::drivers::bus::virtio::VirtioHal;
 const VIRTIO7: usize = 0x10007000;
 pub trait GpuDevice: Send + Sync + Any {
     fn update_cursor(&self);
diff --git a/main/src/os/drivers/mod.rs.html b/main/src/os/drivers/mod.rs.html
index 50bdc73a..de3ee12e 100644
--- a/main/src/os/drivers/mod.rs.html
+++ b/main/src/os/drivers/mod.rs.html
@@ -25,5 +25,6 @@
 pub use chardev::UART;
 pub use gpu::*;
 pub use input::*;
-pub use net::*;
+pub use net::*; +
\ No newline at end of file diff --git a/main/src/os/task/id.rs.html b/main/src/os/task/id.rs.html index 3f101e3b..fdbde34b 100644 --- a/main/src/os/task/id.rs.html +++ b/main/src/os/task/id.rs.html @@ -223,6 +223,7 @@ 223 224 225 +226 
use super::ProcessControlBlock;
 use crate::config::{KERNEL_STACK_SIZE, PAGE_SIZE, TRAMPOLINE, TRAP_CONTEXT_BASE, USER_STACK_SIZE};
 use crate::mm::{MapPermission, PhysPageNum, VirtAddr, KERNEL_SPACE};
@@ -312,6 +313,7 @@
         KERNEL_SPACE
             .exclusive_access()
             .remove_area_with_start_vpn(kernel_stack_bottom_va.into());
+        KSTACK_ALLOCATOR.exclusive_access().dealloc(self.0);
     }
 }