Fixed "Lock" to be "Long".

irbian · May 14, 2014 · 6618744 · 6618744
1 parent bec5722
commit 6618744
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/assignments/week-2-assignment-1/Assignment-Description.txt b/assignments/week-2-assignment-1/Assignment-Description.txt
@@ -3,7 +3,7 @@ Programming Assignment 0
 In this first (intentionally simple) assignment, you will use a Java
 ReentrantReadWriteLock to implement a subset of the
 java.util.concurrent.atomic.AtomicLong class, which we call
-SimpleAtomicLock.  The goal is to understand how to use
+SimpleAtomicLong.  The goal is to understand how to use
 ReentrantReadWriteLock to serialize access to a variable that's shared
 by multiple threads.  The SimpleAtomicLongTest.java program creates
 two Threads that increment and decrement the AtomicLong 10,000,000
@@ -67,11 +67,11 @@ http://www.courera.org/course/posa
 To compile this code you can either use the provided Eclipse project
 or simply type
 
-% javac SimpleAtomicLockTest.java SimpleAtomicLock.java
+% javac SimpleAtomicLongTest.java SimpleAtomicLong.java
 
 on the command-line and then run the resulting class file by typing
 
-% java SimpleAtomicLockTest
+% java SimpleAtomicLongTest
 
 The output for a correct solution should look exactly like this:
 

diff --git a/ex/PingPong/console/src/edu/vuum/mocca/PlayPingPong.java b/ex/PingPong/console/src/edu/vuum/mocca/PlayPingPong.java
@@ -188,7 +188,7 @@ static class PingPongThreadCond extends PingPongThread
         /**
          * Thread whose turn it currently is.
          */
-        private static long mThreadOwner;
+        private static long mTurnOwner;
 
         public void setOtherThreadId(long otherThreadId) 
         {
@@ -213,7 +213,7 @@ public void setOtherThreadId(long otherThreadId)
             mConds[FIRST_COND] = firstCond;
             mConds[SECOND_COND] = secondCond;
             if (isOwner) 
-                mThreadOwner = this.getId();
+                mTurnOwner = this.getId();
         }
 
         /**
@@ -222,7 +222,7 @@ public void setOtherThreadId(long otherThreadId)
         void acquire() {
             mLock.lock();
 
-            while (mThreadOwner != this.getId()) {
+            while (mTurnOwner != this.getId()) {
                 mConds[FIRST_COND].awaitUninterruptibly();
             }
 
@@ -238,7 +238,7 @@ void release() {
             --mTurnCountDown;
 
             if (mTurnCountDown == 0) {
-                mThreadOwner = mOtherThreadId;
+                mTurnOwner = mOtherThreadId;
                 mTurnCountDown = mMaxTurns;
                 mConds[SECOND_COND].signal();
             }