diff --git a/BuggyQueue/build.gradle b/BuggyQueue/build.gradle
index d88d747f6..21e03f9ff 100644
--- a/BuggyQueue/build.gradle
+++ b/BuggyQueue/build.gradle
@@ -11,5 +11,5 @@ repositories {
}
dependencies {
- testCompile group: 'junit', name: 'junit', version: '4.11'
+ testCompile group: 'junit', name: 'junit', version: '4.12'
}
diff --git a/BuggyQueue/src/test/java/edu/vandy/BuggyQueueTest.java b/BuggyQueue/src/test/java/edu/vandy/BuggyQueueTest.java
index 6c0c7ba12..c7b21bbf8 100644
--- a/BuggyQueue/src/test/java/edu/vandy/BuggyQueueTest.java
+++ b/BuggyQueue/src/test/java/edu/vandy/BuggyQueueTest.java
@@ -4,7 +4,7 @@
import java.util.concurrent.atomic.AtomicInteger;
-import org.junit.Test;
+import org.junit.*;
/**
* Test program for the BuggyQueue that induces race conditions due to
diff --git a/BusySynchronizedQueue/gradle/wrapper/gradle-wrapper.properties b/BusySynchronizedQueue/gradle/wrapper/gradle-wrapper.properties
index be3fb022c..6a8c6627b 100644
--- a/BusySynchronizedQueue/gradle/wrapper/gradle-wrapper.properties
+++ b/BusySynchronizedQueue/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Tue Aug 16 18:00:52 EDT 2016
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip
diff --git a/BusySynchronizedQueue/src/test/java/edu/vandy/BusySynchronizedQueueTest.java b/BusySynchronizedQueue/src/test/java/edu/vandy/BusySynchronizedQueueTest.java
index b17390dcf..341b74156 100644
--- a/BusySynchronizedQueue/src/test/java/edu/vandy/BusySynchronizedQueueTest.java
+++ b/BusySynchronizedQueue/src/test/java/edu/vandy/BusySynchronizedQueueTest.java
@@ -2,10 +2,9 @@
import static org.junit.Assert.assertEquals;
-import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
-import org.junit.Test;
+import org.junit.*;
/**
* Test program for the BusySynchronizedQueue that is inefficient due
diff --git a/DeadlockQueue/.classpath b/DeadlockQueue/.classpath
deleted file mode 100644
index 18d70f02c..000000000
--- a/DeadlockQueue/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/DeadlockQueue/.project b/DeadlockQueue/.project
deleted file mode 100644
index d66fa6c22..000000000
--- a/DeadlockQueue/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
- DeadlockQueue
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
-
- org.eclipse.jdt.core.javanature
-
-
diff --git a/DeadlockQueue/build.gradle b/DeadlockQueue/build.gradle
new file mode 100644
index 000000000..21e03f9ff
--- /dev/null
+++ b/DeadlockQueue/build.gradle
@@ -0,0 +1,15 @@
+group 'livelessons'
+version '1.0-SNAPSHOT'
+
+apply plugin: 'java'
+
+targetCompatibility = 1.8
+sourceCompatibility = 1.8
+
+repositories {
+ mavenCentral()
+}
+
+dependencies {
+ testCompile group: 'junit', name: 'junit', version: '4.12'
+}
diff --git a/DeadlockQueue/gradle/wrapper/gradle-wrapper.jar b/DeadlockQueue/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..758de960e
Binary files /dev/null and b/DeadlockQueue/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/DeadlockQueue/gradle/wrapper/gradle-wrapper.properties b/DeadlockQueue/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..2d80b69a7
--- /dev/null
+++ b/DeadlockQueue/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/DeadlockQueue/gradlew b/DeadlockQueue/gradlew
new file mode 100644
index 000000000..cccdd3d51
--- /dev/null
+++ b/DeadlockQueue/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+ echo "$*"
+}
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/DeadlockQueue/gradlew.bat b/DeadlockQueue/gradlew.bat
new file mode 100644
index 000000000..f9553162f
--- /dev/null
+++ b/DeadlockQueue/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/DeadlockQueue/settings.gradle b/DeadlockQueue/settings.gradle
new file mode 100644
index 000000000..699187b94
--- /dev/null
+++ b/DeadlockQueue/settings.gradle
@@ -0,0 +1,2 @@
+rootProject.name = 'DeadlockTest'
+
diff --git a/DeadlockQueue/src/DeadlockTest.java b/DeadlockQueue/src/main/java/edu/vandy/DeadlockTest.java
similarity index 84%
rename from DeadlockQueue/src/DeadlockTest.java
rename to DeadlockQueue/src/main/java/edu/vandy/DeadlockTest.java
index 77c4441d6..2304f9f56 100644
--- a/DeadlockQueue/src/DeadlockTest.java
+++ b/DeadlockQueue/src/main/java/edu/vandy/DeadlockTest.java
@@ -1,15 +1,13 @@
+package edu.vandy;
+
/**
- * @class DeadlockTest
- *
- * @brief Illustrates how deadlock can occur due to "circular
- * waiting". Moreover, deadlocks occur sporatically, which
- * makes it even harder to identify and diagnose the problem!
+ * This example illustrates how deadlock can occur due to "circular
+ * waiting". Moreover, deadlocks occur sporadically, which makes it
+ * even harder to identify and diagnose the problem!
*/
class DeadlockTest {
/**
- * @class TransferRunnable
- *
- * @brief Helper class that's passed a parameter to a Thread.
+ * This helper class is passed a parameter to a Java thread.
*/
static class TransferRunnable implements Runnable {
/**
@@ -33,17 +31,17 @@ public static void transfer(SimpleQueue src,
/**
* First instance of the SimpleQueue.
*/
- private SimpleQueue mAQueue;
+ private final SimpleQueue mAQueue;
/**
* Second instance of the SimpleQueue.
*/
- private SimpleQueue mBQueue;
+ private final SimpleQueue mBQueue;
/**
* Number of iterations to run the test.
*/
- private int mIterations;
+ private final int mIterations;
/**
* Constructor stores the parameters into data members.
@@ -87,10 +85,11 @@ static public void main(String[] args) {
// Designated the number of iterations to run in each thread.
int iterations =
args.length > 0 ? Integer.parseInt(args[0]) : 1000000;
+ boolean deadlock = args.length == 1;
// Create two SimpleQueue's.
- final SimpleQueue aQueue = new SimpleQueue();
- final SimpleQueue bQueue = new SimpleQueue();
+ final SimpleQueue aQueue = new SimpleQueue<>();
+ final SimpleQueue bQueue = new SimpleQueue<>();
// Create/start a Thread that transfers the contents of aQueue
// to bQueue.
@@ -103,8 +102,8 @@ static public void main(String[] args) {
// to aQueue, which is the reverse of what Thread t1 does (and
// thus can lead to deadlock).
Thread transfer2 = new Thread
- (new TransferRunnable(bQueue,
- aQueue,
+ (new TransferRunnable(deadlock ? bQueue : aQueue,
+ deadlock ? aQueue : bQueue,
iterations));
System.out.println("starting first transfer thread");
transfer1.start();
diff --git a/DeadlockQueue/src/SimpleQueue.java b/DeadlockQueue/src/main/java/edu/vandy/SimpleQueue.java
similarity index 90%
rename from DeadlockQueue/src/SimpleQueue.java
rename to DeadlockQueue/src/main/java/edu/vandy/SimpleQueue.java
index bcce88246..0df9dbf3f 100644
--- a/DeadlockQueue/src/SimpleQueue.java
+++ b/DeadlockQueue/src/main/java/edu/vandy/SimpleQueue.java
@@ -1,3 +1,5 @@
+package edu.vandy;
+
import java.util.List;
import java.util.concurrent.CyclicBarrier;
import java.util.ArrayList;
@@ -7,17 +9,15 @@
import java.util.concurrent.TimeUnit;
/*
- * @class SimpleQueue
- *
- * @brief Defines an implementation of the BlockingQueue interface
- * that (intentially) doesn't work properly when accessed via
- * multiple threads since it's not synchronized properly.
+ * This class defines an implementation of the BlockingQueue interface
+ * that (intentionally) doesn't work properly when accessed via multiple
+ * threads since it's not synchronized properly.
*/
class SimpleQueue implements BlockingQueue {
/**
* The queue consists of a List of E's.
*/
- private List mList = new ArrayList();
+ private final List mList = new ArrayList();
/**
* True if the queue is empty.