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
/
thread.h
diff --git
a/src/threads/thread.h
b/src/threads/thread.h
index 55ac2324d14568ae53e17ae6b00332d829babe77..fe7db8984243b8b754143f9ad2580fc17ad65e9a 100644
(file)
--- a/
src/threads/thread.h
+++ b/
src/threads/thread.h
@@
-90,7
+90,7
@@
struct thread
int priority; /* Priority. */
/* Shared between thread.c and synch.c. */
int priority; /* Priority. */
/* Shared between thread.c and synch.c. */
-
list_elem elem;
/* List element. */
+
struct list_elem elem;
/* List element. */
#ifdef USERPROG
/* Owned by userprog/process.c. */
#ifdef USERPROG
/* Owned by userprog/process.c. */
@@
-109,6
+109,7
@@
void thread_print_stats (void);
typedef void thread_func (void *aux);
tid_t thread_create (const char *name, int priority, thread_func *, void *);
typedef void thread_func (void *aux);
tid_t thread_create (const char *name, int priority, thread_func *, void *);
+void thread_block (void);
void thread_unblock (struct thread *);
struct thread *thread_current (void);
void thread_unblock (struct thread *);
struct thread *thread_current (void);
@@
-117,12
+118,9
@@
const char *thread_name (void);
void thread_exit (void) NO_RETURN;
void thread_yield (void);
void thread_exit (void) NO_RETURN;
void thread_yield (void);
-void thread_block (void);
-/* This function will be implemented in problem 1-2. */
void thread_join (tid_t);
void thread_join (tid_t);
-/* These functions will be implemented in problem 1-3. */
void thread_set_priority (int);
int thread_get_priority (void);
void thread_set_priority (int);
int thread_get_priority (void);