Commit ed6d908f authored by Markus Klinik's avatar Markus Klinik
Browse files

Register and ConveyorBelt should use synchronization

parent 38e39ad4
......@@ -515,8 +515,8 @@ As the architecture is given, only correctness criteria are of interest.
\paragraph{Correctness}
\begin{description}[noitemsep]
\item [a15-synchronization-exists] The classes ConveyorBelt and Register should use Lock and Condition.
\item [a15-synchronization-only-in-converyorbelt-register] Only the classes ConveyorBelt and Register should have synchronization code.
\item [a15-sync-conveyor] ConveyorBelt should have one Lock and two Conditions: itemsAvailable and spaceAvailable.
\item [a15-no-synchronized] Only Locks may be used for synchronization.
There should be no synchronized blocks or methods.
\item [a15-sync-register] The class Register should a Lock for synchronization.
......
......@@ -13,6 +13,7 @@ set[Message] allAssignmentSupermarketRules(M3 model, set[Declaration] ast)
= aSupermarket_no_synchronized_modifier(model)
+ aSupermarket_no_synchronized_block(ast)
+ aSupermarket_only_register_belt_synchronization(model)
+ aSupermarket_synchronization_exists(model)
;
set[Message] aSupermarket_no_synchronized_modifier(M3 model) =
......@@ -31,4 +32,10 @@ set[Message] aSupermarket_only_register_belt_synchronization(M3 model) =
| c <- classes(model) - { findClass(model, "Register"), findClass(model, "ConveyorBelt") }
, javaUtilLock in allTypeDependenciesLoc(model, c)
|| javaUtilCondition in allTypeDependenciesLoc(model, c)
};
\ No newline at end of file
};
set[Message] aSupermarket_synchronization_exists(M3 model)
= classDependsOn(model, "ConveyorBelt", javaUtilLock)
+ classDependsOn(model, "ConveyorBelt", javaUtilCondition)
+ classDependsOn(model, "Register", javaUtilLock)
;
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
</classpath>
**/bin/
**/build/
**/nbproject/private/
**/dist/
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>assignment15-supermarket-start</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<!-- You may freely edit this file. See commented blocks below for -->
<!-- some examples of how to customize the build. -->
<!-- (If you delete it and reopen the project it will be recreated.) -->
<!-- By default, only the Clean and Build commands use this build script. -->
<!-- Commands such as Run, Debug, and Test only use this build script if -->
<!-- the Compile on Save feature is turned off for the project. -->
<!-- You can turn off the Compile on Save (or Deploy on Save) setting -->
<!-- in the project's Project Properties dialog box.-->
<project name="SuperFastStart" default="default" basedir=".">
<description>Builds, tests, and runs the project SuperFastStart.</description>
<import file="nbproject/build-impl.xml"/>
<!--
There exist several targets which are by default empty and which can be
used for execution of your tasks. These targets are usually executed
before and after some main targets. They are:
-pre-init: called before initialization of project properties
-post-init: called after initialization of project properties
-pre-compile: called before javac compilation
-post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
-pre-jar: called before JAR building
-post-jar: called after JAR building
-post-clean: called after cleaning build products
(Targets beginning with '-' are not intended to be called on their own.)
Example of inserting an obfuscator after compilation could look like this:
<target name="-post-compile">
<obfuscate>
<fileset dir="${build.classes.dir}"/>
</obfuscate>
</target>
For list of available properties check the imported
nbproject/build-impl.xml file.
Another way to customize the build is by overriding existing main targets.
The targets of interest are:
-init-macrodef-javac: defines macro for javac compilation
-init-macrodef-junit: defines macro for junit execution
-init-macrodef-debug: defines macro for class debugging
-init-macrodef-java: defines macro for class execution
-do-jar: JAR building
run: execution of project
-javadoc-build: Javadoc generation
test-report: JUnit report generation
An example of overriding the target for project execution could look like this:
<target name="run" depends="SuperFastStart-impl.jar">
<exec dir="bin" executable="launcher.exe">
<arg file="${dist.jar}"/>
</exec>
</target>
Notice that the overridden target depends on the jar target and not only on
the compile target as the regular run target does. Again, for a list of available
properties which you can use, check the target you are overriding in the
nbproject/build-impl.xml file.
-->
</project>
Manifest-Version: 1.0
X-COMMENT: Main-Class will be added automatically by build
build.xml.data.CRC32=ef5d527c
build.xml.script.CRC32=f2d1ec8e
build.xml.stylesheet.CRC32=f85dc8f2@1.90.1.48
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=ef5d527c
nbproject/build-impl.xml.script.CRC32=e8c079b5
nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.90.1.48
annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false
annotation.processing.processor.options=
annotation.processing.processors.list=
annotation.processing.run.all.processors=true
annotation.processing.source.output=${build.generated.sources.dir}/ap-source-output
build.classes.dir=${build.dir}/classes
build.classes.excludes=**/*.java,**/*.form
# This directory is removed when the project is cleaned:
build.dir=build
build.generated.dir=${build.dir}/generated
build.generated.sources.dir=${build.dir}/generated-sources
# Only compile against the classpath explicitly listed here:
build.sysclasspath=ignore
build.test.classes.dir=${build.dir}/test/classes
build.test.results.dir=${build.dir}/test/results
# Uncomment to specify the preferred debugger connection transport:
#debug.transport=dt_socket
debug.classpath=\
${run.classpath}
debug.modulepath=\
${run.modulepath}
debug.test.classpath=\
${run.test.classpath}
debug.test.modulepath=\
${run.test.modulepath}
# Files in build.classes.dir which should be excluded from distribution jar
dist.archive.excludes=
# This directory is removed when the project is cleaned:
dist.dir=dist
dist.jar=${dist.dir}/SuperFastStart.jar
dist.javadoc.dir=${dist.dir}/javadoc
dist.jlink.dir=${dist.dir}/jlink
dist.jlink.output=${dist.jlink.dir}/SuperFastStart
excludes=
includes=**
jar.compress=false
javac.classpath=
# Space-separated list of extra javac options
javac.compilerargs=
javac.deprecation=false
javac.external.vm=true
javac.modulepath=
javac.processormodulepath=
javac.processorpath=\
${javac.classpath}
javac.source=1.8
javac.target=1.8
javac.test.classpath=\
${javac.classpath}:\
${build.classes.dir}
javac.test.modulepath=\
${javac.modulepath}
javac.test.processorpath=\
${javac.test.classpath}
javadoc.additionalparam=
javadoc.author=false
javadoc.encoding=${source.encoding}
javadoc.html5=false
javadoc.noindex=false
javadoc.nonavbar=false
javadoc.notree=false
javadoc.private=false
javadoc.splitindex=true
javadoc.use=true
javadoc.version=false
javadoc.windowtitle=
# The jlink additional root modules to resolve
jlink.additionalmodules=
# The jlink additional command line parameters
jlink.additionalparam=
jlink.launcher=true
jlink.launcher.name=SuperFastStart
main.class=Main
manifest.file=manifest.mf
meta.inf.dir=${src.dir}/META-INF
mkdist.disabled=false
platform.active=Oracle_JDK_1.8
run.classpath=\
${javac.classpath}:\
${build.classes.dir}
# Space-separated list of JVM arguments used when running the project.
# You may also define separate properties like run-sys-prop.name=value instead of -Dname=value.
# To set system properties for unit tests define test-sys-prop.name=value:
run.jvmargs=
run.modulepath=\
${javac.modulepath}
run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
run.test.modulepath=\
${javac.test.modulepath}
source.encoding=UTF-8
src.dir=src
test.src.dir=test
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>SuperFastStart</name>
<explicit-platform explicit-source-supported="true"/>
<source-roots>
<root id="src.dir"/>
</source-roots>
<test-roots>
<root id="test.src.dir"/>
</test-roots>
</data>
</configuration>
</project>
package supermarket;
import java.util.concurrent.Callable;
public class Cashier implements Callable<Void> {
private final Register checkout;
public Cashier(Register checkout) {
this.checkout = checkout;
}
@Override
public Void call() {
return null;
}
}
package supermarket;
public class ConveyorBelt {
private final int[] elements;
private int amount, begin, end;
public ConveyorBelt(int size) {
elements = new int[size];
amount = 0;
begin = 0;
end = 0;
}
public void putIn(int item) {
elements[end] = item;
end = (end + 1) % elements.length;
amount = amount + 1;
}
public int removeFrom() { // Assumes there is at least one element
int item = elements[begin];
begin = (begin + 1) % elements.length;
amount = amount - 1;
return item;
}
}
package supermarket;
import java.util.Random;
import java.util.concurrent.Callable;
public class Customer implements Callable<Integer> {
public static final int MAX_ITEMS = 20;
private final Store store;
private final int customerNumber;
private final int numberOfArticles;
private final static Random GENERATOR = new Random();
public Customer(int number, Store store) {
this.store = store;
customerNumber = number;
numberOfArticles = GENERATOR.nextInt(MAX_ITEMS) + 1;
}
@Override
public Integer call() {
return -1;
}
}
package supermarket;
public class Item {
private int barcode;
public Item(int barcode) {
this.barcode = barcode;
}
}
package supermarket;
import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
public class Main {
private static final int NR_OF_CLIENTS = 30;
public static void main(String[] args) throws InterruptedException {
ExecutorService executor = Executors.newCachedThreadPool();
Store store = new Store(executor);
List<Future<Void>> cashiers = store.open();
List<Customer> customers = IntStream.range(0, NR_OF_CLIENTS).mapToObj(i -> new Customer(i, store))
.collect(Collectors.toList());
List<Future<Integer>> customerResults = executor.invokeAll(customers);
int result = 0;
System.out.println("All customers are done. " + result + " items sold.");
}
}
package supermarket;
public class Register {
// Make sure that CONVEYOR_SIZE + BIN_SIZE >= Customer.MAX_ITEMS, otherwise
// danger of deadlock
private static final int CONVEYER_SIZE = 10, BIN_SIZE = 10;
public void putOnBelt(Item article) {
}
public Item removeFromBelt() {
return null;
}
public void putInBin(Item article) {
}
public Item removeFromBin() {
return null;
}
public void claim() {
}
public void free() {
}
}
package supermarket;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
public class Store {
public static final int NUMBER_OF_CHECKOUTS = 5;
private final List<Register> registers;
private final ExecutorService executor;
private final List<Cashier> cashiers;
public Store(ExecutorService executor) {
this.executor = executor;
registers = IntStream.range(0, NUMBER_OF_CHECKOUTS)
.mapToObj(i -> new Register())
.collect(Collectors.toList());
cashiers = registers.stream()
.map(r -> new Cashier(r))
.collect(Collectors.toList());
}
public List<Future<Void>> open() {
return cashiers.stream().map(c -> executor.submit(c)).collect(Collectors.toList());
}
public List<Item> getItems(int amount) {
return IntStream.range(0, amount)
.mapToObj(i -> new Item(i))
.collect(Collectors.toList());
}
public Register claimRegister(int registerNr) {
return registers.get(registerNr);
}
}
......@@ -33,4 +33,15 @@ test bool aSupermarketSynchronizationEverywhere()
, "class Customer should not have synchronization code"
, "class Cashier should not have synchronization code"
} == messages(errors);
}
test bool aSupermarketStart()
{
<model,ast> = loadTestBoth("assignment15-supermarket-start");
errors = allAssignmentSupermarketRules(model,ast) + allCodingRules(model);
return
{ "ConveyorBelt should use |java+interface:///java/util/concurrent/locks/Lock|"
, "ConveyorBelt should use |java+interface:///java/util/concurrent/locks/Condition|"
, "Register should use |java+interface:///java/util/concurrent/locks/Lock|"
} == messages(errors);
}
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment