Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
relibc
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
relibc
Commits
ba433201
Commit
ba433201
authored
1 year ago
by
Ron Williams
Browse files
Options
Downloads
Patches
Plain Diff
epoll: correct error when skipping time events
parent
c75a6e64
No related branches found
Branches containing commit
No related tags found
1 merge request
!416
epoll: correct error when skipping time events
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/platform/redox/epoll.rs
+2
-1
2 additions, 1 deletion
src/platform/redox/epoll.rs
with
2 additions
and
1 deletion
src/platform/redox/epoll.rs
+
2
−
1
View file @
ba433201
...
@@ -116,6 +116,7 @@ impl PalEpoll for Sys {
...
@@ -116,6 +116,7 @@ impl PalEpoll for Sys {
for
i
in
0
..
read
{
for
i
in
0
..
read
{
unsafe
{
unsafe
{
let
event_ptr
=
events
.add
(
i
);
let
event_ptr
=
events
.add
(
i
);
let
target_ptr
=
events
.add
(
count
);
let
event
=
*
(
event_ptr
as
*
mut
Event
);
let
event
=
*
(
event_ptr
as
*
mut
Event
);
if
let
Some
(
ref
timer
)
=
timer_opt
{
if
let
Some
(
ref
timer
)
=
timer_opt
{
if
event
.id
as
c_int
==
timer
.fd
{
if
event
.id
as
c_int
==
timer
.fd
{
...
@@ -123,7 +124,7 @@ impl PalEpoll for Sys {
...
@@ -123,7 +124,7 @@ impl PalEpoll for Sys {
continue
;
continue
;
}
}
}
}
*
even
t_ptr
=
epoll_event
{
*
targe
t_ptr
=
epoll_event
{
events
:
event
.flags
.bits
()
as
_
,
events
:
event
.flags
.bits
()
as
_
,
data
:
epoll_data
{
data
:
epoll_data
{
u64
:
event
.data
as
u64
,
u64
:
event
.data
as
u64
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment