projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix two bugs in the base Pintos code:
[pintos-anon]
/
src
/
tests
/
threads
/
priority-donate-one.c
diff --git
a/src/tests/threads/priority-donate-one.c
b/src/tests/threads/priority-donate-one.c
index 603a7fe45a9b3469133f21aef75041d596a2981a..3189f3a0b94a030290b286ea4a78623ddd5ea2e3 100644
(file)
--- a/
src/tests/threads/priority-donate-one.c
+++ b/
src/tests/threads/priority-donate-one.c
@@
-24,19
+24,19
@@
test_priority_donate_one (void)
struct lock lock;
/* This test does not work with the MLFQS. */
struct lock lock;
/* This test does not work with the MLFQS. */
- ASSERT (!
enable
_mlfqs);
+ ASSERT (!
thread
_mlfqs);
/* Make sure our priority is the default. */
ASSERT (thread_get_priority () == PRI_DEFAULT);
lock_init (&lock);
lock_acquire (&lock);
/* Make sure our priority is the default. */
ASSERT (thread_get_priority () == PRI_DEFAULT);
lock_init (&lock);
lock_acquire (&lock);
- thread_create ("acquire1", PRI_DEFAULT
-
1, acquire1_thread_func, &lock);
+ thread_create ("acquire1", PRI_DEFAULT
+
1, acquire1_thread_func, &lock);
msg ("This thread should have priority %d. Actual priority: %d.",
msg ("This thread should have priority %d. Actual priority: %d.",
- PRI_DEFAULT
-
1, thread_get_priority ());
- thread_create ("acquire2", PRI_DEFAULT
-
2, acquire2_thread_func, &lock);
+ PRI_DEFAULT
+
1, thread_get_priority ());
+ thread_create ("acquire2", PRI_DEFAULT
+
2, acquire2_thread_func, &lock);
msg ("This thread should have priority %d. Actual priority: %d.",
msg ("This thread should have priority %d. Actual priority: %d.",
- PRI_DEFAULT
-
2, thread_get_priority ());
+ PRI_DEFAULT
+
2, thread_get_priority ());
lock_release (&lock);
msg ("acquire2, acquire1 must already have finished, in that order.");
msg ("This should be the last line before finishing this test.");
lock_release (&lock);
msg ("acquire2, acquire1 must already have finished, in that order.");
msg ("This should be the last line before finishing this test.");