Remove panic code.

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

diff --git a/src/threads/synch.c b/src/threads/synch.c
index be8f0a5a9ad80c7c6dec016987bb23e0aad58d4f..10a7dad5d022f7a294e5cce95d0a3dfb1148be73 100644 (file)
--- a/src/threads/synch.c
+++ b/src/threads/synch.c
@@ -117,7 +117,7 @@ sema_self_test (void)
   printf ("Testing semaphores...");
   sema_init (&sema[0], 0, "ping");
   sema_init (&sema[1], 0, "pong");
   printf ("Testing semaphores...");
   sema_init (&sema[0], 0, "ping");
   sema_init (&sema[1], 0, "pong");

-  thread_create ("sema-test", sema_test_helper, &sema);
+  thread_create ("sema-test", PRI_DEFAULT, sema_test_helper, &sema);

   for (i = 0; i < 10; i++) 
     {
       sema_up (&sema[0]);
   for (i = 0; i < 10; i++) 
     {
       sema_up (&sema[0]);


@@ -162,7 +162,6 @@ lock_init (struct lock *lock, const char *name)
   ASSERT (lock != NULL);
   ASSERT (name != NULL);
 
   ASSERT (lock != NULL);
   ASSERT (name != NULL);
 

-  strlcpy (lock->name, name, sizeof lock->name);

   lock->holder = NULL;
   sema_init (&lock->semaphore, 1, name);
 }
   lock->holder = NULL;
   sema_init (&lock->semaphore, 1, name);
 }


@@ -193,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) 
 {


@@ -226,7 +225,7 @@ lock_name (const struct lock *lock)
 {
   ASSERT (lock != NULL);
 
 {
   ASSERT (lock != NULL);
 

-  return lock->name;
+  return sema_name (&lock->semaphore);

 }
 \f
 /* One semaphore in a list. */
 }
 \f
 /* One semaphore in a list. */


@@ -251,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 signalled, 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.
 


@@ -262,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.