projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update.
[pintos-anon]
/
src
/
threads
/
synch.c
diff --git
a/src/threads/synch.c
b/src/threads/synch.c
index 85af57d63ac8c0f59f8b254c0d4db46f495d392b..1504d98859f8b54cc6c6688f5ed1de3227cd97f8 100644
(file)
--- a/
src/threads/synch.c
+++ b/
src/threads/synch.c
@@
-192,8
+192,8
@@
lock_acquire (struct lock *lock)
/* Releases LOCK, which must be owned by the current thread.
An interrupt handler cannot acquire a lock, so it does not
/* Releases LOCK, which must be owned by the current thread.
An interrupt handler cannot acquire a lock, so it does not
- make sense to try to
signal a condition variable within an
-
interrupt
handler. */
+ make sense to try to
release a lock within an interrupt
+ handler. */
void
lock_release (struct lock *lock)
{
void
lock_release (struct lock *lock)
{
@@
-231,7
+231,7
@@
lock_name (const struct lock *lock)
/* One semaphore in a list. */
struct semaphore_elem
{
/* One semaphore in a list. */
struct semaphore_elem
{
-
list_elem elem;
/* List element. */
+
struct list_elem elem;
/* List element. */
struct semaphore semaphore; /* This semaphore. */
};
struct semaphore semaphore; /* This semaphore. */
};
@@
-250,7
+250,7
@@
cond_init (struct condition *cond, const char *name)
}
/* Atomically releases LOCK and waits for COND to be signaled by
}
/* Atomically releases LOCK and waits for COND to be signaled by
- some other piece of code. After COND is signal
l
ed, LOCK is
+ some other piece of code. After COND is signaled, LOCK is
reacquired before returning. LOCK must be held before calling
this function.
reacquired before returning. LOCK must be held before calling
this function.
@@
-261,7
+261,7
@@
cond_init (struct condition *cond, const char *name)
again.
A given condition variable is associated with only a single
again.
A given condition variable is associated with only a single
- lock, but one lock may be
be
associated with any number of
+ lock, but one lock may be associated with any number of
condition variables. That is, there is a one-to-many mapping
from locks to condition variables.
condition variables. That is, there is a one-to-many mapping
from locks to condition variables.