X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Fsynch.h;h=ad8423891bad260215a77d0274dddfd75c960962;hb=63b811f31e550794fbbcaa75ea51b41023178f28;hp=d21ecff08ca546473cbfc7d84229fa5d54310fab;hpb=3625c2e6aba3b282f91282492c4b3fba324816c1;p=pintos-anon diff --git a/src/threads/synch.h b/src/threads/synch.h index d21ecff..ad84238 100644 --- a/src/threads/synch.h +++ b/src/threads/synch.h @@ -1,8 +1,8 @@ -#ifndef HEADER_SYNCH_H -#define HEADER_SYNCH_H 1 +#ifndef THREADS_SYNCH_H +#define THREADS_SYNCH_H +#include #include -#include "list.h" /* A counting semaphore. */ struct semaphore @@ -21,7 +21,6 @@ void sema_self_test (void); /* Lock. */ struct lock { - char name[16]; /* Name (for debugging purposes only). */ struct thread *holder; /* Thread holding lock (for debugging). */ struct semaphore semaphore; /* Binary semaphore controlling access. */ }; @@ -45,4 +44,4 @@ void cond_signal (struct condition *, struct lock *); void cond_broadcast (struct condition *, struct lock *); const char *cond_name (const struct condition *); -#endif /* synch.h */ +#endif /* threads/synch.h */