Fix Intel names for outd, ind, outsd, insd.

[pintos-anon] / src / threads / synch.h

diff --git a/src/threads/synch.h b/src/threads/synch.h
index 244479f9ae0afe236c12635bbe730cafce881d3d..c13f95d8d429a762843824e8c4e70fc1f6d4a799 100644 (file)
--- a/src/threads/synch.h
+++ b/src/threads/synch.h
@@ -12,7 +12,7 @@ struct semaphore
     struct list waiters;        /* List of waiting threads. */
   };
 
-void sema_init (struct semaphore *, unsigned value, const char *);
+void sema_init (struct semaphore *, unsigned value, const char *name);
 void sema_down (struct semaphore *);
 void sema_up (struct semaphore *);
 const char *sema_name (const struct semaphore *);
@@ -21,12 +21,11 @@ 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. */
   };
 
-void lock_init (struct lock *, const char *);
+void lock_init (struct lock *, const char *name);
 void lock_acquire (struct lock *);
 void lock_release (struct lock *);
 bool lock_held_by_current_thread (const struct lock *);
@@ -39,7 +38,7 @@ struct condition
     struct list waiters;        /* List of waiting threads. */
   };
 
-void cond_init (struct condition *, const char *);
+void cond_init (struct condition *, const char *name);
 void cond_wait (struct condition *, struct lock *);
 void cond_signal (struct condition *, struct lock *);
 void cond_broadcast (struct condition *, struct lock *);