Skip to content
Snippets Groups Projects
Commit a49dd057 authored by Markus Alexander Kuppe's avatar Markus Alexander Kuppe
Browse files

Do *not* start the distributed FPSet with the daemon-style worker. The

worker and fpset clean-up/shutdown routines are *not* sync'ed yet and
thus potentially conflicting with each other.
The majority of use cases will prefer to use a worker and not an FPSet.
Hence, FPSet is off and worker mode on.
parent a20b1349
Branches
Tags
No related merge requests found
......@@ -60,15 +60,29 @@ public class IndexServlet extends URLHttpServlet {
"wget <a href=\"" + addr + "/files/dist-tlc.zip\">" + addr + "/files/dist-tlc.zip</a>\n" +
"unzip dist-tlc.zip\n" +
"cd disttlc/\n" +
"java -Djava.rmi.server.hostname=" + remoteAddr + " -Dorg.lamport.tla.distributed.consumer.TLCWorkerConsumer.uri=rmi://" + url.getHost() + ":10997 -jar dist-tlc.jar " +
"\n</pre>\n" +
"java -Djava.rmi.server.hostname="
+ remoteAddr
+ " -Dorg.lamport.tla.distributed.consumer.TLCWorkerConsumer.uri=rmi://"
+ url.getHost()
+ ":10997 "
// + "-Dorg.lamport.tla.distributed.consumer.DistributedFPSetConsumer.uri=rmi://"
// + url.getHost() + ":10997 "
+ "-jar dist-tlc.jar "
+ "\n</pre>\n" +
// Windows Powershell 2.0 with manually created C:\\tmp folder ($env:temp does not seem to work) and x86 Java installed in default location
"<h4>Windows Powershell 2.0:</h4>" +
"<pre>\n" +
"(new-object System.Net.WebClient).DownloadFile(\"" + addr + "/files/dist-tlc.zip\", \"C:\\tmp\\dist-tlc.zip\")\n" +
"(new-object -com shell.application).namespace(\"C:\\tmp\").CopyHere((new-object -com shell.application).namespace(\"C:\\tmp\\dist-tlc.zip\").Items(),16)\n" +
"& 'C:\\Program Files (x86)\\Java\\jre7\\bin\\java.exe' \"-Djava.rmi.server.hostname=" + remoteAddr + "\" \"-Dorg.lamport.tla.distributed.consumer.TLCWorkerConsumer.uri=rmi://" + url.getHost() + ":10997\" -jar C:\\tmp\\disttlc\\dist-tlc.jar" +
"\n</pre>\n" +
"& 'C:\\Program Files (x86)\\Java\\jre7\\bin\\java.exe' \"-Djava.rmi.server.hostname="
+ remoteAddr
+ "\" \"-Dorg.lamport.tla.distributed.consumer.TLCWorkerConsumer.uri=rmi://"
+ url.getHost()
+ ":10997\" "
// + "\"-Dorg.lamport.tla.distributed.consumer.DistributedFPSetConsumer.uri=rmi://"
// + url.getHost() + ":10997\" "
+ "-jar C:\\tmp\\disttlc\\dist-tlc.jar"
+ "\n</pre>\n" +
"</li>");
resp.getWriter().println(
"</ul>\n" +
......
<?xml version="1.0" encoding="UTF-8"?>
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="org.lamport.tlatools.consumer.distributed.fpset">
<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" enabled="false" name="org.lamport.tlatools.consumer.distributed.fpset">
<implementation class="org.lamport.tla.distributed.consumer.DistributedFPSetConsumer"/>
<reference bind="setIDistributedFPSet" cardinality="1..1" interface="tlc2.IDistributedFPSet" name="IDistributedFPSet" policy="static" unbind="unsetIDistributedFPSet"/>
</scr:component>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment