Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hust-x86-simulator
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
yizhiran
hust-x86-simulator
Commits
eb60a1a2
There was an error fetching the commit references. Please try again later.
Commit
eb60a1a2
authored
5 years ago
by
Recolic Keghart
Browse files
Options
Downloads
Patches
Plain Diff
Temporarily disable async
parent
ce18d37b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
nemu/src/device/device.cc
+8
-3
8 additions, 3 deletions
nemu/src/device/device.cc
nemu/src/device/vga.cc
+4
-1
4 additions, 1 deletion
nemu/src/device/vga.cc
with
12 additions
and
4 deletions
nemu/src/device/device.cc
+
8
−
3
View file @
eb60a1a2
...
...
@@ -40,9 +40,12 @@ static void timer_sig_handler(int signum) {
Assert
(
ret
==
0
,
"Can not set timer"
);
}
void
device_update
()
{}
// Now an independent thread will do it.
void
device_update_impl
()
{
// async
if
(
device_update_flag
)
device_update_flag
=
false
;
else
return
;
if
(
update_screen_flag
)
{
update_screen
();
update_screen_flag
=
false
;
...
...
@@ -72,6 +75,8 @@ void device_update_impl() {
}
}
void
device_update
()
{
device_update_impl
();}
static
void
device_update_thread_daemon
()
{
while
(
true
)
{
if
(
device_update_flag
.
exchange
(
false
))
{
...
...
@@ -104,7 +109,7 @@ void init_device() {
ret
=
setitimer
(
ITIMER_VIRTUAL
,
&
it
,
NULL
);
Assert
(
ret
==
0
,
"Can not set timer"
);
std
::
thread
(
device_update_thread_daemon
).
detach
();
//
std::thread(device_update_thread_daemon).detach();
}
#else
...
...
This diff is collapsed.
Click to expand it.
nemu/src/device/vga.cc
+
4
−
1
View file @
eb60a1a2
...
...
@@ -19,9 +19,11 @@ static uint32_t (*vmem) [SCREEN_W];
static
uint32_t
*
screensize_port_base
;
inline
void
SDL_ErrorCheck
(
int
ret
)
{
#ifdef DEBUG
if
(
ret
!=
0
)
{
rlib
::
println
(
"SDL_Error: ret="
,
ret
,
", GETERR="
,
SDL_GetError
());
}
#endif
}
static
void
init_vga_impl
()
{
...
...
@@ -38,7 +40,7 @@ static void init_vga_impl() {
void
update_screen
()
{
#ifndef DISABLE_MMIO
if
(
window
==
nullptr
)
init_vga_impl
();
//
if(window == nullptr) init_vga_impl();
SDL_ErrorCheck
(
SDL_UpdateTexture
(
texture
,
NULL
,
vmem
,
SCREEN_W
*
sizeof
(
vmem
[
0
][
0
])));
SDL_ErrorCheck
(
SDL_RenderClear
(
renderer
));
SDL_ErrorCheck
(
SDL_RenderCopy
(
renderer
,
texture
,
NULL
,
NULL
));
...
...
@@ -49,6 +51,7 @@ void update_screen() {
void
init_vga
()
{
// Because of fucking SDL design, vga_init should be done in updating thread.
// Do nothing in main thread.
init_vga_impl
();
}
#endif
/* HAS_IOE */
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