projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clarify that adding code where interrupts are already disabled may be
[pintos-anon]
/
src
/
threads
/
thread.h
diff --git
a/src/threads/thread.h
b/src/threads/thread.h
index 0480293dc51d19c31daae2bde619c503a0d45b16..2043d8dc86e251bbd8c0492aaabc8266e935c3b9 100644
(file)
--- a/
src/threads/thread.h
+++ b/
src/threads/thread.h
@@
-5,10
+5,6
@@
#include <list.h>
#include <stdint.h>
#include <list.h>
#include <stdint.h>
-#ifdef USERPROG
-#include "userprog/addrspace.h"
-#endif
-
/* States in a thread's life cycle. */
enum thread_status
{
/* States in a thread's life cycle. */
enum thread_status
{
@@
-24,9
+20,9
@@
typedef int tid_t;
#define TID_ERROR ((tid_t) -1) /* Error value for tid_t. */
/* Thread priorities. */
#define TID_ERROR ((tid_t) -1) /* Error value for tid_t. */
/* Thread priorities. */
-#define PRI_MIN 0 /*
Low
est priority. */
-#define PRI_DEFAULT
29
/* Default priority. */
-#define PRI_MAX
59 /* High
est priority. */
+#define PRI_MIN 0 /*
High
est priority. */
+#define PRI_DEFAULT
31
/* Default priority. */
+#define PRI_MAX
63 /* Low
est priority. */
/* A kernel thread or user process.
/* A kernel thread or user process.
@@
-51,11
+47,11
@@
typedef int tid_t;
| |
| |
+---------------------------------+
| |
| |
+---------------------------------+
- |
magic
|
- |
:
|
- |
:
|
- |
name
|
- |
status
|
+ |
magic
|
+ |
:
|
+ |
:
|
+ |
name
|
+ |
status
|
0 kB +---------------------------------+
The upshot of this is twofold:
0 kB +---------------------------------+
The upshot of this is twofold:
@@
-70,7
+66,7
@@
typedef int tid_t;
large. If a stack overflows, it will corrupt the thread
state. Thus, kernel functions should not allocate large
structures or arrays as non-static local variables. Use
large. If a stack overflows, it will corrupt the thread
state. Thus, kernel functions should not allocate large
structures or arrays as non-static local variables. Use
- dynamic allocation with malloc() or palloc_get()
+ dynamic allocation with malloc() or palloc_get
_page
()
instead.
The first symptom of either of these problems will probably be
instead.
The first symptom of either of these problems will probably be
@@
-86,7
+82,7
@@
typedef int tid_t;
blocked state is on a semaphore wait list. */
struct thread
{
blocked state is on a semaphore wait list. */
struct thread
{
- /*
These members are o
wned by thread.c. */
+ /*
O
wned by thread.c. */
tid_t tid; /* Thread identifier. */
enum thread_status status; /* Thread state. */
char name[16]; /* Name (for debugging purposes). */
tid_t tid; /* Thread identifier. */
enum thread_status status; /* Thread state. */
char name[16]; /* Name (for debugging purposes). */
@@
-94,40
+90,42
@@
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
#ifdef USERPROG
- /*
These members are owned by userprog/addrspace
.c. */
+ /*
Owned by userprog/process
.c. */
uint32_t *pagedir; /* Page directory. */
#endif
uint32_t *pagedir; /* Page directory. */
#endif
- /*
Marker to detect stack overflow
. */
- unsigned magic; /*
Always set to THREAD_MAGIC
. */
+ /*
Owned by thread.c
. */
+ unsigned magic; /*
Detects stack overflow
. */
};
void thread_init (void);
void thread_start (void);
};
void thread_init (void);
void thread_start (void);
+void thread_tick (void);
+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 *);
-#ifdef USERPROG
-tid_t thread_execute (const char *filename);
-#endif
+void thread_block (void);
void thread_unblock (struct thread *);
struct thread *thread_current (void);
tid_t thread_tid (void);
const char *thread_name (void);
void thread_unblock (struct thread *);
struct thread *thread_current (void);
tid_t thread_tid (void);
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);
-/* These functions will be implemented in problem 1-3. */
-void thread_set_priority (int);
int thread_get_priority (void);
int thread_get_priority (void);
+void thread_set_priority (int);
+
+int thread_get_nice (void);
+void thread_set_nice (int);
+int thread_get_recent_cpu (void);
+int thread_get_load_avg (void);
#endif /* threads/thread.h */
#endif /* threads/thread.h */