Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
K
kernel
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
23
Issues
23
List
Boards
Labels
Service Desk
Milestones
Merge Requests
10
Merge Requests
10
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
redox-os
kernel
Commits
e2a6233c
Verified
Commit
e2a6233c
authored
Mar 13, 2019
by
Jeremy Soller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
New fevent functionality to prevent missing events
parent
483ee05e
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
16 additions
and
21 deletions
+16
-21
src/event.rs
src/event.rs
+10
-15
src/scheme/debug.rs
src/scheme/debug.rs
+1
-1
src/scheme/irq.rs
src/scheme/irq.rs
+1
-1
src/scheme/itimer.rs
src/scheme/itimer.rs
+1
-1
src/scheme/pipe.rs
src/scheme/pipe.rs
+1
-1
src/scheme/time.rs
src/scheme/time.rs
+1
-1
src/scheme/user.rs
src/scheme/user.rs
+1
-1
No files found.
src/event.rs
View file @
e2a6233c
...
...
@@ -52,7 +52,10 @@ impl EventQueue {
event
.flags
);
send_flags
(
RegKey
{
scheme
,
number
})
?
;
let
flags
=
sync
(
RegKey
{
scheme
,
number
})
?
;
if
flags
>
0
{
trigger
(
scheme
,
number
,
flags
);
}
}
Ok
(
events
.len
())
...
...
@@ -133,7 +136,7 @@ pub fn register(reg_key: RegKey, queue_key: QueueKey, flags: usize) {
}
}
pub
fn
s
end_flags
(
reg_key
:
RegKey
)
->
Result
<
()
>
{
pub
fn
s
ync
(
reg_key
:
RegKey
)
->
Result
<
usize
>
{
let
mut
flags
=
0
;
{
...
...
@@ -146,21 +149,13 @@ pub fn send_flags(reg_key: RegKey) -> Result<()> {
}
}
let
event_id
=
{
let
scheme
=
{
let
schemes
=
scheme
::
schemes
();
let
scheme
=
schemes
.get
(
reg_key
.scheme
)
.ok_or
(
Error
::
new
(
EBADF
))
?
;
Arc
::
clone
(
&
scheme
)
};
scheme
.fevent
(
reg_key
.number
,
flags
)
?
let
scheme
=
{
let
schemes
=
scheme
::
schemes
();
let
scheme
=
schemes
.get
(
reg_key
.scheme
)
.ok_or
(
Error
::
new
(
EBADF
))
?
;
Arc
::
clone
(
&
scheme
)
};
if
event_id
!=
reg_key
.number
{
println!
(
"scheme {} returned event id {} instead of {}"
,
reg_key
.scheme
.into
(),
event_id
,
reg_key
.number
);
}
Ok
(())
scheme
.fevent
(
reg_key
.number
,
flags
)
}
pub
fn
unregister_file
(
scheme
:
SchemeId
,
number
:
usize
)
{
...
...
src/scheme/debug.rs
View file @
e2a6233c
...
...
@@ -108,7 +108,7 @@ impl Scheme for DebugScheme {
*
handles
.get
(
&
id
)
.ok_or
(
Error
::
new
(
EBADF
))
?
};
Ok
(
id
)
Ok
(
0
)
}
fn
fpath
(
&
self
,
id
:
usize
,
buf
:
&
mut
[
u8
])
->
Result
<
usize
>
{
...
...
src/scheme/irq.rs
View file @
e2a6233c
...
...
@@ -88,7 +88,7 @@ impl Scheme for IrqScheme {
}
fn
fevent
(
&
self
,
file
:
usize
,
_
flags
:
usize
)
->
Result
<
usize
>
{
Ok
(
file
)
Ok
(
0
)
}
fn
fpath
(
&
self
,
id
:
usize
,
buf
:
&
mut
[
u8
])
->
Result
<
usize
>
{
...
...
src/scheme/itimer.rs
View file @
e2a6233c
...
...
@@ -81,7 +81,7 @@ impl Scheme for ITimerScheme {
fn
fevent
(
&
self
,
id
:
usize
,
_
flags
:
usize
)
->
Result
<
usize
>
{
let
handles
=
self
.handles
.read
();
handles
.get
(
&
id
)
.ok_or
(
Error
::
new
(
EBADF
))
.and
(
Ok
(
id
))
handles
.get
(
&
id
)
.ok_or
(
Error
::
new
(
EBADF
))
.and
(
Ok
(
0
))
}
fn
fpath
(
&
self
,
id
:
usize
,
buf
:
&
mut
[
u8
])
->
Result
<
usize
>
{
...
...
src/scheme/pipe.rs
View file @
e2a6233c
...
...
@@ -166,7 +166,7 @@ impl PipeRead {
}
fn
fevent
(
&
self
,
_
flags
:
usize
)
->
Result
<
usize
>
{
Ok
(
self
.event_id
)
Ok
(
0
)
}
fn
read
(
&
self
,
buf
:
&
mut
[
u8
])
->
Result
<
usize
>
{
...
...
src/scheme/time.rs
View file @
e2a6233c
...
...
@@ -92,7 +92,7 @@ impl Scheme for TimeScheme {
fn
fevent
(
&
self
,
id
:
usize
,
_
flags
:
usize
)
->
Result
<
usize
>
{
let
handles
=
self
.handles
.read
();
handles
.get
(
&
id
)
.ok_or
(
Error
::
new
(
EBADF
))
.and
(
Ok
(
id
))
handles
.get
(
&
id
)
.ok_or
(
Error
::
new
(
EBADF
))
.and
(
Ok
(
0
))
}
fn
fpath
(
&
self
,
id
:
usize
,
buf
:
&
mut
[
u8
])
->
Result
<
usize
>
{
...
...
src/scheme/user.rs
View file @
e2a6233c
...
...
@@ -207,7 +207,7 @@ impl UserInner {
}
pub
fn
fevent
(
&
self
,
_
flags
:
usize
)
->
Result
<
usize
>
{
Ok
(
self
.handle_id
)
Ok
(
0
)
}
pub
fn
fsync
(
&
self
)
->
Result
<
usize
>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment