Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit85fa66c

Browse files
committed
runtime: queue cleanup
Removed type annotations and unecessary comments to reduce visualclutter.
1 parent8984d31 commit85fa66c

File tree

4 files changed

+17
-30
lines changed

4 files changed

+17
-30
lines changed

‎src/runtime/queue/mod.rs

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,17 @@ pub struct IoQueueTable {
5858
// Associated Functions
5959
//======================================================================================================================
6060

61-
/// Associated functions for I/O queue descriptors tables.
6261
implIoQueueTable{
63-
/// Allocates a new entry in the target I/O queue descriptors table.
6462
pubfnalloc<T:IoQueue>(&mutself,queue:T) ->QDesc{
65-
let index:usize =self.table.insert(Box::new(queue));
66-
let qd:QDesc =expect_some!(
63+
let index =self.table.insert(Box::new(queue));
64+
let qd =expect_some!(
6765
self.qd_to_offset.insert_with_new_id(InternalId(index)),
6866
"should be able to allocate an id"
6967
);
7068
trace!("inserting queue, index {:?} qd {:?}", index, qd);
7169
qd
7270
}
7371

74-
/// Gets the type of the queue.
7572
pubfnget_type(&self,qd:&QDesc) ->Result<QType,Fail>{
7673
Ok(self.get_queue_ref(qd)?.get_qtype())
7774
}
@@ -88,10 +85,10 @@ impl IoQueueTable {
8885

8986
/// Releases the entry associated with an I/O queue descriptor.
9087
pubfnfree<T:IoQueue>(&mutself,qd:&QDesc) ->Result<T,Fail>{
91-
let internal_id:InternalId =matchself.qd_to_offset.remove(qd){
88+
let internal_id =matchself.qd_to_offset.remove(qd){
9289
Some(id) => id,
9390
None =>{
94-
let cause:String =format!("invalid queue descriptor (qd={:?})", qd);
91+
let cause =format!("invalid queue descriptor (qd={:?})", qd);
9592
error!("free(): {}",&cause);
9693
returnErr(Fail::new(libc::EBADF,&cause));
9794
},
@@ -116,7 +113,7 @@ impl IoQueueTable {
116113
}
117114
}
118115

119-
let cause:String =format!("invalid queue descriptor (qd={:?})", qd);
116+
let cause =format!("invalid queue descriptor (qd={:?})", qd);
120117
error!("get(): {}",&cause);
121118
Err(Fail::new(libc::EBADF,&cause))
122119
}
@@ -128,7 +125,7 @@ impl IoQueueTable {
128125
}
129126
}
130127

131-
let cause:String =format!("invalid queue descriptor (qd={:?})", qd);
128+
let cause =format!("invalid queue descriptor (qd={:?})", qd);
132129
error!("get(): {}",&cause);
133130
Err(Fail::new(libc::EBADF,&cause))
134131
}
@@ -141,14 +138,14 @@ impl IoQueueTable {
141138
/// Downcasts a [IoQueue] reference to a concrete queue type reference `&T`.
142139
pubfndowncast_queue_ptr<T:IoQueue>(boxed_queue_ptr:&Box<dynIoQueue>) ->Result<&T,Fail>{
143140
// 1. Get reference to queue inside the box.
144-
let queue_ptr:&dynIoQueue = boxed_queue_ptr.as_ref();
141+
let queue_ptr = boxed_queue_ptr.as_ref();
145142
// 2. Cast that reference to a void pointer for downcasting.
146-
let void_ptr:&dynAny = queue_ptr.as_any_ref();
143+
let void_ptr = queue_ptr.as_any_ref();
147144
// 3. Downcast to concrete type T
148145
match void_ptr.downcast_ref::<T>(){
149146
Some(ptr) =>Ok(ptr),
150147
None =>{
151-
let cause:&'staticstr ="invalid queue type";
148+
let cause ="invalid queue type";
152149
error!("downcast_queue_ptr(): {}", cause);
153150
Err(Fail::new(libc::EINVAL, cause))
154151
},
@@ -157,14 +154,14 @@ pub fn downcast_queue_ptr<T: IoQueue>(boxed_queue_ptr: &Box<dyn IoQueue>) -> Res
157154

158155
pubfndowncast_mut_ptr<T:IoQueue>(boxed_queue_ptr:&mutBox<dynIoQueue>) ->Result<&mutT,Fail>{
159156
// 1. Get reference to queue inside the box.
160-
let queue_ptr:&mutdynIoQueue = boxed_queue_ptr.as_mut();
157+
let queue_ptr = boxed_queue_ptr.as_mut();
161158
// 2. Cast that reference to a void pointer for downcasting.
162-
let void_ptr:&mutdynAny = queue_ptr.as_any_mut();
159+
let void_ptr = queue_ptr.as_any_mut();
163160
// 3. Downcast to concrete type T
164161
match void_ptr.downcast_mut::<T>(){
165162
Some(ptr) =>Ok(ptr),
166163
None =>{
167-
let cause:&'staticstr ="invalid queue type";
164+
let cause ="invalid queue type";
168165
error!("downcast_mut_ptr(): {}", cause);
169166
Err(Fail::new(libc::EINVAL, cause))
170167
},
@@ -177,7 +174,7 @@ pub fn downcast_queue<T: IoQueue>(boxed_queue: Box<dyn IoQueue>) -> Result<T, Fa
177174
match boxed_queue.as_any().downcast::<T>(){
178175
Ok(queue) =>Ok(*queue),
179176
Err(_) =>{
180-
let cause:&'staticstr ="invalid queue type";
177+
let cause ="invalid queue type";
181178
error!("downcast_queue(): {}", cause);
182179
Err(Fail::new(libc::EINVAL, cause))
183180
},
@@ -238,7 +235,7 @@ mod tests {
238235
usecrate::{
239236
expect_ok,
240237
runtime::{IoQueue,IoQueueTable},
241-
QDesc,QType,
238+
QType,
242239
};
243240
use::std::any::Any;
244241
use::test::{black_box,Bencher};
@@ -264,12 +261,12 @@ mod tests {
264261

265262
#[bench]
266263
fnalloc_free_bench(b:&mutBencher){
267-
letmut ioqueue_table:IoQueueTable =IoQueueTable::default();
264+
letmut ioqueue_table =IoQueueTable::default();
268265

269266
b.iter(||{
270-
let qd:QDesc = ioqueue_table.alloc::<TestQueue>(TestQueue{});
267+
let qd = ioqueue_table.alloc::<TestQueue>(TestQueue{});
271268
black_box(qd);
272-
let queue:TestQueue =expect_ok!(ioqueue_table.free::<TestQueue>(&qd),"must be TestQueue");
269+
let queue =expect_ok!(ioqueue_table.free::<TestQueue>(&qd),"must be TestQueue");
273270
black_box(queue);
274271
});
275272
}

‎src/runtime/queue/qdesc.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,24 @@ impl QDesc {
2222
//======================================================================================================================
2323

2424
implFrom<QDesc>fori32{
25-
/// Converts a [QDesc] to a [i32].
2625
fnfrom(val:QDesc) ->Self{
2726
val.0asi32
2827
}
2928
}
3029

3130
implFrom<i32>forQDesc{
32-
/// Converts a [i32] to a [QDesc].
3331
fnfrom(val:i32) ->Self{
3432
QDesc(valasu32)
3533
}
3634
}
3735

3836
implFrom<QDesc>foru32{
39-
/// Converts a [QDesc] to a [u32].
4037
fnfrom(val:QDesc) ->Self{
4138
val.0
4239
}
4340
}
4441

4542
implFrom<u32>forQDesc{
46-
/// Converts a [u32] to a [QDesc].
4743
fnfrom(val:u32) ->Self{
4844
QDesc(val)
4945
}

‎src/runtime/queue/qtoken.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
// Structures
66
//======================================================================================================================
77

8-
/// Queue Token
9-
///
108
/// This is used to uniquely identify operations on IO queues.
119
#[derive(Clone,Copy,Debug,Eq,PartialEq,Hash)]
1210
#[repr(C)]
@@ -17,14 +15,12 @@ pub struct QToken(u64);
1715
//======================================================================================================================
1816

1917
implFrom<u64>forQToken{
20-
/// Converts a [QToken] to a [u64].
2118
fnfrom(value:u64) ->Self{
2219
QToken(value)
2320
}
2421
}
2522

2623
implFrom<QToken>foru64{
27-
/// Converts a [QToken] to a [u64].
2824
fnfrom(value:QToken) ->Self{
2925
value.0
3026
}

‎src/runtime/queue/qtype.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ pub enum QType {
1919
// Trait Implementations
2020
//======================================================================================================================
2121

22-
/// From Trait Implementation for IO Queue Types
2322
implFrom<QType>foru32{
2423
fnfrom(value:QType) ->Self{
2524
match value{
@@ -31,7 +30,6 @@ impl From<QType> for u32 {
3130
}
3231
}
3332

34-
/// From Trait Implementation for IO Queue Types
3533
implTryFrom<u32>forQType{
3634
typeError =&'staticstr;
3735

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp