Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge pull request #2 from mquinson/master
authorfabienchaix <fabien.chaix@gmail.com>
Tue, 23 Feb 2016 10:01:36 +0000 (12:01 +0200)
committerfabienchaix <fabien.chaix@gmail.com>
Tue, 23 Feb 2016 10:01:36 +0000 (12:01 +0200)
Importing new commits from the main fork

1225 files changed:
.cproject
.editorconfig [new file with mode: 0644]
.gitignore
.travis.yml
CMakeLists.txt
ChangeLog
appveyor.yml
configure [deleted file]
contrib/deployment_generation/generate_random_deployment.pl [deleted file]
contrib/psg/Makefile [deleted file]
contrib/psg/README.txt [deleted file]
contrib/psg/configs/bittorrent.txt [deleted file]
contrib/psg/configs/bittorrentPSG.txt [deleted file]
contrib/psg/configs/chord.txt [deleted file]
contrib/psg/configs/chordPSG.txt [deleted file]
contrib/psg/configs/edaggregation.txt [deleted file]
contrib/psg/configs/edaggregationPSG.txt [deleted file]
contrib/psg/configs/symphony.txt [deleted file]
contrib/psg/configs/symphonyPSG.txt [deleted file]
contrib/psg/lib.jar [deleted file]
contrib/psg/platforms/psg.xml [deleted file]
contrib/psg/run.sh [deleted file]
contrib/psg/src/example/bittorrent/BTObserver.java [deleted file]
contrib/psg/src/example/bittorrent/BitTorrent.java [deleted file]
contrib/psg/src/example/bittorrent/BitfieldMsg.java [deleted file]
contrib/psg/src/example/bittorrent/IntMsg.java [deleted file]
contrib/psg/src/example/bittorrent/NetworkDynamics.java [deleted file]
contrib/psg/src/example/bittorrent/NetworkInitializer.java [deleted file]
contrib/psg/src/example/bittorrent/NodeInitializer.java [deleted file]
contrib/psg/src/example/bittorrent/PeerSetMsg.java [deleted file]
contrib/psg/src/example/bittorrent/SimpleEvent.java [deleted file]
contrib/psg/src/example/bittorrent/SimpleMsg.java [deleted file]
contrib/psg/src/example/chord/ChordInitializer.java [deleted file]
contrib/psg/src/example/chord/ChordMessage.java [deleted file]
contrib/psg/src/example/chord/ChordProtocol.java [deleted file]
contrib/psg/src/example/chord/CreateNw.java [deleted file]
contrib/psg/src/example/chord/FinalMessage.java [deleted file]
contrib/psg/src/example/chord/LookUpMessage.java [deleted file]
contrib/psg/src/example/chord/MessageCounterObserver.java [deleted file]
contrib/psg/src/example/chord/NodeComparator.java [deleted file]
contrib/psg/src/example/chord/Parameters.java [deleted file]
contrib/psg/src/example/chord/TrafficGenerator.java [deleted file]
contrib/psg/src/example/edaggregation/AverageED.java [deleted file]
contrib/psg/src/example/symphony/AdapterIterableNetwork.java [deleted file]
contrib/psg/src/example/symphony/AdapterSymphonyNodeComparator.java [deleted file]
contrib/psg/src/example/symphony/Handler.java [deleted file]
contrib/psg/src/example/symphony/LeaveTest.java [deleted file]
contrib/psg/src/example/symphony/Message.java [deleted file]
contrib/psg/src/example/symphony/NetworkSizeEstimatorProtocolInterface.java [deleted file]
contrib/psg/src/example/symphony/RandomRouteTest.java [deleted file]
contrib/psg/src/example/symphony/RingRouteTest.java [deleted file]
contrib/psg/src/example/symphony/RoutingException.java [deleted file]
contrib/psg/src/example/symphony/SimpleNetworkSizeEstimatorProtocol.java [deleted file]
contrib/psg/src/example/symphony/SymphonyEstimationProtocol.java [deleted file]
contrib/psg/src/example/symphony/SymphonyNetworkBuilder.java [deleted file]
contrib/psg/src/example/symphony/SymphonyNetworkChecker.java [deleted file]
contrib/psg/src/example/symphony/SymphonyNetworkManager.java [deleted file]
contrib/psg/src/example/symphony/SymphonyNodeComparator.java [deleted file]
contrib/psg/src/example/symphony/SymphonyNodeInizializer.java [deleted file]
contrib/psg/src/example/symphony/SymphonyProtocol.java [deleted file]
contrib/psg/src/example/symphony/SymphonyStatistics.java [deleted file]
contrib/psg/src/example/symphony/Tuple.java [deleted file]
contrib/psg/src/example/symphony/test/NetworkEstimationTest.java [deleted file]
contrib/psg/src/peersim/Simulator.java [deleted file]
contrib/psg/src/peersim/cdsim/CDProtocol.java [deleted file]
contrib/psg/src/peersim/cdsim/CDSimulator.java [deleted file]
contrib/psg/src/peersim/cdsim/CDState.java [deleted file]
contrib/psg/src/peersim/cdsim/DaemonProtocol.java [deleted file]
contrib/psg/src/peersim/cdsim/FullNextCycle.java [deleted file]
contrib/psg/src/peersim/cdsim/NextCycle.java [deleted file]
contrib/psg/src/peersim/cdsim/Shuffle.java [deleted file]
contrib/psg/src/peersim/config/CheckConfig.java [deleted file]
contrib/psg/src/peersim/config/ClassFinder.java [deleted file]
contrib/psg/src/peersim/config/ConfigContainer.java [deleted file]
contrib/psg/src/peersim/config/ConfigProperties.java [deleted file]
contrib/psg/src/peersim/config/Configuration.java [deleted file]
contrib/psg/src/peersim/config/FastConfig.java [deleted file]
contrib/psg/src/peersim/config/IllegalParameterException.java [deleted file]
contrib/psg/src/peersim/config/MissingParameterException.java [deleted file]
contrib/psg/src/peersim/config/NullPrintStream.java [deleted file]
contrib/psg/src/peersim/config/Operators.java [deleted file]
contrib/psg/src/peersim/config/ParsedProperties.java [deleted file]
contrib/psg/src/peersim/core/Cleanable.java [deleted file]
contrib/psg/src/peersim/core/CommonState.java [deleted file]
contrib/psg/src/peersim/core/Control.java [deleted file]
contrib/psg/src/peersim/core/Fallible.java [deleted file]
contrib/psg/src/peersim/core/GeneralNode.java [deleted file]
contrib/psg/src/peersim/core/IdleProtocol.java [deleted file]
contrib/psg/src/peersim/core/Linkable.java [deleted file]
contrib/psg/src/peersim/core/MaliciousProtocol.java [deleted file]
contrib/psg/src/peersim/core/ModifiableNode.java [deleted file]
contrib/psg/src/peersim/core/Network.java [deleted file]
contrib/psg/src/peersim/core/Node.java [deleted file]
contrib/psg/src/peersim/core/OracleIdleProtocol.java [deleted file]
contrib/psg/src/peersim/core/OverlayGraph.java [deleted file]
contrib/psg/src/peersim/core/Protocol.java [deleted file]
contrib/psg/src/peersim/core/Scheduler.java [deleted file]
contrib/psg/src/peersim/dynamics/DynamicNetwork.java [deleted file]
contrib/psg/src/peersim/dynamics/MethodInvoker.java [deleted file]
contrib/psg/src/peersim/dynamics/NodeInitializer.java [deleted file]
contrib/psg/src/peersim/dynamics/OscillatingNetwork.java [deleted file]
contrib/psg/src/peersim/dynamics/RandNI.java [deleted file]
contrib/psg/src/peersim/dynamics/StarNI.java [deleted file]
contrib/psg/src/peersim/dynamics/WireByMethod.java [deleted file]
contrib/psg/src/peersim/dynamics/WireFromFile.java [deleted file]
contrib/psg/src/peersim/dynamics/WireGraph.java [deleted file]
contrib/psg/src/peersim/dynamics/WireKOut.java [deleted file]
contrib/psg/src/peersim/dynamics/WireRegRootedTree.java [deleted file]
contrib/psg/src/peersim/dynamics/WireRingLattice.java [deleted file]
contrib/psg/src/peersim/dynamics/WireScaleFreeBA.java [deleted file]
contrib/psg/src/peersim/dynamics/WireScaleFreeDM.java [deleted file]
contrib/psg/src/peersim/dynamics/WireStar.java [deleted file]
contrib/psg/src/peersim/dynamics/WireWS.java [deleted file]
contrib/psg/src/peersim/edsim/CDScheduler.java [deleted file]
contrib/psg/src/peersim/edsim/ControlEvent.java [deleted file]
contrib/psg/src/peersim/edsim/EDProtocol.java [deleted file]
contrib/psg/src/peersim/edsim/EDSimulator.java [deleted file]
contrib/psg/src/peersim/edsim/Heap.java [deleted file]
contrib/psg/src/peersim/edsim/NextCycleEvent.java [deleted file]
contrib/psg/src/peersim/edsim/PriorityQ.java [deleted file]
contrib/psg/src/peersim/edsim/RandNextCycle.java [deleted file]
contrib/psg/src/peersim/edsim/RegRandNextCycle.java [deleted file]
contrib/psg/src/peersim/edsim/edsim_jsp.xmi [deleted file]
contrib/psg/src/peersim/edsim/edsim_kdm.xmi [deleted file]
contrib/psg/src/peersim/graph/BitMatrixGraph.java [deleted file]
contrib/psg/src/peersim/graph/ConstUndirGraph.java [deleted file]
contrib/psg/src/peersim/graph/FastUndirGraph.java [deleted file]
contrib/psg/src/peersim/graph/Graph.java [deleted file]
contrib/psg/src/peersim/graph/GraphAlgorithms.java [deleted file]
contrib/psg/src/peersim/graph/GraphFactory.java [deleted file]
contrib/psg/src/peersim/graph/GraphIO.java [deleted file]
contrib/psg/src/peersim/graph/NeighbourListGraph.java [deleted file]
contrib/psg/src/peersim/graph/PrefixSubGraph.java [deleted file]
contrib/psg/src/peersim/graph/SubGraphEdges.java [deleted file]
contrib/psg/src/peersim/graph/UndirectedGraph.java [deleted file]
contrib/psg/src/peersim/rangesim/ProcessHandler.java [deleted file]
contrib/psg/src/peersim/rangesim/ProcessManager.java [deleted file]
contrib/psg/src/peersim/rangesim/RangeSimulator.java [deleted file]
contrib/psg/src/peersim/rangesim/TaggedOutputStream.java [deleted file]
contrib/psg/src/peersim/reports/BallExpansion.java [deleted file]
contrib/psg/src/peersim/reports/Clustering.java [deleted file]
contrib/psg/src/peersim/reports/ConnectivityObserver.java [deleted file]
contrib/psg/src/peersim/reports/DegreeStats.java [deleted file]
contrib/psg/src/peersim/reports/GraphObserver.java [deleted file]
contrib/psg/src/peersim/reports/GraphPrinter.java [deleted file]
contrib/psg/src/peersim/reports/GraphStats.java [deleted file]
contrib/psg/src/peersim/reports/MemoryObserver.java [deleted file]
contrib/psg/src/peersim/reports/RandRemoval.java [deleted file]
contrib/psg/src/peersim/transport/E2ENetwork.java [deleted file]
contrib/psg/src/peersim/transport/E2ETransport.java [deleted file]
contrib/psg/src/peersim/transport/KingParser.java [deleted file]
contrib/psg/src/peersim/transport/RouterInfo.java [deleted file]
contrib/psg/src/peersim/transport/Transport.java [deleted file]
contrib/psg/src/peersim/transport/TriangularMatrixParser.java [deleted file]
contrib/psg/src/peersim/transport/UniformRandomTransport.java [deleted file]
contrib/psg/src/peersim/transport/UniformRouterAssignment.java [deleted file]
contrib/psg/src/peersim/transport/UnreliableTransport.java [deleted file]
contrib/psg/src/peersim/util/ExtendedRandom.java [deleted file]
contrib/psg/src/peersim/util/FileNameGenerator.java [deleted file]
contrib/psg/src/peersim/util/IncrementalFreq.java [deleted file]
contrib/psg/src/peersim/util/IncrementalStats.java [deleted file]
contrib/psg/src/peersim/util/IndexIterator.java [deleted file]
contrib/psg/src/peersim/util/LinearIterator.java [deleted file]
contrib/psg/src/peersim/util/MedianStats.java [deleted file]
contrib/psg/src/peersim/util/MomentStats.java [deleted file]
contrib/psg/src/peersim/util/RandPermutation.java [deleted file]
contrib/psg/src/peersim/util/StringListParser.java [deleted file]
contrib/psg/src/peersim/util/WeightedRandPerm.java [deleted file]
contrib/psg/src/peersim/vector/Getter.java [deleted file]
contrib/psg/src/peersim/vector/GetterSetterFinder.java [deleted file]
contrib/psg/src/peersim/vector/InitVectFromFile.java [deleted file]
contrib/psg/src/peersim/vector/LinearDistribution.java [deleted file]
contrib/psg/src/peersim/vector/Normalizer.java [deleted file]
contrib/psg/src/peersim/vector/PeakDistribution.java [deleted file]
contrib/psg/src/peersim/vector/Setter.java [deleted file]
contrib/psg/src/peersim/vector/SingleValue.java [deleted file]
contrib/psg/src/peersim/vector/SingleValueComparator.java [deleted file]
contrib/psg/src/peersim/vector/SingleValueHolder.java [deleted file]
contrib/psg/src/peersim/vector/SingleValueObserver.java [deleted file]
contrib/psg/src/peersim/vector/TestVectors.java [deleted file]
contrib/psg/src/peersim/vector/UniformDistribution.java [deleted file]
contrib/psg/src/peersim/vector/ValueDumper.java [deleted file]
contrib/psg/src/peersim/vector/VectAngle.java [deleted file]
contrib/psg/src/peersim/vector/VectControl.java [deleted file]
contrib/psg/src/peersim/vector/VectCopy.java [deleted file]
contrib/psg/src/peersim/vector/VectorComparator.java [deleted file]
contrib/psg/src/peersim/vector/VectorObserver.java [deleted file]
contrib/psg/src/psgsim/NodeHost.java [deleted file]
contrib/psg/src/psgsim/PSGDynamicNetwork.java [deleted file]
contrib/psg/src/psgsim/PSGPlatform.java [deleted file]
contrib/psg/src/psgsim/PSGProcessController.java [deleted file]
contrib/psg/src/psgsim/PSGProcessCycle.java [deleted file]
contrib/psg/src/psgsim/PSGProcessEvent.java [deleted file]
contrib/psg/src/psgsim/PSGProcessLauncher.java [deleted file]
contrib/psg/src/psgsim/PSGSimulator.java [deleted file]
contrib/psg/src/psgsim/PSGTask.java [deleted file]
contrib/psg/src/psgsim/PSGTransport.java [deleted file]
contrib/psg/src/psgsim/Sizable.java [deleted file]
contrib/psg/test.sh [deleted file]
contrib/psg/tutorial.odt [deleted file]
contrib/psg/tutorial.pdf [deleted file]
doc/Doxyfile.in
doc/HelloWorld/CMakeLists.txt [deleted file]
doc/HelloWorld/HelloWorld.c [deleted file]
doc/HelloWorld/README [deleted file]
doc/Layout.xml
doc/doxygen/contributing.doc
doc/doxygen/deployment.doc
doc/doxygen/getting_started.doc
doc/doxygen/index.doc
doc/doxygen/inside_tests.doc
doc/doxygen/install.doc
doc/doxygen/options.doc
doc/doxygen/platform.doc
doc/doxygen/tracing.doc
doc/msg-tuto-src/deployment0.xml
doc/msg-tuto-src/deployment1.xml
doc/msg-tuto-src/deployment2.xml
doc/msg-tuto-src/deployment3.xml
doc/msg-tuto-src/deployment_general.xml
doc/msg-tuto-src/masterworker1.c
doc/msg-tuto-src/masterworker2.c
doc/msg-tuto-src/masterworker3.c
doc/msg-tuto-src/masterworker4.c
doc/simgrid.css [deleted file]
examples/java/CMakeLists.txt
examples/java/async/AsyncTest.java
examples/java/async/CMakeLists.txt
examples/java/async/FinalizeTask.java
examples/java/async/Forwarder.java
examples/java/async/Master.java
examples/java/async/Slave.java
examples/java/async/asyncDeployment.xml
examples/java/bittorrent/Bittorrent.java
examples/java/bittorrent/CMakeLists.txt
examples/java/bittorrent/Common.java
examples/java/bittorrent/Connection.java
examples/java/bittorrent/MessageTask.java
examples/java/bittorrent/Peer.java
examples/java/bittorrent/Tracker.java
examples/java/bittorrent/TrackerTask.java
examples/java/bittorrent/bittorrent.xml
examples/java/bittorrent/generate.py
examples/java/chord/CMakeLists.txt
examples/java/chord/Chord.java
examples/java/chord/ChordTask.java
examples/java/chord/Common.java
examples/java/chord/FindSuccessorAnswerTask.java
examples/java/chord/FindSuccessorTask.java
examples/java/chord/GetPredecessorAnswerTask.java
examples/java/chord/GetPredecessorTask.java
examples/java/chord/Node.java
examples/java/chord/NotifyTask.java
examples/java/chord/chord.xml
examples/java/cloud/CMakeLists.txt
examples/java/cloud/Cloud.java
examples/java/cloud/FinalizeTask.java
examples/java/cloud/Master.java
examples/java/cloud/Slave.java
examples/java/cloud/energy/CMakeLists.txt
examples/java/cloud/energy/EnergyVMRunner.java
examples/java/cloud/energy/Main.java
examples/java/cloud/migration/CMakeLists.txt
examples/java/cloud/migration/Main.java
examples/java/cloud/migration/Test.java
examples/java/cloud/migration/TestHostOnOff.java
examples/java/cloud/migration/XVM.java
examples/java/cloud/migration/deploy_simple.xml
examples/java/cloud/migration/migration.tesh
examples/java/commTime/CMakeLists.txt
examples/java/commTime/CommTimeTest.java
examples/java/commTime/FinalizeTask.java
examples/java/commTime/Master.java
examples/java/commTime/README [deleted file]
examples/java/commTime/Slave.java
examples/java/commTime/commTimeDeployment.xml
examples/java/energy/CMakeLists.txt
examples/java/energy/Energy.java
examples/java/energy/EnergyConsumer.java
examples/java/io/CMakeLists.txt
examples/java/io/Client.java
examples/java/io/IO.java
examples/java/io/Node.java
examples/java/io/Storage.java
examples/java/io/storage.tesh [new file with mode: 0644]
examples/java/kademlia/Answer.java
examples/java/kademlia/Bucket.java
examples/java/kademlia/CMakeLists.txt
examples/java/kademlia/Common.java
examples/java/kademlia/Contact.java
examples/java/kademlia/FindNodeAnswerTask.java
examples/java/kademlia/FindNodeTask.java
examples/java/kademlia/Kademlia.java
examples/java/kademlia/KademliaTask.java
examples/java/kademlia/Node.java
examples/java/kademlia/PingAnswerTask.java
examples/java/kademlia/PingTask.java
examples/java/kademlia/RoutingTable.java
examples/java/kademlia/kademlia.xml
examples/java/master_slave_bypass/CMakeLists.txt
examples/java/master_slave_bypass/MsBypass.java
examples/java/master_slave_kill/CMakeLists.txt
examples/java/masterslave/CMakeLists.txt
examples/java/masterslave/deploy.xml
examples/java/masterslave/masterslaveDeployment.xml
examples/java/migration/CMakeLists.txt
examples/java/migration/Emigrant.java
examples/java/migration/Migration.java
examples/java/migration/Policeman.java
examples/java/migration/migrationDeployment.xml
examples/java/mutualExclusion/CMakeLists.txt
examples/java/mutualExclusion/Coordinator.java
examples/java/mutualExclusion/GrantTask.java
examples/java/mutualExclusion/MutexCentral.java
examples/java/mutualExclusion/Node.java
examples/java/mutualExclusion/ReleaseTask.java
examples/java/mutualExclusion/RequestTask.java
examples/java/mutualExclusion/mutex_centralized_deployment.xml
examples/java/pingPong/CMakeLists.txt
examples/java/pingPong/PingPongTask.java
examples/java/pingPong/PingPongTest.java
examples/java/pingPong/README [deleted file]
examples/java/pingPong/Receiver.java
examples/java/pingPong/Sender.java
examples/java/pingPong/pingPongDeployment.xml
examples/java/priority/CMakeLists.txt
examples/java/priority/Priority.java
examples/java/priority/Test.java
examples/java/priority/priorityDeployment.xml
examples/java/startKillTime/CMakeLists.txt
examples/java/startKillTime/Master.java
examples/java/startKillTime/Slave.java
examples/java/startKillTime/StartKillTime.java
examples/java/startKillTime/deployment.xml [deleted file]
examples/java/startKillTime/deployment_kill.xml [deleted file]
examples/java/startKillTime/deployment_start.xml [deleted file]
examples/java/startKillTime/deployment_start_kill.xml
examples/java/suspend/CMakeLists.txt
examples/java/suspend/DreamMaster.java
examples/java/suspend/LazyGuy.java
examples/java/suspend/Suspend.java
examples/java/suspend/suspendDeployment.xml
examples/java/tracing/CMakeLists.txt
examples/java/tracing/PingPongTask.java
examples/java/tracing/README [deleted file]
examples/java/tracing/Receiver.java
examples/java/tracing/Sender.java
examples/java/tracing/TracingTest.java
examples/java/tracing/tracingPingPongDeployment.xml
examples/msg/CMakeLists.txt
examples/msg/actions/CMakeLists.txt
examples/msg/actions/NAS_LU_S_4/deploy_MPI_4.xml [deleted file]
examples/msg/actions/NAS_LU_S_4/instr_actions.tesh [deleted file]
examples/msg/actions/NAS_LU_S_4/simgrid0.txt [deleted file]
examples/msg/actions/NAS_LU_S_4/simgrid1.txt [deleted file]
examples/msg/actions/NAS_LU_S_4/simgrid2.txt [deleted file]
examples/msg/actions/NAS_LU_S_4/simgrid3.txt [deleted file]
examples/msg/actions/actions.c
examples/msg/actions/deployment.xml
examples/msg/actions/deployment_split.xml
examples/msg/actions/storage_actions.c
examples/msg/actions/storage_deployment.xml
examples/msg/bittorrent/CMakeLists.txt
examples/msg/bittorrent/bittorrent.c
examples/msg/bittorrent/bittorrent.h
examples/msg/bittorrent/bittorrent.tesh
examples/msg/bittorrent/bittorrent.xml
examples/msg/bittorrent/bittorrent_platfgen.c [deleted file]
examples/msg/bittorrent/connection.h
examples/msg/bittorrent/generate.py
examples/msg/bittorrent/messages.c
examples/msg/bittorrent/messages.h
examples/msg/bittorrent/peer.c
examples/msg/bittorrent/peer.h
examples/msg/bittorrent/tracker.c
examples/msg/chainsend/CMakeLists.txt
examples/msg/chainsend/broadcaster.c
examples/msg/chainsend/deployment_tesh.xml
examples/msg/chainsend/generate_deployment_file.rb [deleted file]
examples/msg/chord/CMakeLists.txt
examples/msg/chord/chord.c
examples/msg/chord/chord.xml
examples/msg/chord/chord10.xml
examples/msg/chord/generate.py
examples/msg/cloud/CMakeLists.txt
examples/msg/cloud/bound.c
examples/msg/cloud/migrate_vm.c
examples/msg/cloud/multicore.c
examples/msg/cloud/multicore_plat.xml
examples/msg/cloud/scale.c
examples/msg/cloud/two_tasks_vm.c
examples/msg/energy/consumption/CMakeLists.txt
examples/msg/energy/consumption/deployment_consumption.xml
examples/msg/energy/consumption/energy_consumption.c
examples/msg/energy/onoff/CMakeLists.txt
examples/msg/energy/onoff/deployment_onoff.xml
examples/msg/energy/onoff/onoff.c
examples/msg/energy/onoff/platform_onoff.xml
examples/msg/energy/pstate/CMakeLists.txt
examples/msg/energy/pstate/deployment_pstate.xml
examples/msg/energy/pstate/pstate.c
examples/msg/energy/vm/CMakeLists.txt
examples/msg/energy/vm/deployment_consumption.xml
examples/msg/energy/vm/energy_vm.c
examples/msg/exception/CMakeLists.txt
examples/msg/exception/deployment_exception.xml
examples/msg/exception/exception.c
examples/msg/gpu/CMakeLists.txt
examples/msg/gtnets/CMakeLists.txt
examples/msg/gtnets/crosstraffic-d.xml
examples/msg/gtnets/dogbone-d.xml
examples/msg/gtnets/dogbone-p.xml
examples/msg/gtnets/gtnets.c
examples/msg/gtnets/onelink-d.xml
examples/msg/gtnets/onelink-p.xml
examples/msg/icomms/CMakeLists.txt
examples/msg/icomms/deployment_peer.xml
examples/msg/icomms/deployment_peer01.xml
examples/msg/icomms/deployment_peer02.xml
examples/msg/icomms/deployment_peer03.xml
examples/msg/icomms/deployment_peer04.xml
examples/msg/icomms/deployment_peer05.xml
examples/msg/icomms/peer.c
examples/msg/icomms/peer2.c
examples/msg/icomms/peer3.c
examples/msg/io/CMakeLists.txt
examples/msg/io/remote.c
examples/msg/io/remote.tesh
examples/msg/io/remote_io.deployment.xml [moved from examples/platforms/storage/remote_io.deployment.xml with 95% similarity]
examples/msg/kademlia/CMakeLists.txt
examples/msg/kademlia/answer.c
examples/msg/kademlia/answer.h
examples/msg/kademlia/generate.py
examples/msg/kademlia/kademlia.c
examples/msg/kademlia/kademlia.h
examples/msg/kademlia/kademlia.tesh
examples/msg/kademlia/kademlia.xml
examples/msg/kademlia/node.c
examples/msg/kademlia/node.h
examples/msg/kademlia/routing_table.c
examples/msg/kademlia/routing_table.h
examples/msg/kademlia/task.c
examples/msg/kademlia/task.h
examples/msg/masterslave/CMakeLists.txt
examples/msg/masterslave/deployment_masterslave.xml
examples/msg/masterslave/deployment_masterslave_forwarder.xml
examples/msg/masterslave/deployment_masterslave_kill.xml
examples/msg/masterslave/deployment_masterslave_mailbox.xml
examples/msg/masterslave/deployment_masterslave_mailbox_multicore.xml
examples/msg/masterslave/deployment_masterslave_vivaldi.xml
examples/msg/masterslave/masterslave_arg.c
examples/msg/masterslave/masterslave_bypass.c [deleted file]
examples/msg/masterslave/masterslave_bypass.tesh [deleted file]
examples/msg/masterslave/masterslave_cluster.c [deleted file]
examples/msg/masterslave/masterslave_cpu_ti_crosstraffic.tesh
examples/msg/masterslave/masterslave_failure.c
examples/msg/masterslave/masterslave_forwarder.c
examples/msg/masterslave/masterslave_kill.c
examples/msg/masterslave/masterslave_mailbox.c
examples/msg/mc/CMakeLists.txt
examples/msg/mc/bugged1.c
examples/msg/mc/bugged2.c
examples/msg/mc/bugged2.tesh
examples/msg/mc/bugged3.c
examples/msg/mc/deploy_bugged1.xml
examples/msg/mc/deploy_bugged1_liveness.xml
examples/msg/mc/deploy_bugged1_liveness_visited.xml
examples/msg/mc/deploy_bugged2.xml
examples/msg/mc/deploy_bugged2_liveness.xml
examples/msg/mc/deploy_bugged3.xml
examples/msg/mc/deploy_electric_fence.xml
examples/msg/mc/deploy_mutex.xml
examples/msg/mc/platform.xml
examples/msg/migration/CMakeLists.txt
examples/msg/migration/migration.c
examples/msg/migration/migration.deploy
examples/msg/ns3/3hosts_2links_d.xml
examples/msg/ns3/3links-d-timer.xml
examples/msg/ns3/3links-d.xml
examples/msg/ns3/CMakeLists.txt
examples/msg/ns3/One_cluster-d.xml
examples/msg/ns3/Two_clusters-d.xml
examples/msg/ns3/dogbone-d.xml
examples/msg/ns3/ns3.c
examples/msg/ns3/ns3.tesh
examples/msg/parallel_task/CMakeLists.txt
examples/msg/parallel_task/parallel_task.c
examples/msg/parallel_task/parallel_task.tesh
examples/msg/parallel_task/test_ptask.c [deleted file]
examples/msg/parallel_task/test_ptask_deployment.xml [deleted file]
examples/msg/pastry/CMakeLists.txt
examples/msg/pastry/pastry.c
examples/msg/pastry/pastry10.xml
examples/msg/pmm/CMakeLists.txt
examples/msg/pmm/msg_pmm.c
examples/msg/pmm/pmm_9_deploy.xml
examples/msg/priority/CMakeLists.txt
examples/msg/priority/deployment_priority.xml
examples/msg/priority/priority.c
examples/msg/properties/CMakeLists.txt
examples/msg/properties/deployment_properties.xml
examples/msg/properties/msg_prop.c
examples/msg/semaphores/CMakeLists.txt
examples/msg/semaphores/synchro.c
examples/msg/semaphores/synchro.tesh [new file with mode: 0644]
examples/msg/sendrecv/CMakeLists.txt
examples/msg/sendrecv/deployment_sendrecv.xml
examples/msg/sendrecv/deployment_sendrecv_main.xml [new file with mode: 0644]
examples/msg/sendrecv/sendrecv.c
examples/msg/sendrecv/sendrecv_CLM03_main.tesh [new file with mode: 0644]
examples/msg/sendrecv/sendrecv_main.c [new file with mode: 0644]
examples/msg/start_kill_time/CMakeLists.txt
examples/msg/start_kill_time/deployment.xml
examples/msg/start_kill_time/deployment_kill.xml
examples/msg/start_kill_time/deployment_start.xml
examples/msg/start_kill_time/deployment_start_kill.xml
examples/msg/start_kill_time/sk_time.c
examples/msg/suspend/CMakeLists.txt
examples/msg/suspend/deployment_suspend.xml
examples/msg/suspend/suspend.c
examples/msg/token_ring/CMakeLists.txt
examples/msg/token_ring/ring_call.c
examples/msg/token_ring/token_bypass.c [deleted file]
examples/msg/tracing/CMakeLists.txt
examples/msg/tracing/categories.c
examples/msg/tracing/deployment.xml
examples/msg/tracing/ms.c
examples/msg/tracing/procmig-deploy.xml
examples/platforms/2clusters.xml [moved from examples/simdag/2clusters.xml with 94% similarity]
examples/platforms/bypassASroute.xml
examples/platforms/bypassRoute.xml
examples/platforms/cloud.xml
examples/platforms/cluster.xml
examples/platforms/cluster_and_one_host.xml
examples/platforms/cluster_no_backbone.xml
examples/platforms/clusters_routing_full.xml
examples/platforms/conf/gridpp_grid_2004.xml [deleted file]
examples/platforms/conf/lcg_sept2004_grid.xml [deleted file]
examples/platforms/conf/transform_optorsim_platform.pl
examples/platforms/config.xml
examples/platforms/config_tracing.xml
examples/platforms/crosstraffic.xml
examples/platforms/data_center.xml
examples/platforms/energy_platform.xml
examples/platforms/fat_tree_cluster.xml
examples/platforms/faulty_host.xml [new file with mode: 0644]
examples/platforms/g5k.xml
examples/platforms/generation_scripts/create_hierarchical_clusters.pl [deleted file]
examples/platforms/generation_scripts/enhancedDTDwithHierarchicalCluster.pl [deleted file]
examples/platforms/generation_scripts/generate_g5k_platform.pl [deleted file]
examples/platforms/generation_scripts/generate_g5k_platform_cabinets.pl [deleted file]
examples/platforms/griffon.xml
examples/platforms/meta_cluster.xml
examples/platforms/multicore_machine.xml
examples/platforms/platform.lua [deleted file]
examples/platforms/platform.xml
examples/platforms/prop.xml
examples/platforms/routing_cluster.xml
examples/platforms/routing_none.xml
examples/platforms/simulacrum_7_hosts.xml
examples/platforms/small_platform.xml
examples/platforms/small_platform_fatpipe.xml
examples/platforms/small_platform_one_link_routes.xml
examples/platforms/small_platform_with_failures.xml
examples/platforms/small_platform_with_routers.xml
examples/platforms/storage/remote_io.xml
examples/platforms/storage/storage.xml
examples/platforms/syscoord/median_harvard.xml
examples/platforms/syscoord/median_meridian.xml
examples/platforms/syscoord/median_p2psim.xml
examples/platforms/torus_cluster.xml
examples/platforms/trace/faulty_host.trace [moved from examples/simdag/faulty_host.trace with 100% similarity]
examples/platforms/trace/jupiter_speed.trace [moved from examples/simdag/jupiter_power.trace with 100% similarity]
examples/platforms/trace/link1_avail.trace [moved from examples/simdag/link1_avail.trace with 100% similarity]
examples/platforms/two_hosts.xml [new file with mode: 0644]
examples/platforms/two_hosts_platform.xml
examples/platforms/two_hosts_platform_shared.xml
examples/platforms/two_hosts_platform_with_availability.xml
examples/platforms/two_hosts_platform_with_availability_included.xml
examples/platforms/two_peers.xml
examples/platforms/vivaldi.xml
examples/s4u/CMakeLists.txt
examples/s4u/basic/CMakeLists.txt
examples/s4u/basic/s4u_basic.cpp
examples/s4u/io/CMakeLists.txt
examples/s4u/io/s4u_io_test.cpp
examples/scala/CMakeLists.txt [deleted file]
examples/scala/master_slave_bypass/CMakeLists.txt [deleted file]
examples/scala/master_slave_bypass/FinalizeTask.scala [deleted file]
examples/scala/master_slave_bypass/Master.scala [deleted file]
examples/scala/master_slave_bypass/MsBypass.scala [deleted file]
examples/scala/master_slave_bypass/Slave.scala [deleted file]
examples/scala/master_slave_bypass/bypass.tesh [deleted file]
examples/scala/master_slave_kill/FinalizeTask.scala [deleted file]
examples/scala/master_slave_kill/Master.scala [deleted file]
examples/scala/master_slave_kill/MsKill.scala [deleted file]
examples/scala/master_slave_kill/Slave.scala [deleted file]
examples/scala/master_slave_kill/kill.tesh [deleted file]
examples/scala/masterslave/CMakeLists.txt [deleted file]
examples/scala/masterslave/FinalizeTask.scala [deleted file]
examples/scala/masterslave/Forwarder.scala [deleted file]
examples/scala/masterslave/Master.scala [deleted file]
examples/scala/masterslave/Masterslave.scala [deleted file]
examples/scala/masterslave/README [deleted file]
examples/scala/masterslave/Slave.scala [deleted file]
examples/scala/masterslave/masterslave.tesh [deleted file]
examples/scala/masterslave/masterslaveDeployment.xml [deleted file]
examples/simdag/CMakeLists.txt
examples/simdag/dax/CMakeLists.txt
examples/simdag/dax/Montage_50.xml [deleted file]
examples/simdag/dax/dax_test.c
examples/simdag/dax/generate_forkjoin.pl [deleted file]
examples/simdag/dax/generate_strassen.pl [deleted file]
examples/simdag/dax/simple_dax_with_cycle.tesh
examples/simdag/dax/smalldax.tesh
examples/simdag/dot/CMakeLists.txt
examples/simdag/dot/dot_test.c
examples/simdag/dot/dot_test2.c
examples/simdag/dot/ptg_test.c
examples/simdag/dot/simulate_dot.c
examples/simdag/dot/test_simdag_dotload.tesh
examples/simdag/faulty_host.xml [deleted file]
examples/simdag/goal/CMakeLists.txt
examples/simdag/io/CMakeLists.txt
examples/simdag/io/sd_io.c
examples/simdag/metaxml/CMakeLists.txt [deleted file]
examples/simdag/metaxml/metaxml_test.tesh [deleted file]
examples/simdag/metaxml/metaxml_test2.tesh [deleted file]
examples/simdag/metaxml/sd_meta.c [deleted file]
examples/simdag/properties/CMakeLists.txt
examples/simdag/properties/sd_prop.c
examples/simdag/scheduling/CMakeLists.txt
examples/simdag/scheduling/minmin_test.c
examples/simdag/sd_avail.c
examples/simdag/sd_comm_throttling.c
examples/simdag/sd_fail.c
examples/simdag/sd_test.c
examples/simdag/sd_test2.c
examples/simdag/sd_typed_tasks_test.c
examples/simdag/test_simdag.in [deleted file]
examples/simdag/test_simdag2.tesh
examples/simdag/test_simdag_avail.tesh
examples/simdag/test_simdag_comm_throttling.tesh
examples/simdag/test_simdag_fail.tesh
examples/simdag/test_simdag_typed_tasks.tesh
examples/simdag/two_hosts.xml [deleted file]
examples/smpi/CMakeLists.txt
examples/smpi/MM/CMakeLists.txt
examples/smpi/MM/MM_mpi.c
examples/smpi/NAS/DT/Makefile
examples/smpi/NAS/EP/Makefile
examples/smpi/NAS/EP/README [deleted file]
examples/smpi/NAS/EP/ep-sampling.c
examples/smpi/NAS/EP/ep.c
examples/smpi/NAS/EP/mpinpb.h [deleted file]
examples/smpi/NAS/EP/randlc.c [deleted file]
examples/smpi/NAS/EP/randlc.h [deleted file]
examples/smpi/NAS/IS/Makefile
examples/smpi/NAS/Makefile
examples/smpi/NAS/README [deleted file]
examples/smpi/NAS/README.install
examples/smpi/NAS/common/c_print_results.c
examples/smpi/NAS/common/c_timers.c
examples/smpi/NAS/common/randdp.c
examples/smpi/NAS/config/NAS.samples/suite.def.ep [deleted file]
examples/smpi/NAS/config/NAS.samples/suite.def.is [deleted file]
examples/smpi/NAS/config/make.def
examples/smpi/NAS/config/make.def.template [deleted file]
examples/smpi/NAS/config/suite.def.template [deleted file]
examples/smpi/NAS/sys/Makefile
examples/smpi/NAS/sys/README
examples/smpi/NAS/sys/make.common
examples/smpi/NAS/sys/print_header [deleted file]
examples/smpi/NAS/sys/print_instructions
examples/smpi/NAS/sys/setparams.c
examples/smpi/NAS/sys/suite.awk [deleted file]
examples/smpi/energy/CMakeLists.txt
examples/smpi/energy/f77/CMakeLists.txt
examples/smpi/energy/f90/CMakeLists.txt
examples/smpi/mc/bugged1_liveness.c
examples/smpi/mc/non_deterministic.tesh
examples/smpi/mc/non_termination4.c
examples/smpi/mc/only_send_deterministic.c
examples/smpi/mc/only_send_deterministic.tesh
examples/smpi/mvmul.c
examples/smpi/replay_multiple/CMakeLists.txt
examples/smpi/replay_multiple/generate_multiple_deployment.sh
examples/smpi/replay_multiple/replay_multiple.c
examples/smpi/smpi_msg_masterslave/CMakeLists.txt
examples/smpi/smpi_msg_masterslave/deployment_masterslave_mailbox_smpi.xml
examples/smpi/smpi_msg_masterslave/masterslave_mailbox_smpi.c
examples/xbt/CMakeLists.txt [deleted file]
examples/xbt/sem_basic.c [deleted file]
examples/xbt/sem_sched.c [deleted file]
include/simgrid/forward.h
include/simgrid/host.h
include/simgrid/jedule/jedule_events.h
include/simgrid/jedule/jedule_output.h
include/simgrid/jedule/jedule_platform.h
include/simgrid/msg.h
include/simgrid/platf.h [deleted file]
include/simgrid/platf_generator.h [deleted file]
include/simgrid/s4u/actor.hpp
include/simgrid/s4u/async.hpp
include/simgrid/s4u/comm.hpp
include/simgrid/s4u/engine.hpp
include/simgrid/s4u/file.hpp
include/simgrid/s4u/host.hpp
include/simgrid/s4u/mailbox.hpp
include/simgrid/s4u/storage.hpp
include/simgrid/simdag.h
include/simgrid/simix.h
include/simgrid/simix.hpp
include/simgrid_config.h.in
include/smpi/smpi.h
include/smpi/smpi_cocci.h [deleted file]
include/surf/surf_routing.h
include/surf/surfxml_parse.h [deleted file]
include/xbt/base.h
include/xbt/config.h
include/xbt/dynar.h
include/xbt/graphxml.h
include/xbt/hash.h
include/xbt/log.h
include/xbt/range.hpp [new file with mode: 0644]
include/xbt/str.h
include/xbt/strbuff.h
src/bindings/java/MANIFEST.in [moved from src/bindings/java/MANIFEST.MF.in with 100% similarity]
src/bindings/java/jmsg.cpp
src/bindings/java/jmsg.h
src/bindings/java/jmsg_as.cpp
src/bindings/java/jmsg_as.h
src/bindings/java/jmsg_file.h
src/bindings/java/jmsg_host.cpp
src/bindings/java/jmsg_host.h
src/bindings/java/jmsg_process.cpp
src/bindings/java/jmsg_process.h
src/bindings/java/jmsg_storage.cpp
src/bindings/java/jmsg_storage.h
src/bindings/java/jmsg_task.cpp
src/bindings/java/jmsg_task.h
src/bindings/java/jmsg_vm.cpp
src/bindings/java/jmsg_vm.h
src/bindings/java/org/simgrid/msg/As.java
src/bindings/lua/factories/host.lua [deleted file]
src/bindings/lua/lua_debug.cpp [moved from src/bindings/lua/lua_debug.c with 98% similarity]
src/bindings/lua/lua_host.cpp [moved from src/bindings/lua/lua_host.c with 99% similarity]
src/bindings/lua/lua_platf.cpp [moved from src/bindings/lua/lua_platf.c with 91% similarity]
src/bindings/lua/lua_private.h
src/bindings/lua/lua_utils.h
src/bindings/lua/simgrid_lua.cpp [moved from src/bindings/lua/simgrid_lua.c with 97% similarity]
src/bindings/lua/simgrid_lua.h
src/include/mc/datatypes.h
src/include/mc/mc.h
src/include/simgrid/platf_interface.h [deleted file]
src/include/smpi/smpi_interface.h
src/include/surf/maxmin.h
src/include/surf/random_mgr.h [deleted file]
src/include/surf/surf.h
src/instr/instr_config.cpp
src/instr/instr_paje_containers.cpp
src/instr/instr_private.h
src/instr/instr_resource_utilization.cpp
src/instr/jedule/jedule_events.cpp [moved from src/instr/jedule/jedule_events.c with 100% similarity]
src/instr/jedule/jedule_output.cpp [moved from src/instr/jedule/jedule_output.c with 99% similarity]
src/instr/jedule/jedule_platform.cpp [moved from src/instr/jedule/jedule_platform.c with 91% similarity]
src/instr/jedule/jedule_sd_binding.cpp [moved from src/instr/jedule/jedule_sd_binding.c with 100% similarity]
src/mc/AddressSpace.hpp
src/mc/ChunkedData.hpp
src/mc/DwarfExpression.cpp
src/mc/DwarfExpression.hpp
src/mc/Frame.hpp
src/mc/ModelChecker.cpp
src/mc/ModelChecker.hpp
src/mc/ObjectInformation.cpp
src/mc/Process.cpp
src/mc/Process.hpp
src/mc/RegionSnapshot.cpp
src/mc/mc_checkpoint.cpp
src/mc/mc_client.cpp
src/mc/mc_compare.cpp
src/mc/mc_diff.cpp
src/mc/mc_dwarf.cpp
src/mc/mc_ignore.cpp
src/mc/mc_snapshot.cpp
src/mc/mc_snapshot.h
src/mc/mc_unw.cpp
src/mc/simgrid_mc.cpp
src/msg/instr_msg_vm.cpp
src/msg/msg_environment.cpp
src/msg/msg_global.cpp
src/msg/msg_host.cpp
src/msg/msg_io.cpp
src/msg/msg_process.cpp
src/msg/msg_synchro.cpp
src/msg/msg_task.cpp
src/msg/msg_vm.cpp
src/s4u/s4u_actor.cpp
src/s4u/s4u_async.cpp
src/s4u/s4u_comm.cpp
src/s4u/s4u_engine.cpp
src/s4u/s4u_file.cpp
src/s4u/s4u_host.cpp
src/s4u/s4u_mailbox.cpp
src/s4u/s4u_storage.cpp
src/simdag/dax_dtd.c
src/simdag/dax_dtd.h
src/simdag/sd_daxloader.cpp
src/simdag/sd_dotloader.cpp
src/simdag/sd_global.cpp
src/simdag/sd_task.cpp
src/simdag/sd_workstation.cpp
src/simgrid/host.cpp
src/simgrid/sg_config.c
src/simix/BoostContext.cpp
src/simix/BoostContext.hpp
src/simix/Context.cpp
src/simix/RawContext.cpp
src/simix/ThreadContext.cpp
src/simix/ThreadContext.hpp
src/simix/UContext.cpp
src/simix/libsmx.cpp
src/simix/popping_accessors.h
src/simix/popping_bodies.cpp
src/simix/popping_enum.h
src/simix/popping_generated.cpp
src/simix/simcalls.in
src/simix/simcalls.py
src/simix/smx_context.cpp
src/simix/smx_deployment.cpp
src/simix/smx_environment.cpp
src/simix/smx_global.cpp
src/simix/smx_host.cpp
src/simix/smx_network.cpp
src/simix/smx_private.h
src/simix/smx_process.cpp
src/simix/smx_process_private.h
src/simix/smx_synchro.cpp
src/simix/smx_synchro_private.h
src/simix/smx_vm.cpp
src/smpi/colls/colls.h
src/smpi/fixsrc.pl [deleted file]
src/smpi/instr_smpi.cpp [moved from src/smpi/instr_smpi.c with 98% similarity]
src/smpi/myprintloc.cocci [deleted file]
src/smpi/patch_source.sh [deleted file]
src/smpi/private.h
src/smpi/replace_globals.cocci [deleted file]
src/smpi/replace_static.cocci [deleted file]
src/smpi/smpi_base.cpp [moved from src/smpi/smpi_base.c with 95% similarity]
src/smpi/smpi_bench.cpp [moved from src/smpi/smpi_bench.c with 96% similarity]
src/smpi/smpi_c99.cpp [moved from src/smpi/smpi_c99.c with 100% similarity]
src/smpi/smpi_coll.cpp [moved from src/smpi/smpi_coll.c with 95% similarity]
src/smpi/smpi_comm.cpp [moved from src/smpi/smpi_comm.c with 94% similarity]
src/smpi/smpi_deployment.cpp [moved from src/smpi/smpi_deployment.c with 93% similarity]
src/smpi/smpi_dvfs.cpp [moved from src/smpi/smpi_dvfs.c with 88% similarity]
src/smpi/smpi_f77.cpp [moved from src/smpi/smpi_f77.c with 99% similarity]
src/smpi/smpi_global.cpp [moved from src/smpi/smpi_global.c with 93% similarity]
src/smpi/smpi_group.cpp [moved from src/smpi/smpi_group.c with 98% similarity]
src/smpi/smpi_mpi.cpp [moved from src/smpi/smpi_mpi.c with 100% similarity]
src/smpi/smpi_mpi_dt.cpp [moved from src/smpi/smpi_mpi_dt.c with 96% similarity]
src/smpi/smpi_mpi_dt_private.h
src/smpi/smpi_pmpi.cpp [moved from src/smpi/smpi_pmpi.c with 99% similarity]
src/smpi/smpi_replay.cpp [moved from src/smpi/smpi_replay.c with 97% similarity]
src/smpi/smpi_rma.cpp [moved from src/smpi/smpi_rma.c with 97% similarity]
src/smpi/smpi_topo.cpp [moved from src/smpi/smpi_topo.c with 96% similarity]
src/smpi/smpirun.in
src/surf/PropertyHolder.cpp
src/surf/PropertyHolder.hpp
src/surf/cpu_cas01.cpp
src/surf/cpu_cas01.hpp
src/surf/cpu_interface.cpp
src/surf/cpu_interface.hpp
src/surf/cpu_ti.cpp
src/surf/cpu_ti.hpp
src/surf/fair_bottleneck.cpp
src/surf/host_clm03.cpp
src/surf/host_clm03.hpp
src/surf/host_interface.cpp
src/surf/host_interface.hpp
src/surf/instr_routing.cpp
src/surf/instr_surf.cpp [moved from src/surf/instr_surf.c with 94% similarity]
src/surf/lagrange.cpp
src/surf/maxmin.cpp
src/surf/network_cm02.cpp
src/surf/network_cm02.hpp
src/surf/network_constant.cpp
src/surf/network_constant.hpp
src/surf/network_ib.cpp
src/surf/network_interface.cpp
src/surf/network_interface.hpp
src/surf/network_ns3.cpp
src/surf/network_ns3.hpp
src/surf/network_smpi.cpp
src/surf/ns3/ns3_interface.cc
src/surf/platf_generator.c [deleted file]
src/surf/platf_generator_private.h [deleted file]
src/surf/platform.hpp [deleted file]
src/surf/plugins/energy.cpp
src/surf/ptask_L07.cpp [moved from src/surf/host_ptask_L07.cpp with 69% similarity]
src/surf/ptask_L07.hpp [moved from src/surf/host_ptask_L07.hpp with 75% similarity]
src/surf/random_mgr.c [deleted file]
src/surf/sg_platf.cpp
src/surf/storage_interface.cpp
src/surf/storage_interface.hpp
src/surf/storage_n11.cpp
src/surf/storage_n11.hpp
src/surf/surf_c_bindings.cpp
src/surf/surf_interface.cpp
src/surf/surf_interface.hpp
src/surf/surf_private.h
src/surf/surf_routing.cpp
src/surf/surf_routing.hpp
src/surf/surf_routing_RoutedGraph.cpp [new file with mode: 0644]
src/surf/surf_routing_RoutedGraph.hpp [new file with mode: 0644]
src/surf/surf_routing_cluster.cpp
src/surf/surf_routing_cluster.hpp
src/surf/surf_routing_cluster_fat_tree.cpp
src/surf/surf_routing_cluster_fat_tree.hpp
src/surf/surf_routing_cluster_torus.cpp
src/surf/surf_routing_cluster_torus.hpp
src/surf/surf_routing_dijkstra.cpp
src/surf/surf_routing_dijkstra.hpp
src/surf/surf_routing_floyd.cpp
src/surf/surf_routing_floyd.hpp
src/surf/surf_routing_full.cpp
src/surf/surf_routing_full.hpp
src/surf/surf_routing_generic.cpp [deleted file]
src/surf/surf_routing_generic.hpp [deleted file]
src/surf/surf_routing_none.cpp
src/surf/surf_routing_none.hpp
src/surf/surf_routing_private.hpp
src/surf/surf_routing_vivaldi.cpp
src/surf/surf_routing_vivaldi.hpp
src/surf/trace_mgr.cpp
src/surf/trace_mgr.hpp
src/surf/virtual_machine.hpp
src/surf/vm_hl13.cpp
src/surf/vm_hl13.hpp
src/surf/xml/platf.hpp [new file with mode: 0644]
src/surf/xml/platf_private.hpp [new file with mode: 0644]
src/surf/xml/simgrid.dtd [moved from src/surf/simgrid.dtd with 71% similarity]
src/surf/xml/simgrid_dtd.c [moved from src/surf/simgrid_dtd.c with 53% similarity]
src/surf/xml/simgrid_dtd.h [moved from include/surf/simgrid_dtd.h with 96% similarity]
src/surf/xml/surfxml_parseplatf.cpp [moved from src/surf/surfxml_parseplatf.cpp with 59% similarity]
src/surf/xml/surfxml_sax_cb.cpp [moved from src/surf/surfxml_parse.c with 82% similarity]
src/xbt/automaton/automaton.c
src/xbt/automaton/parserPromela.tab.cacc
src/xbt/automaton/parserPromela.tab.hacc
src/xbt/backtrace_linux.c
src/xbt/config.c
src/xbt/dict.c
src/xbt/dynar.c
src/xbt/ex.c
src/xbt/graph.c
src/xbt/graphxml.c
src/xbt/heap.c
src/xbt/lib.c
src/xbt/log.c
src/xbt/mmalloc/mm_module.c
src/xbt/mmalloc/mmtrace.awk [deleted file]
src/xbt/xbt_log_appender_file.c
src/xbt/xbt_main.c
src/xbt/xbt_os_file.c
src/xbt/xbt_os_synchro.c
src/xbt/xbt_os_thread.c
src/xbt/xbt_replay.c
src/xbt/xbt_sg_stubs.c
src/xbt/xbt_str.c
teshsuite/bug-17132/CMakeLists.txt
teshsuite/java/CMakeLists.txt [deleted file]
teshsuite/java/semaphore/CMakeLists.txt [moved from examples/scala/master_slave_kill/CMakeLists.txt with 50% similarity]
teshsuite/java/semaphore/SemaphoreGC.java [new file with mode: 0644]
teshsuite/java/semaphore/semaphore_gc.tesh [new file with mode: 0644]
teshsuite/java/sleep_host_off/CMakeLists.txt
teshsuite/java/sleep_host_off/Main.java [deleted file]
teshsuite/java/sleep_host_off/SleepHostOff.java
teshsuite/java/sleep_host_off/sleep_host_off.tesh
teshsuite/java/sleep_host_off/sleep_host_off_d.xml
teshsuite/mc/CMakeLists.txt
teshsuite/mc/dwarf/CMakeLists.txt
teshsuite/mc/dwarf_expression/CMakeLists.txt
teshsuite/mc/mutex_handling.c
teshsuite/mc/mutex_handling.xml
teshsuite/mc/replay/CMakeLists.txt
teshsuite/mc/replay/random_bug.xml
teshsuite/msg/CMakeLists.txt [deleted file]
teshsuite/msg/get_sender/CMakeLists.txt
teshsuite/msg/get_sender/get_sender_d.xml
teshsuite/msg/host_on_off/CMakeLists.txt
teshsuite/msg/host_on_off/host_on_off.c
teshsuite/msg/host_on_off/host_on_off_d.xml
teshsuite/msg/host_on_off/host_on_off_recv.c
teshsuite/msg/host_on_off/host_on_off_wait.c
teshsuite/msg/host_on_off_processes/CMakeLists.txt
teshsuite/msg/host_on_off_processes/host_on_off_processes_d.xml
teshsuite/msg/pid/CMakeLists.txt
teshsuite/msg/pid/pid_d.xml
teshsuite/msg/process/CMakeLists.txt
teshsuite/msg/process/process.c
teshsuite/msg/process/process_d.xml
teshsuite/msg/process_join/CMakeLists.txt
teshsuite/msg/process_join/process_join_d.xml
teshsuite/msg/storage/CMakeLists.txt
teshsuite/msg/storage/concurrent_rw.c
teshsuite/msg/storage/deployment.xml
teshsuite/msg/storage/storage_basic.c
teshsuite/msg/task_destroy_cancel/CMakeLists.txt
teshsuite/msg/task_destroy_cancel/task_destroy_cancel.c
teshsuite/msg/task_destroy_cancel/task_destroy_cancel_d.xml
teshsuite/msg/trace/CMakeLists.txt
teshsuite/msg/trace/test-hbp1-c0s0-c0s1.xml
teshsuite/msg/trace/test-hbp1-c0s0-c1s0.xml
teshsuite/msg/trace/test-hbp1-c0s1-c0s2.xml
teshsuite/msg/trace/test-hbp1-c0s1-c2s2.xml
teshsuite/msg/trace/test-hbp1-c0s2-c1s0.xml
teshsuite/msg/trace/test-hbp1-c0s2-c1s1.xml
teshsuite/msg/trace/test-hbp1-c1s1-c1s2.xml
teshsuite/msg/trace/test-hbp1-c1s1-c3s2.xml
teshsuite/msg/trace/test-hbp1.0-hbp1.0-hbp1.0.xml
teshsuite/msg/trace/test-hbp1.0-hbp3.0-hbp4.0.xml
teshsuite/msg/trace/test-hbp1.5-hbp1.5.xml
teshsuite/msg/trace/test-hbp2.5-hbp1.5.xml
teshsuite/msg/trace/test_trace_integration.c
teshsuite/simdag/availability/CMakeLists.txt
teshsuite/simdag/availability/availability_test.c
teshsuite/simdag/basic/CMakeLists.txt
teshsuite/simdag/basic/basic0.c
teshsuite/simdag/basic/basic1.c
teshsuite/simdag/basic/basic2.c
teshsuite/simdag/basic/basic3.c
teshsuite/simdag/basic/basic4.c
teshsuite/simdag/basic/basic5.c
teshsuite/simdag/basic/basic6.c
teshsuite/simdag/incomplete/CMakeLists.txt
teshsuite/simdag/incomplete/incomplete.c
teshsuite/simdag/network/CMakeLists.txt [deleted file]
teshsuite/simdag/network/mxn/CMakeLists.txt
teshsuite/simdag/network/mxn/platform_4p_1switch.xml
teshsuite/simdag/network/mxn/test_intra_all2all.c
teshsuite/simdag/network/mxn/test_intra_independent_comm.c
teshsuite/simdag/network/mxn/test_intra_scatter.c
teshsuite/simdag/network/p2p/CMakeLists.txt
teshsuite/simdag/network/p2p/platform_2p_1bb.xml
teshsuite/simdag/network/p2p/platform_2p_1fl.xml
teshsuite/simdag/network/p2p/platform_2p_1sl.xml
teshsuite/simdag/network/p2p/platform_2p_1switch.xml
teshsuite/simdag/network/p2p/test_latency1.c
teshsuite/simdag/network/p2p/test_latency2.c
teshsuite/simdag/network/p2p/test_latency3.c
teshsuite/simdag/network/p2p/test_latency_bound.c
teshsuite/simdag/network/platform_2p_1sl.xml [deleted file]
teshsuite/simdag/network/test_reinit_costs.c [deleted file]
teshsuite/simdag/network/test_reinit_costs.tesh [deleted file]
teshsuite/simdag/partask/CMakeLists.txt
teshsuite/simdag/partask/platform_2p_1sl.xml
teshsuite/simdag/partask/platform_2p_1sl_hetero.xml
teshsuite/simdag/partask/test_comp_only_par.c
teshsuite/simdag/partask/test_comp_only_seq.c
teshsuite/simdag/platforms/CMakeLists.txt
teshsuite/simdag/platforms/Dijkstra.xml
teshsuite/simdag/platforms/Evaluate_get_route_time.c
teshsuite/simdag/platforms/Evaluate_parse_time.c
teshsuite/simdag/platforms/basic_link_test.c
teshsuite/simdag/platforms/basic_parsing_test.c
teshsuite/simdag/platforms/basic_parsing_test_failing.tesh
teshsuite/simdag/platforms/basic_tracing.c [deleted file]
teshsuite/simdag/platforms/bogus_disk_attachment.tesh
teshsuite/simdag/platforms/bogus_disk_attachment.xml
teshsuite/simdag/platforms/bogus_missing_dst_gateway.xml
teshsuite/simdag/platforms/bogus_missing_gateway.tesh
teshsuite/simdag/platforms/bogus_missing_src_gateway.xml
teshsuite/simdag/platforms/bogus_two_hosts_asymetric-2.xml
teshsuite/simdag/platforms/bogus_two_hosts_asymetric.tesh
teshsuite/simdag/platforms/bogus_two_hosts_asymetric.xml
teshsuite/simdag/platforms/clusterA.xml
teshsuite/simdag/platforms/flatifier.cpp
teshsuite/simdag/platforms/flatifier.tesh
teshsuite/simdag/platforms/four_hosts_Dijkstra_ns3.xml
teshsuite/simdag/platforms/four_hosts_floyd.xml
teshsuite/simdag/platforms/four_hosts_floyd_bis.xml
teshsuite/simdag/platforms/four_hosts_floyd_ns3.xml
teshsuite/simdag/platforms/is_router_test.cpp [moved from teshsuite/simdag/platforms/is_router_test.c with 56% similarity]
teshsuite/simdag/platforms/one_cluster.xml
teshsuite/simdag/platforms/one_cluster_file.xml
teshsuite/simdag/platforms/one_cluster_foreach.xml [deleted file]
teshsuite/simdag/platforms/one_cluster_fullduplex.xml
teshsuite/simdag/platforms/one_cluster_multicore.xml
teshsuite/simdag/platforms/one_cluster_one_host.xml [deleted file]
teshsuite/simdag/platforms/one_cluster_one_host_random.xml [deleted file]
teshsuite/simdag/platforms/one_cluster_properties_foreach.xml [deleted file]
teshsuite/simdag/platforms/one_cluster_properties_override.xml [deleted file]
teshsuite/simdag/platforms/one_cluster_router_id.xml
teshsuite/simdag/platforms/one_host.xml
teshsuite/simdag/platforms/one_host_availability.xml
teshsuite/simdag/platforms/one_host_properties.xml
teshsuite/simdag/platforms/one_host_state_file.xml
teshsuite/simdag/platforms/one_host_state_off.xml
teshsuite/simdag/platforms/one_host_state_on.xml
teshsuite/simdag/platforms/one_host_trace_file.xml
teshsuite/simdag/platforms/one_host_trace_inside.xml
teshsuite/simdag/platforms/one_link_availability.xml
teshsuite/simdag/platforms/one_link_fatpipe.xml
teshsuite/simdag/platforms/one_link_shared.xml
teshsuite/simdag/platforms/one_link_state_file.xml
teshsuite/simdag/platforms/platform_include.xml
teshsuite/simdag/platforms/properties.xml
teshsuite/simdag/platforms/random.xml
teshsuite/simdag/platforms/route_override.xml [deleted file]
teshsuite/simdag/platforms/test_of_is_router.xml
teshsuite/simdag/platforms/three_hosts_non_symmetric_route.xml
teshsuite/simdag/platforms/two_clusters.xml
teshsuite/simdag/platforms/two_clusters_one_name.xml
teshsuite/simdag/platforms/two_clusters_router_id.xml
teshsuite/simdag/platforms/two_clusters_symmetric.xml
teshsuite/simdag/platforms/two_hosts_multi_hop.xml
teshsuite/simdag/platforms/two_hosts_one_link.xml
teshsuite/simdag/platforms/two_hosts_one_link_fullduplex.xml
teshsuite/simdag/platforms/two_hosts_one_link_symmetrical.xml
teshsuite/simix/check_defaults/CMakeLists.txt
teshsuite/simix/stack_overflow/CMakeLists.txt
teshsuite/simix/stack_overflow/stack_overflow.c
teshsuite/simix/stack_overflow/stack_overflow.xml
teshsuite/simix/stack_overflow/stack_overflow_platform.xml
teshsuite/smpi/CMakeLists.txt
teshsuite/smpi/allgather/CMakeLists.txt
teshsuite/smpi/allgatherv/CMakeLists.txt
teshsuite/smpi/allreduce/CMakeLists.txt
teshsuite/smpi/alltoall/CMakeLists.txt
teshsuite/smpi/alltoallv/CMakeLists.txt
teshsuite/smpi/barrier/CMakeLists.txt
teshsuite/smpi/bcast/CMakeLists.txt
teshsuite/smpi/compute/CMakeLists.txt
teshsuite/smpi/gather/CMakeLists.txt
teshsuite/smpi/hvector/CMakeLists.txt
teshsuite/smpi/indexed/CMakeLists.txt
teshsuite/smpi/mpich3-test/CMakeLists.txt
teshsuite/smpi/mpich3-test/attr/CMakeLists.txt
teshsuite/smpi/mpich3-test/coll/CMakeLists.txt
teshsuite/smpi/mpich3-test/coll/allgatherv4.c
teshsuite/smpi/mpich3-test/coll/allgatherv4_manual.c
teshsuite/smpi/mpich3-test/coll/allred.c
teshsuite/smpi/mpich3-test/comm/CMakeLists.txt
teshsuite/smpi/mpich3-test/datatype/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/attr/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/coll/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/comm/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/datatype/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/ext/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/info/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/init/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/pt2pt/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/rma/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/topo/CMakeLists.txt
teshsuite/smpi/mpich3-test/f77/util/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/coll/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/datatype/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/info/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/init/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/pt2pt/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/rma/CMakeLists.txt
teshsuite/smpi/mpich3-test/f90/util/CMakeLists.txt
teshsuite/smpi/mpich3-test/group/CMakeLists.txt
teshsuite/smpi/mpich3-test/info/CMakeLists.txt
teshsuite/smpi/mpich3-test/init/CMakeLists.txt
teshsuite/smpi/mpich3-test/perf/CMakeLists.txt
teshsuite/smpi/mpich3-test/pt2pt/CMakeLists.txt
teshsuite/smpi/mpich3-test/rma/CMakeLists.txt
teshsuite/smpi/mpich3-test/topo/CMakeLists.txt
teshsuite/smpi/mpich3-test/util/mtest_manual.c
teshsuite/smpi/pingpong/CMakeLists.txt
teshsuite/smpi/reduce/CMakeLists.txt
teshsuite/smpi/reduce/reduce_scatter_coll.c
teshsuite/smpi/scatter/CMakeLists.txt
teshsuite/smpi/shared/CMakeLists.txt
teshsuite/smpi/struct/CMakeLists.txt
teshsuite/smpi/vector/CMakeLists.txt
teshsuite/surf/CMakeLists.txt [deleted file]
teshsuite/surf/lmm_usage/CMakeLists.txt
teshsuite/surf/maxmin_bench/CMakeLists.txt
teshsuite/surf/surf_usage/CMakeLists.txt
teshsuite/surf/surf_usage/surf_usage.cpp
teshsuite/surf/surf_usage/surf_usage2.cpp
teshsuite/surf/trace_usage/CMakeLists.txt
teshsuite/surf/trace_usage/trace_usage.cpp
teshsuite/xbt/graphxml_usage/CMakeLists.txt
teshsuite/xbt/heap_bench/CMakeLists.txt
teshsuite/xbt/log_large/CMakeLists.txt
teshsuite/xbt/log_usage/CMakeLists.txt
teshsuite/xbt/mallocator/CMakeLists.txt
teshsuite/xbt/mmalloc/CMakeLists.txt
teshsuite/xbt/parallel_log/CMakeLists.txt
teshsuite/xbt/parmap_bench/CMakeLists.txt
teshsuite/xbt/parmap_test/CMakeLists.txt
tools/cmake/DefinePackages.cmake
tools/cmake/Distrib.cmake
tools/cmake/Documentation.cmake
tools/cmake/Java.cmake
tools/cmake/MaintainerMode.cmake
tools/cmake/MakeExe.cmake
tools/cmake/MakeLib.cmake
tools/cmake/Modules/FindLibSigc++.cmake
tools/cmake/Modules/FindScala.cmake [deleted file]
tools/cmake/Option.cmake
tools/cmake/PrintArgs.cmake
tools/cmake/Tests.cmake
tools/cmake/scripts/Makefile.default [deleted file]
tools/cmake/scripts/SimGrid.packproj [deleted file]
tools/cmake/scripts/generate_memcheck_tests.pl
tools/cmake/scripts/postinstall.sh [deleted file]
tools/cmake/scripts/preinstall.sh [deleted file]
tools/cmake/src/internal_config.h.in
tools/cmake/test_prog/prog_gnu_dynlinker.c
tools/cmake/test_prog/prog_stackgrowth.c
tools/graphicator/CMakeLists.txt
tools/internal/check_dist_archive.exclude
tools/internal/eclipse-formating.xml
tools/internal/generate-multi-jar.py
tools/internal/spell_comments.pl
tools/normalize-pointers.py
tools/platf_route_rulebased2full.py
tools/sg_xml_unit_converter.py
tools/simgrid_update_xml.pl
tools/stack-cleaner/compiler-wrapper
tools/tesh/CMakeLists.txt
tools/tesh/colorize.pl [deleted file]

index 418a44b..3354e0b 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -25,6 +25,7 @@
                                                                        <listOptionValue builtIn="false" value="/usr/lib/jvm/java-7-openjdk-amd64/include"/>
                                                                        <listOptionValue builtIn="false" value="/usr/include/ns3.22"/>
                                                                        <listOptionValue builtIn="false" value="/opt/gtnets/include"/>
+                                                                       <listOptionValue builtIn="false" value="/usr/include/lua5.3"/>
                                                                </option>
                                                                <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1641160853" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
                                                        </tool>
@@ -33,6 +34,7 @@
                                                                        <listOptionValue builtIn="false" value="/usr/lib/jvm/java-7-openjdk-amd64/include"/>
                                                                        <listOptionValue builtIn="false" value="/usr/include/ns3.22"/>
                                                                        <listOptionValue builtIn="false" value="/opt/gtnets/include"/>
+                                                                       <listOptionValue builtIn="false" value="/usr/include/lua5.3"/>
                                                                </option>
                                                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.538328935" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
                                                        </tool>
@@ -48,6 +50,7 @@
                                                                        <listOptionValue builtIn="false" value="/usr/lib/jvm/java-7-openjdk-amd64/include"/>
                                                                        <listOptionValue builtIn="false" value="/usr/include/ns3.22"/>
                                                                        <listOptionValue builtIn="false" value="/opt/gtnets/include"/>
+                                                                       <listOptionValue builtIn="false" value="/usr/include/lua5.3"/>
                                                                </option>
                                                                <inputType id="cdt.managedbuild.tool.gnu.assembler.input.2071407067" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
                                                        </tool>
diff --git a/.editorconfig b/.editorconfig
new file mode 100644 (file)
index 0000000..6e09c62
--- /dev/null
@@ -0,0 +1,22 @@
+# http://editorconfig.org
+root = true
+
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.{c,cpp,h,hpp,yml,cmake}]
+trim_trailing_whitespace = true
+charset = utf-8
+indent_style = space
+indent_size = 2
+
+# PEP8 https://www.python.org/dev/peps/pep-0008/ http://pep8.org/
+[*.py]
+trim_trailing_whitespace = true
+charset = utf-8
+indent_style = space
+indent_size = 4
+
+[Makefile]
+indent_style = tab
index 7227b38..be91017 100644 (file)
@@ -23,16 +23,13 @@ CTestResults.xml
 
 ### Maintainer mode
 src/simdag/dax_dtd.l
-src/surf/simgrid_dtd.l
+src/surf/xml/simgrid_dtd.l
 src/xbt/graphxml.l
 ### Jedule
 examples/simdag/scheduling/simgrid.jed
 teshsuite/simdag/platforms/simgrid.jed
 ### Libraries links 
-src/bindings/ruby/simgrid.so
-examples/ruby/simgrid.so
 examples/lua/simgrid.so
-src/bindings/ruby/libsimgrid.so
 examples/msg/masterslave/simgrid.so
 examples/simdag/simgrid.so
 examples/lua/console/simgrid.so
@@ -161,7 +158,6 @@ examples/msg/irc_isend/peer
 examples/msg/irc_isend/toto.txt
 examples/msg/kademlia/kademlia
 examples/msg/masterslave/masterslave_arg
-examples/msg/masterslave/masterslave_bypass
 examples/msg/masterslave/masterslave_cluster
 examples/msg/masterslave/masterslave_console
 examples/msg/masterslave/masterslave_failure
@@ -200,11 +196,11 @@ examples/msg/procmig.trace
 examples/msg/properties/msg_prop
 examples/msg/semaphores/synchro
 examples/msg/sendrecv/sendrecv
+examples/msg/sendrecv/sendrecv_main
 examples/msg/simulation.trace
 examples/msg/start_kill_time/sk_time
 examples/msg/suspend/suspend
 examples/msg/tasks.trace
-examples/msg/token_ring/token_bypass
 examples/msg/token_ring/token_ring
 examples/msg/toto.txt
 examples/msg/trace/test_trace_integration
@@ -275,6 +271,7 @@ src/replay/replay
 src/testall
 teshsuite/bug-17132/bug-17132
 teshsuite/datadesc_usage.out
+teshsuite/java/semaphore/java_semaphore_gc_compiled
 teshsuite/java/sleep_host_off/java_sleep_host_off_compiled
 teshsuite/mc/dwarf/dwarf
 teshsuite/mc/dwarf_expression/dwarf-expression
@@ -1071,9 +1068,6 @@ examples/java/tracing/java_tracing_compiled
 examples/java/reservationSurfPlugin/java_reservation_surf_plugin_compiled
 examples/java/surfCpuModel/java_surf_cpu_model_compiled
 examples/java/surfPlugin/java_surf_plugin_compiled
-examples/scala/master_slave_bypass/scala_master_slave_bypass_compiled
-examples/scala/master_slave_kill/scala_master_slave_kill_compiled
-examples/scala/masterslave/scala_masterslave_compiled
 /CMakeCache.txt
 examples/smpi/mc/smpi_bugged1
 examples/smpi/mc/smpi_bugged1_liveness
index a7867b4..6553d7d 100644 (file)
@@ -21,14 +21,14 @@ addons:
     packages:
     - gcc-4.7
     - g++-4.7
-#      - clang
-#- coverity_scan:
-#    project:
-#      name: "mquinson/simgrid"
-#    notification_email: martin.quinson@loria.fr
-#    build_command_prepend: "cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_java=OFF -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=OFF -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=OFF ."  coverity_scan:
-#    build_command:   "make VERBOSE=1"
-#    branch_pattern: coverity_scan
+  coverity_scan:
+    project:
+      name: "mquinson/simgrid"
+      description: "Build submitted via Travis CI"
+    notification_email: martin.quinson@ens-rennes.fr
+    build_command_prepend: "cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_java=OFF -Denable_model-checking=OFF -Denable_lua=OFF -Denable_compile_optimizations=OFF -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=OFF ."
+    build_command:   "make VERBOSE=1"
+    branch_pattern: coverity
 
 # Don't install lua from Debian as we need 5.3 and don't have a backport.
 #   Installing lua from the source does not make any dynamic library.
@@ -54,7 +54,7 @@ script:
 #      - master
 notifications:
   recipients:
-    - martin.quinson@loria.fr
+    - martin.quinson@ens-rennes.fr
   email:
     on_success: change
     on_failure: always
index 3747faf..ea6d1be 100644 (file)
@@ -101,7 +101,7 @@ set(SIMGRID_VERSION_MINOR "13")
 set(SIMGRID_VERSION_PATCH "0")
 set(SIMGRID_VERSION_EXTRA "-devel") # Extra words to add to version string (e.g. -rc1)
 
-set(SIMGRID_VERSION_DATE  "2015") # Year for copyright information
+set(SIMGRID_VERSION_DATE  "2016") # Year for copyright information
 
 if(${SIMGRID_VERSION_PATCH} EQUAL "0")
   set(release_version "${SIMGRID_VERSION_MAJOR}.${SIMGRID_VERSION_MINOR}")
@@ -214,7 +214,7 @@ IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86|AMD64|amd64")
   if (MSVC)
     message(STATUS "Disable fast raw contextes on Microsoft Visual.")
   else()
-    set(HAVE_RAWCTX 1)
+    set(HAVE_RAW_CONTEXTS 1)
   endif()
 
 ENDIF()
@@ -226,14 +226,11 @@ include(CheckIncludeFiles)
 include(CheckLibraryExists)
 include(CheckSymbolExists)
 
+set(HAVE_GRAPHVIZ 0)
 include(FindGraphviz)
 include(FindLibSigc++)
 
-if(enable_scala)
-  find_package(Scala REQUIRED)
-  message("-- [Scala] scalac found: ${SCALA_COMPILE}")
-  set(HAVE_Scala 1)
-endif()
+set(HAVE_LUA 0)
 if(enable_lua)
   include(FindLuaSimgrid)
 endif()
@@ -267,15 +264,15 @@ if(Boost_FOUND AND Boost_CONTEXT_FOUND)
   # We should use feature detection for this instead:
   if (Boost_VERSION LESS 105600)
     message("Found Boost.Context API v1")
-    set(HAVE_BOOST_CONTEXT 1)
+    set(HAVE_BOOST_CONTEXTS 1)
   else()
     message("Found Boost.Context API v2")
-    set(HAVE_BOOST_CONTEXT 2)
+    set(HAVE_BOOST_CONTEXTS 2)
   endif()
 else()
   message ("   boost        : found.")
   message ("   boost-context: missing. Install libboost-context-dev for this optional feature.")
-  set(HAVE_BOOST_CONTEXT 0)
+  set(HAVE_BOOST_CONTEXTS 0)
 endif()
 
 # Checks for header libraries functions.
@@ -383,8 +380,8 @@ if(WIN32) # Those files are not detected despite being present
   set(HAVE_MAKECONTEXT 1)
 endif()
 
-set(CONTEXT_UCONTEXT 0)
-set(CONTEXT_THREADS 0)
+set(HAVE_UCONTEXT_CONTEXTS 0)
+set(HAVE_THREAD_CONTEXTS 0)
 
 if(enable_jedule)
   set(HAVE_JEDULE 1)
@@ -626,12 +623,12 @@ endif()
 #If can have both context
 
 if(HAVE_UCONTEXT)
-  set(CONTEXT_UCONTEXT 1)
+  set(HAVE_UCONTEXT_CONTEXTS 1)
   message("-- Support for ucontext factory")
 endif()
 
 if(HAVE_PTHREAD)
-  set(CONTEXT_THREADS 1)
+  set(HAVE_THREAD_CONTEXTS 1)
   message("-- Support for thread context factory")
 endif()
 
@@ -738,11 +735,12 @@ endif()
 
 ### check for stackgrowth
 if (NOT CMAKE_CROSSCOMPILING)
-  try_run(RUN_makecontext_VAR COMPILE_makecontext_VAR
+  try_run(RUN_stackgrowth_VAR COMPILE_stackgrowth_VAR
     ${CMAKE_BINARY_DIR}
     ${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_stackgrowth.c
     RUN_OUTPUT_VARIABLE stack
-    )
+    COPY_FILE test_stackgrowth
+  )
 endif()
 if("${stack}" STREQUAL "down")
   set(PTH_STACKGROWTH "-1")
@@ -754,7 +752,7 @@ else()
   elseif("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "i686")
     set(PTH_STACKGROWTH "-1")
   else()
-    message(ERROR "Could not figure the stack direction.")
+    message(FATAL_ERROR "Could not figure out the stack direction. Test prog returned: ${stack}; CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}.")
   endif()
 endif()
 
@@ -762,123 +760,8 @@ endif()
 ## System checks
 ##
 
-#SG_CONFIGURE_PART([System checks...])
-#AC_PROG_CC(xlC gcc cc) -auto
-#AM_SANITY_CHECK -auto
-
-#AC_PROG_MAKE_SET
-
-#AC_CHECK_VA_COPY
-
-set(diff_va "va_copy((d),(s))"
-  "VA_COPY((d),(s))"
-  "__va_copy((d),(s))"
-  "__builtin_va_copy((d),(s))"
-  "do { (d) = (s)\; } while (0)"
-  "do { *(d) = *(s)\; } while (0)"
-  "memcpy((void *)&(d), (void *)&(s), sizeof(s))"
-  "memcpy((void *)(d), (void *)(s), sizeof(*(s)))"
-  )
-
-foreach(fct ${diff_va})
-  write_file("${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_va_copy.c" "#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#define DO_VA_COPY(d,s) ${fct}
-void test(char *str, ...)
-{
-  va_list ap, ap2;
-  int i;
-  va_start(ap, str);
-  DO_VA_COPY(ap2, ap);
-  for (i = 1; i <= 9; i++) {
-    int k = (int)va_arg(ap, int);
-    if (k != i)
-      abort();
-  }
-  DO_VA_COPY(ap, ap2);
-  for (i = 1; i <= 9; i++) {
-    int k = (int)va_arg(ap, int);
-    if (k != i)
-      abort();
-  }
-  va_end(ap);
-}
-int main(void)
-{
-  test(\"test\", 1, 2, 3, 4, 5, 6, 7, 8, 9);
-  exit(0);
-}"
-    )
-
-  execute_process(
-  COMMAND ${CMAKE_C_COMPILER} "${CMAKE_HOME_DIRECTORY}/tools/cmake/test_prog/prog_va_copy.c"
-  WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-  RESULT_VARIABLE COMPILE_VA_NULL_VAR
-  OUTPUT_QUIET
-  ERROR_QUIET
-  )
-
-  if(NOT COMPILE_VA_NULL_VAR)
-    string(REGEX REPLACE "\;" "" fctbis ${fct})
-    if(${fctbis} STREQUAL "va_copy((d),(s))")
-      set(HAVE_VA_COPY 1)
-      set(ac_cv_va_copy "C99")
-      set(__VA_COPY_USE_C99 "va_copy((d),(s))")
-    endif()
-
-    if(${fctbis} STREQUAL "VA_COPY((d),(s))")
-      set(ac_cv_va_copy "GCM")
-      set(__VA_COPY_USE_GCM "VA_COPY((d),(s))")
-    endif()
-
-    if(${fctbis} STREQUAL "__va_copy((d),(s))")
-      set(ac_cv_va_copy "GCH")
-      set(__VA_COPY_USE_GCH "__va_copy((d),(s))")
-    endif()
-
-    if(${fctbis} STREQUAL "__builtin_va_copy((d),(s))")
-      set(ac_cv_va_copy "GCB")
-      set(__VA_COPY_USE_GCB "__builtin_va_copy((d),(s))")
-    endif()
-
-    if(${fctbis} STREQUAL "do { (d) = (s) } while (0)")
-      set(ac_cv_va_copy "ASS")
-      set(__VA_COPY_USE_ASS "do { (d) = (s); } while (0)")
-    endif()
-
-    if(${fctbis} STREQUAL "do { *(d) = *(s) } while (0)")
-      set(ac_cv_va_copy "ASP")
-      set(__VA_COPY_USE_ASP "do { *(d) = *(s); } while (0)")
-    endif()
-
-    if(${fctbis} STREQUAL "memcpy((void *)&(d), (void *)&(s), sizeof(s))")
-      set(ac_cv_va_copy "CPS")
-      set(__VA_COPY_USE_CPS "memcpy((void *)&(d), (void *)&(s), sizeof(s))")
-    endif()
-
-    if(${fctbis} STREQUAL "memcpy((void *)(d), (void *)(s), sizeof(*(s)))")
-      set(ac_cv_va_copy "CPP")
-      set(__VA_COPY_USE_CPP "memcpy((void *)(d), (void *)(s), sizeof(*(s)))")
-    endif()
-
-    if(NOT STATUS_OK)
-      set(__VA_COPY_USE "__VA_COPY_USE_${ac_cv_va_copy}(d, s)")
-    endif()
-    set(STATUS_OK "1")
-
-  endif()
-
-endforeach(fct ${diff_va})
-
-#--------------------------------------------------------------------------------------------------
 ### check for a working snprintf
 if(HAVE_SNPRINTF AND HAVE_VSNPRINTF OR WIN32)
-  if(WIN32)
-    #set(HAVE_SNPRINTF 1)
-    #set(HAVE_VSNPRINTF 1)
-  endif()
-
   if(CMAKE_CROSSCOMPILING)
     set(RUN_SNPRINTF_FUNC "cross")
     #set(PREFER_PORTABLE_SNPRINTF 1)
index b1d4706..ec75dfc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,46 +1,88 @@
 SimGrid (3.13) UNRELEASED; urgency=low
 
  The Easter Trim Release.
+
+ Backwards Compatibility breaks
+   - Some command line options were renamed for consistency sake:
+     - model-check/sparse-checkpoint -> model-check/sparse_checkpoint
+     - smpi/async_small_thres        -> smpi/async_small_thresh
+     - smpi/send_is_detached_thres   -> smpi/send_is_detached_thresh 
+
+   - Removed Lua simulation bindings (switch to C or Java for that).
+     Lua can still be used to describe platforms
+   - Removed Java kernel plug-ins.
+     Will be reintroduced after the ongoing major internals reorg.
+   - In SimDag 
+      - the SD_application_reinit function was removed. It was a noop for a while. 
+      - The ACCESS_MODE of SD_workstation has been removed. This feature was not really usable and should soon be 
+        replaced by a more flexible mechanism.
+      - The following functions thus do not exist anymore
+         - SD_workstation_get_access_mode
+         - SD_workstation_set_access_mode
+         - SD_workstation_get_current_task
+      - Basic estimation functions have been removed but can easily be replaced
+        - SD_route_get_communication_time => SG_route_get_latency() + amount / SD_route_get_bandwidth()
+        - SD_workstation_get_computation_time => amount / sg_host_speed()
+
+ XML platforms:
+ * Switch to platform v4 format.
+   - Rename from 'power' to 'speed' the attributes describing the amount of
+     flops that a <host>, <peer>, <cluster> or <cabinet> can deliver per second.
+   - In <trace_connect>, attribute kind="POWER" is now kind="SPEED".
+   - The DOCTYPE points to the right URL:
+     http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd
+     (the file at this address now documents the changelog since its v1)
+   - A warning is emitted for unit-less values (they are still accepted).
+     - speed. Default: 'f' or 'flops'. Also defined:
+        'Yf',         'Zf',         'Ef',       'Pf',        'Tf',        'Gf',        'Mf',        'kf'
+        'yottaflops', 'zettaflops', 'exaflops', 'petaflops', 'teraflops', 'gigaflops', 'megaflops', 'kiloflops'
+     - bandwidth. Default: 'Bps' bytes per second (or 'bps' for bits but 1 Bps = 8 bps)
+       Also defined in bytes: 'TiBps', 'GiBps', 'MiBps', 'KiBps', 'TBps', 'GBps', 'MBps', 'kBps', 'Bps'
+       And the same in bits:  'Tibps', 'Gibps', 'Mibps', 'Kibps', 'Tbps', 'Gbps', 'Mbps', 'kbps', 'bps'
+     - latency. Default: 's' second. Also defined:
+       'w' week, 'd' day, 'h' hour, 'm' minute, 'ms' millisecond, 'us' microsecond, 'ns' nanosecond, 'ps' picosecond
+       
+ * bin/simgrid_update_xml can upgrade your files automatically (won't convert unit-less values)
+   tools/sg_xml_unit_converter.py may help (but it's just a warning and will probably ever be).
+
  S4U
- * s4u::Host is now the prefered public interface to the Host features.
+ * s4u::Host is now the preferred public interface to the Host features.
    sg_host_* functions are C bindings to the exact same behavior
    MSG_host_* and SD_workstation_* are #define to the sg_host_* ones
 
  MSG
- * Kill all deprecated functions. They were deprecated since a few
-   releases anyway, and probably did not even compile anymore.
+ * Kill all deprecated functions (the ones you had when declaring MSG_DEPRECATED). 
+   They were deprecated since a few years, and probably did not even compile anymore.
+
+ SimDag
+ * The API has been profoundly modified to directly use the core objects instead of redefining its own. 
+   SD_Workstation_t and SD_link_t are now sg_host_t and sg_link_t respectively.
+   Some functions have also been renamed for consistency. Backward compatibility is maintained, but users are 
+   encouraged to update their codes. A list of the modified functions can be found at the end of 
+   include/simgrid/simdag.h
 
  Simix
  * simgrid::simix::kernel() is the closure callback. It ensures that
     the lambda or closure passed as a parameter will run in kernel mode.
    Every callbacks should be rewritten to that interface at some point.
    
- MC
- * BC breaks:
-   - The option "model-check/sparse-checkpoint" was renamed to
-     "model-check/sparse_checkpoint" as we attempt to unify our naming
-     schemes.
-
  Surf
  * Reorganizing and cleaning the internals all around the place.
 
  SMPI
- * BC breaks:
-   - The option smpi/async_small_thres was renamed to smpi/async_small_thresh
-     as we attempt to unify our naming schemes -> smpi/send_is_detached_thresh
  * Remove old default barrier/bcast buggy algorithms (see #18407)
- * Various bugfixes to handle more codes
+ * Various bug fixes to handle more codes
 
  XBT
  * Kill the setset data container: MC don't use it anymore.
  * Kill the queue data container: it made more sense with GRAS.
  * Kill the xbt_peer_t data type: it's useless without GRAS.
+ * Kill rm_cb feature of config sets: it was never useful.
+ * New functions:
+   - xbt_dynar_sort_strings(), when the content is char*
+   - xbt_str_parse_int / xbt_str_parse_double, wrapping strtol/strtod
+     They throw exceptions on invalid input.
  
- JAVA:
- * Remove the ability to write internal plugins in Java. 
-   It may be reintroduced once the ongoing cleanup is done.
-
  -- $date Da SimGrid team <simgrid-devel@lists.gforge.inria.fr>
 
 SimGrid (3.12) stable; urgency=low
index 5fd78d3..b618a2a 100644 (file)
@@ -34,14 +34,11 @@ environment:
 #- if [%COMPILER%]==[MinGW-w64] 7z x -tzip lua.zip > NULL
 
 install:
-# Perl: The installed version breaks with Perl::IPC 0.94. Get an older one.
-- call .appveyor-download.cmd "http://strawberryperl.com/download/5.18.4.1/strawberry-perl-5.18.4.1-64bit.msi" -FileName strawberry-perl.msi
-- msiexec /i "strawberry-perl.msi" /qn INSTALLDIR="C:\projects\perl"
 # Sane migwin, as installed by symengine
 - if [%COMPILER%]==[MinGW-w64] call .appveyor-download.cmd "https://raw.githubusercontent.com/symengine/dependencies/5cff7d1736877336cf9fb58267111beea4fa152f/x86_64-4.9.1-release-posix-seh-rt_v3-rev1.7z" -FileName mw64.7z
 - if [%COMPILER%]==[MinGW-w64] 7z x -oC:\ mw64.7z > NUL
 # Take the newly installed stuff in the path
-- set PATH=C:\mingw64\bin;C:\projects\perl\perl\bin;C:\projects\perl\perl\site\bin;C:\projects\perl\c\bin;%PATH%
+- set PATH=C:\mingw64\bin;%PATH%
 - if [%COMPILER%]==[MinGW-w64] rename "C:\Program Files\Git\usr\bin\sh.exe" "sh-ignored.exe"
 
 build_script:
@@ -60,6 +57,7 @@ build_script:
 #- bash -c "cd C:/projects/simgrid; exec 0<&-; ctest --output-on-failure" < nul || true
 
 #test_script:
+# IPC::Run broken on windows. We should switch to https://rt.cpan.org/Public/Bug/Display.html?id=104812#txn-1546043
 #- perl %TESH_ARGS% C:/projects/simgrid/examples/java/async/async.tesh
 #- perl %TESH_ARGS% C:/projects/simgrid/examples/java/bittorrent/bittorrent.tesh
 #- perl %TESH_ARGS% C:/projects/simgrid/examples/java/master_slave_bypass/bypass.tesh
diff --git a/configure b/configure
deleted file mode 100755 (executable)
index ca32ca4..0000000
--- a/configure
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-cat <<EOT
-THIS COMMAND IS NOT AVAILABLE!
-Since v3.4 we use cmake. Now use:
-        cmake -DCMAKE_INSTALL_PREFIX=<where_you_want> .
-        make
-        make install
-EOT
-
-exit 1
diff --git a/contrib/deployment_generation/generate_random_deployment.pl b/contrib/deployment_generation/generate_random_deployment.pl
deleted file mode 100755 (executable)
index bd353fa..0000000
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/usr/bin/env perl
-
-# Copyright (c) 2009, 2011, 2014. The SimGrid Team.
-# All rights reserved.
-
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the license (GNU LGPL) which comes with this package.
-
-use strict;
-use warnings;
-
-sub melange {
-    my $tableau=shift;
-    my($i,$j);
-    
-    for($i = @$tableau ; --$i; ) {
-       $j = int rand ($i+1);
-       next if $i==$j;
-       @$tableau[$i,$j] = @$tableau[$j,$i];
-    }
-}
-
-sub read_file {
-    my($filename)=shift;
-    my($line);
-    my(@host_list);
-    open(INPUT,"$filename");
-    while(defined($line=<INPUT>)) {
-       chomp $line;
-       if($line=~/host id/) {
-           $line=~ s/.*host id="//;
-           $line=~ s/\".*$//;
-           push @host_list,$line;
-       }
-    }
-    close(INPUT);
-    return \@host_list;
-}
-
-sub generate_random_deployment{
-    my($host_list,$nflows,$filename)=@_;
-    my(%pairs);
-    my($nhost) = scalar(@$host_list);
-    my(%taken);
-
-    $nflows< $nhost*$nhost-$nhost or die "Too much flows! I can't do it\n";
-    
-    open(OUTPUT,"> $filename");
-    while(scalar(keys(%pairs))<$nflows) {
-       my($src)=int(rand(scalar(@$host_list)));
-       my($dst)=int(rand(scalar(@$host_list)));
-
-       if($src!=$dst && !defined($pairs{"$$host_list[$src] $$host_list[$dst]"})) {
-           $pairs{"$$host_list[$src] $$host_list[$dst]"}=1;
-           $taken{"$$host_list[$src]"}=1;
-           $taken{"$$host_list[$dst]"}=1;
-#         && !$taken{$$host_list[$src]} && !$taken{$$host_list[$dst]}
-       }
-    }
-    my($p);
-
-    my($count)=0;
-
-    print OUTPUT <<EOF;
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="2">
-EOF
-
-    foreach $p (keys %pairs) {
-       my($src,$dst)=split(/ /,$p);
-       print OUTPUT "  <process host='$src' function='master'>\n";
-       print OUTPUT "    <argument value='10000000'/>\n";
-       print OUTPUT "    <argument value='$dst'/>\n";
-       print OUTPUT "    <argument value='$count'/>\n";
-       print OUTPUT "  </process>\n";
-       print OUTPUT "  <process host='$dst' function='slave'>\n";
-       print OUTPUT "    <argument value='$count'/>\n";
-       print OUTPUT "  </process>\n";
-       $count++;
-    }
-
-    print OUTPUT <<EOF;
-</platform>
-EOF
-    close(OUTPUT);
-}
-
-
-sub generate_random_deployment2{
-    my($host_list,$nflows,$filename)=@_;
-    my(%pairs);
-    my($nhost) = scalar(@$host_list);
-    my(%taken);
-
-    melange($host_list);
-    $nflows< $nhost/2 or die "Too much flows! I can't do it\n";
-    
-    open(OUTPUT,"> $filename");
-    foreach (0..$nflows-1) {
-       my($src)=shift(@$host_list);
-       my($dst)=shift(@$host_list);
-
-       $pairs{"$src $dst"}=1;
-    }
-    my($p);
-
-    my($count)=0;
-
-    print OUTPUT <<EOF;
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<platform version="2">
-EOF
-
-    foreach $p (keys %pairs) {
-       my($src,$dst)=split(/ /,$p);
-       print OUTPUT "  <process host='$src' function='master'>\n";
-       print OUTPUT "    <argument value='10000000'/>\n";
-       print OUTPUT "    <argument value='$dst'/>\n";
-       print OUTPUT "    <argument value='$count'/>\n";
-       print OUTPUT "  </process>\n";
-       print OUTPUT "  <process host='$dst' function='slave'>\n";
-       print OUTPUT "    <argument value='$count'/>\n";
-       print OUTPUT "  </process>\n";
-       $count++;
-    }
-
-    print OUTPUT <<EOF;
-</platform>
-EOF
-    close(OUTPUT);
-}
-
-sub main {
-    my($nodes,$edges,$interferences,$host_list,$count_interferences);
-
-    $#ARGV>=1 or die "Need a xml platform file and a number of flows!";
-    my($filename)=$ARGV[0];
-    my($nflows)=$ARGV[1];
-    $filename =~ s/\.xml$//g;
-    $filename =~ s/-p$//g;
-    
-    $host_list = read_file $ARGV[0];
-    generate_random_deployment2($host_list,$nflows,"$filename-d.xml");
-}
-
-main;
diff --git a/contrib/psg/Makefile b/contrib/psg/Makefile
deleted file mode 100644 (file)
index 43fc9dd..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-LIB_JARS= lib.jar
-
-all: compile doc
-
-compile:
-       mkdir -p classes
-       javac -sourcepath src -classpath $(LIB_JARS):../../simgrid.jar -d classes `find -L -name "*.java"`
-
-doc:
-       mkdir -p doc
-       javadoc -sourcepath src -classpath $(LIB_JARS):../../simgrid.jar -d doc psgsim
-
-test:
-       ./test.sh 
-
-clean: 
-       rm -rf classes doc outputs
-       
-# Help Target
-help:
-       @echo "The following are a valid targets for this Makefile:"
-       @echo "................ all (the default if no target is provided)"
-       @echo "................ compile"
-       @echo "................ doc"
-       @echo "................ test"
-       @echo "................ clean"
-       
diff --git a/contrib/psg/README.txt b/contrib/psg/README.txt
deleted file mode 100644 (file)
index 4435990..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-Mon Jan 26 16:00 CEST 2015
-This is version 1.0 of PeerSimGrid
-
-1) An overview
-2) Preliminaries
-3) Compile & Run 
-
---------------------------------------------------------------------------------------------
-1) An overview:
-PeerSimGrid (PSG) is an interface developed in Java and allows users to simulate 
-and execute their code under PeerSim or Simgrid simulator, using PeerSim implementation policy.
-       
-This archive is composed of:
-* the src/ directory containing the simulator source and examples
-* the configs/ directory containing example of configuration files
-* psg.jar, a java archive containing all libraries  
-
-
-2) Preliminaries:
-       Before using psg simulator, you need to make some changes in your configuration file:
-               * Replace the "UniformRandomTransport" transport protocol by "psgsim.PSGTransport".
-               * Replace the "simulation.endtime" by "simulation.duration"
-               * you can define your platform on the configuration file as:
-                       platform path/to/your/file.xml 
-       
-       
-3) Compile & Run:
-       In short, the way to compile and execute your code is: 
-               Compile it:                
-               $> make compile
-               
-               Test it (optional):
-               $> make test
-               This test execute two examples, (chord and edaggregation found in the example folder), under the two simulators
-               and compare their outputs.      
-               
-               Run it:
-               $> ./run.sh path/to/your/configuration_file 
-               For example: 
-                       $>./run.sh configs/chordPSG.txt 
-                       
-               For the documentation
-               $> make doc
-               
-               For the help command
-               $> make help
-               
-Note: For more informations please contact khaled.baati@gmail.com
\ No newline at end of file
diff --git a/contrib/psg/configs/bittorrent.txt b/contrib/psg/configs/bittorrent.txt
deleted file mode 100644 (file)
index 356b302..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-#Config file for BitTorrent extension
-
-random.seed 1234567890
-simulation.endtime 1800000#6^8
-simulation.logtime 10^3
-OutputName bittorrent
-simulation.experiments 1
-
-network.size 30
-network.node peersim.core.GeneralNode
-
-protocol.urt UniformRandomTransport
-protocol.urt.mindelay 10
-protocol.urt.maxdelay 400
-
-#BE AWARE: the value "max_swarm_size" must be greater than
-#the value "peerset_size", since I have to be sure
-#that the space for the neighbor nodes is enough.
-
-protocol.bittorrent example.bittorrent.BitTorrent
-protocol.bittorrent.file_size 100
-protocol.bittorrent.max_swarm_size 80
-protocol.bittorrent.peerset_size 50
-protocol.bittorrent.duplicated_requests 1
-protocol.bittorrent.transport urt
-protocol.bittorrent.max_growth 20
-
-init.net example.bittorrent.NetworkInitializer
-init.net.protocol bittorrent
-init.net.transport urt
-init.net.newer_distr 80
-init.net.seeder_distr 15
-
-control.observer example.bittorrent.BTObserver
-control.observer.protocol bittorrent
-control.observer.step 10000
-
-control.dynamics example.bittorrent.NetworkDynamics
-control.dynamics.protocol bittorrent
-control.dynamics.newer_distr 60
-control.dynamics.minsize 20
-control.dynamics.tracker_can_die 1
-control.dynamics.step 100000
-control.dynamics.transport urt
-control.dynamics.add 0#5
-control.dynamics.remove 0#5
\ No newline at end of file
diff --git a/contrib/psg/configs/bittorrentPSG.txt b/contrib/psg/configs/bittorrentPSG.txt
deleted file mode 100644 (file)
index 647ccb4..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-#Config file for BitTorrent extension
-OutputName bittorrent
-platform platforms/psg.xml
-unit ms
-random.seed 1234567890
-simulation.duration 1800000
-simulation.logtime 10^3
-
-simulation.experiments 1
-
-network.size 40
-network.node peersim.core.GeneralNode
-
-protocol.urt psgsim.PSGTransport
-protocol.urt.mindelay 0#10
-protocol.urt.maxdelay 0#400
-
-#BE AWARE: the value "max_swarm_size" must be greater than
-#the value "peerset_size", since I have to be sure
-#that the space for the neighbor nodes is enough.
-
-protocol.bittorrent example.bittorrent.BitTorrent
-protocol.bittorrent.file_size 100
-protocol.bittorrent.max_swarm_size 80
-protocol.bittorrent.peerset_size 50
-protocol.bittorrent.duplicated_requests 1
-protocol.bittorrent.transport urt
-protocol.bittorrent.max_growth 20
-
-init.net example.bittorrent.NetworkInitializer
-init.net.protocol bittorrent
-init.net.transport urt
-init.net.newer_distr 80
-init.net.seeder_distr 15
-
-control.observer example.bittorrent.BTObserver
-control.observer.protocol bittorrent
-control.observer.step 10000
-
-control.dynamics example.bittorrent.NetworkDynamics
-control.dynamics.protocol bittorrent
-control.dynamics.newer_distr 60
-control.dynamics.minsize 20
-control.dynamics.tracker_can_die 1
-control.dynamics.step 100000
-control.dynamics.transport urt
-control.dynamics.add 0#5
-control.dynamics.remove 0#5
\ No newline at end of file
diff --git a/contrib/psg/configs/chord.txt b/contrib/psg/configs/chord.txt
deleted file mode 100644 (file)
index deeee8f..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# PEERSIM CHORD\r
-\r
-random.seed 1234567890\r
-simulation.endtime 10^4\r
-simulation.logtime 10^6\r
-OutputName chord\r
-simulation.experiments 1\r
-\r
-network.size 40\r
-protocol.tr UniformRandomTransport\r
-{\r
-       mindelay 0\r
-       maxdelay 0\r
-}\r
-\r
-protocol.chord  example.chord.ChordProtocol\r
-{\r
-       transport tr\r
-}\r
-\r
-control.traffic example.chord.TrafficGenerator\r
-{\r
-       protocol chord\r
-       step 100\r
-}\r
-\r
-init.create example.chord.CreateNw \r
-{\r
-       protocol chord\r
-       idLength 128\r
-       succListSize 12\r
-}\r
-\r
-control.observer example.chord.MessageCounterObserver\r
-{\r
-       protocol chord\r
-       step 90000\r
-}\r
-\r
-#control.dnet DynamicNetwork\r
-#{\r
-#      #add 2\r
-#      add -2\r
-#      minsize 18#3000\r
-#      maxsize 60#7000\r
-#      step 100000\r
-#      init.0 example.chord.ChordInitializer\r
-#      {      \r
-#              protocol chord\r
-#      }\r
-#}
\ No newline at end of file
diff --git a/contrib/psg/configs/chordPSG.txt b/contrib/psg/configs/chordPSG.txt
deleted file mode 100644 (file)
index 7e67047..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-# PEERSIM CHORD\r
-\r
-random.seed 1234567890\r
-simulation.duration 10^4\r
-simulation.logtime 10^6\r
-unit sec\r
-OutputName chord\r
-platform platforms/psg.xml\r
-simulation.experiments 1\r
-\r
-network.size 40\r
-protocol.tr psgsim.PSGTransport\r
-{\r
-       mindelay 0\r
-       maxdelay 0\r
-}\r
-\r
-protocol.chord  example.chord.ChordProtocol\r
-{\r
-       transport tr\r
-}\r
-\r
-control.traffic example.chord.TrafficGenerator\r
-{\r
-       protocol chord\r
-       step 100\r
-}\r
-\r
-init.create example.chord.CreateNw \r
-{\r
-       protocol chord\r
-       idLength 128\r
-       succListSize 12\r
-}\r
-\r
-control.observer example.chord.MessageCounterObserver\r
-{\r
-       protocol chord\r
-       step 90000\r
-}\r
-\r
-\r
-#control.dnet DynamicNetwork\r
-#{\r
-#      #add 2\r
-#      add -2\r
-#      minsize 18#3000\r
-#      maxsize 60#7000\r
-#      step 100000\r
-#      init.0 example.chord.ChordInitializer\r
-#      {      \r
-#              protocol chord\r
-#      }\r
-#}\r
diff --git a/contrib/psg/configs/edaggregation.txt b/contrib/psg/configs/edaggregation.txt
deleted file mode 100644 (file)
index d3aec12..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-# network size
-SIZE 50
-OutputName edaggregation
-
-# parameters of periodic execution
-CYCLES 100
-CYCLE SIZE*100
-
-# parameters of message transfer
-# delay values here are relative to cycle length, in percentage,
-# eg 50 means half the cycle length, 200 twice the cycle length, etc.
-MINDELAY 0
-MAXDELAY 0
-# drop is a probability, 0<=DROP<=1
-DROP 0
-
-random.seed 1234567890
-network.size SIZE
-simulation.endtime CYCLE*CYCLES
-simulation.logtime CYCLE
-
-################### protocols ===========================
-
-protocol.link peersim.core.IdleProtocol
-
-protocol.avg example.edaggregation.AverageED
-protocol.avg.linkable link
-protocol.avg.step CYCLE
-protocol.avg.transport tr
-
-protocol.tr UnreliableTransport
-protocol.tr.transport urt
-protocol.tr.drop DROP
-
-protocol.urt UniformRandomTransport
-protocol.urt.mindelay (CYCLE*MINDELAY)/100
-protocol.urt.maxdelay (CYCLE*MAXDELAY)/100
-################### initialization ======================
-
-init.rndlink WireKOut
-init.rndlink.k 20
-init.rndlink.protocol link
-
-init.vals LinearDistribution
-init.vals.protocol avg
-init.vals.max SIZE
-init.vals.min 1
-
-init.sch CDScheduler
-init.sch.protocol avg
-init.sch.randstart
-
-################ control ==============================
-
-control.0 SingleValueObserver
-control.0.protocol avg
-control.0.step CYCLE
diff --git a/contrib/psg/configs/edaggregationPSG.txt b/contrib/psg/configs/edaggregationPSG.txt
deleted file mode 100644 (file)
index 8510e90..0000000
+++ /dev/null
@@ -1,57 +0,0 @@
-# network size
-SIZE 50
-OutputName edaggregation
-platform platforms/psg.xml
-unit sec
-# parameters of periodic execution
-CYCLES 100
-CYCLE SIZE*100
-# parameters of message transfer
-# delay values here are relative to cycle length, in percentage,
-# eg 50 means half the cycle length, 200 twice the cycle length, etc.
-MINDELAY 0
-MAXDELAY 0
-# drop is a probability, 0<=DROP<=1
-DROP 0
-
-random.seed 1234567890
-network.size SIZE
-simulation.duration CYCLE*CYCLES
-simulation.logtime CYCLE
-
-################### protocols ===========================
-
-protocol.link peersim.core.IdleProtocol
-
-protocol.avg example.edaggregation.AverageED
-protocol.avg.linkable link
-protocol.avg.step CYCLE
-protocol.avg.transport tr
-
-protocol.tr UnreliableTransport
-protocol.tr.transport urt
-protocol.tr.drop DROP
-
-protocol.urt psgsim.PSGTransport
-protocol.urt.mindelay (CYCLE*MINDELAY)/100
-protocol.urt.maxdelay (CYCLE*MAXDELAY)/100
-################### initialization ======================
-
-init.rndlink WireKOut
-init.rndlink.k 20
-init.rndlink.protocol link
-
-init.vals LinearDistribution
-init.vals.protocol avg
-init.vals.max SIZE
-init.vals.min 1
-
-init.sch CDScheduler
-init.sch.protocol avg
-init.sch.randstart
-
-################ control ==============================
-
-control.0 SingleValueObserver
-control.0.protocol avg
-control.0.step CYCLE
diff --git a/contrib/psg/configs/symphony.txt b/contrib/psg/configs/symphony.txt
deleted file mode 100644 (file)
index fb5c778..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-# ::::::::::::::::::::::::::::::::::::::::::::::::::::::\r
-# :: Symphony Default Configuration\r
-# ::::::::::::::::::::::::::::::::::::::::::::::::::::::\r
-\r
-# network size\r
-SIZE 50\r
-\r
-# parameters of periodic execution\r
-CYCLES 100\r
-CYCLE SIZE/2\r
-OutputName symphony\r
-\r
-# parameters of message transfer\r
-# delay values here are relative to cycle length, in percentage,\r
-# eg 50 means half the cycle length, 200 twice the cycle length, etc.\r
-MINDELAY 0\r
-MAXDELAY 0\r
-\r
-random.seed 1234567890\r
-network.size SIZE\r
-simulation.experiments 1\r
-simulation.endtime 2000#CYCLE*CYCLES\r
-simulation.logtime CYCLE\r
-\r
-################### transports ===========================\r
-\r
-protocol.tr UniformRandomTransport \r
-{\r
-       mindelay (CYCLE*MINDELAY)/100\r
-       maxdelay (CYCLE*MAXDELAY)/100\r
-}\r
-\r
-################### protocols ===========================\r
-\r
-order.protocol link networkestimator symphony symphonynetworkmanager\r
-\r
-protocol.link peersim.core.IdleProtocol\r
-\r
-protocol.symphony example.symphony.SymphonyProtocol\r
-{\r
-       linkable link\r
-       transport tr\r
-       shortlink 4\r
-       # if commented means: longlink log(n)\r
-       #longlink 4\r
-       routing unidirectional\r
-       lookahead off\r
-}\r
-\r
-#protocol.networkestimator example.symphony.SimpleNetworkSizeEstimatorProtocol\r
-\r
-protocol.networkestimator example.symphony.SymphonyEstimationProtocol\r
-{\r
-       symphony symphony\r
-       # if commented means: s log(n)\r
-       #s 3\r
-}\r
-\r
-protocol.symphonynetworkmanager example.symphony.SymphonyNetworkManager\r
-{\r
-       symphony symphony\r
-       transport tr\r
-       networkestimator networkestimator\r
-       attempts 3\r
-       nTimeout 5\r
-       relinking on\r
-       relinkingLowerBound 0.5\r
-       relinkingUpperBound 2.0\r
-       step 4*CYCLE #useless\r
-}\r
-\r
-################### initialization ======================\r
-\r
-order.init netbuild checknet\r
-\r
-init.netbuild example.symphony.SymphonyNetworkBuilder\r
-{\r
-       symphony symphony\r
-       createLongLinks true\r
-       attempts 5\r
-}\r
-\r
-init.checknet example.symphony.SymphonyNetworkChecker\r
-{\r
-       symphony symphony\r
-       networkestimator networkestimator\r
-}\r
-\r
-################ control ==============================\r
-\r
-order.control sch checknet randomroutetest ringroutetest leavetest dnet estimationtest statistics\r
-\r
-control.randomroutetest example.symphony.RandomRouteTest\r
-{\r
-       symphony symphony\r
-       step CYCLE\r
-}\r
-\r
-control.ringroutetest example.symphony.RingRouteTest\r
-{\r
-       symphony symphony\r
-       startnode 0\r
-       step CYCLE\r
-}\r
-\r
-control.sch CDScheduler\r
-{\r
-       protocol symphonynetworkmanager\r
-       step CYCLE*2\r
-       randstart\r
-}\r
-\r
-control.checknet example.symphony.SymphonyNetworkChecker\r
-{\r
-       symphony symphony\r
-       networkestimator networkestimator\r
-       step CYCLE\r
-}\r
-\r
-control.dnet peersim.dynamics.DynamicNetwork\r
-{\r
-       add 0\r
-       maxsize 50\r
-       minsize SIZE/2\r
-       step CYCLE*2\r
-       init.0 example.symphony.SymphonyNodeInizializer\r
-       {\r
-               symphonynetworkmanager symphonynetworkmanager\r
-               symphony symphony\r
-               bootstrapnode 0\r
-       }\r
-}\r
-\r
-control.leavetest example.symphony.LeaveTest\r
-{\r
-       symphonynetworkmanager symphonynetworkmanager\r
-       n 1\r
-       minsizeOnline SIZE-1\r
-       waitTargetSizeToStart 2*SIZE\r
-       step CYCLE*2\r
-}\r
-\r
-control.statistics example.symphony.SymphonyStatistics\r
-{\r
-       symphony symphony\r
-       step (CYCLE*CYCLES)-1\r
-}\r
-\r
-control.estimationtest example.symphony.test.NetworkEstimationTest\r
-{\r
-       symphony symphony\r
-       symphonynetworkmanager symphonynetworkmanager\r
-       step CYCLE*4\r
-}
\ No newline at end of file
diff --git a/contrib/psg/configs/symphonyPSG.txt b/contrib/psg/configs/symphonyPSG.txt
deleted file mode 100644 (file)
index 20b7dce..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-# ::::::::::::::::::::::::::::::::::::::::::::::::::::::\r
-# :: Symphony Default Configuration\r
-# ::::::::::::::::::::::::::::::::::::::::::::::::::::::\r
-\r
-# network size\r
-SIZE 50\r
-unit sec\r
-# parameters of periodic execution\r
-CYCLES 100\r
-CYCLE SIZE/2\r
-OutputName symphony\r
-platform platforms/psg.xml\r
-\r
-# parameters of message transfer\r
-# delay values here are relative to cycle length, in percentage,\r
-# eg 50 means half the cycle length, 200 twice the cycle length, etc.\r
-MINDELAY 0\r
-MAXDELAY 0\r
-\r
-random.seed 1234567890\r
-network.size SIZE\r
-simulation.experiments 1\r
-simulation.duration 2000#CYCLE*CYCLES\r
-simulation.logtime CYCLE\r
-\r
-################### transports ===========================\r
-\r
-protocol.tr psgsim.PSGTransport \r
-{\r
-       mindelay (CYCLE*MINDELAY)/100\r
-       maxdelay (CYCLE*MAXDELAY)/100\r
-}\r
-\r
-################### protocols ===========================\r
-\r
-order.protocol link networkestimator symphony symphonynetworkmanager\r
-\r
-protocol.link peersim.core.IdleProtocol\r
-\r
-protocol.symphony example.symphony.SymphonyProtocol\r
-{\r
-       linkable link\r
-       transport tr\r
-       shortlink 4\r
-       # if commented means: longlink log(n)\r
-       #longlink 4\r
-       routing unidirectional\r
-       lookahead off\r
-}\r
-\r
-#protocol.networkestimator example.symphony.SimpleNetworkSizeEstimatorProtocol\r
-\r
-protocol.networkestimator example.symphony.SymphonyEstimationProtocol\r
-{\r
-       symphony symphony\r
-       # if commented means: s log(n)\r
-       #s 3\r
-}\r
-\r
-protocol.symphonynetworkmanager example.symphony.SymphonyNetworkManager\r
-{\r
-       symphony symphony\r
-       transport tr\r
-       networkestimator networkestimator\r
-       attempts 3\r
-       nTimeout 5\r
-       relinking on\r
-       relinkingLowerBound 0.5\r
-       relinkingUpperBound 2.0\r
-       step 4*CYCLE #useless\r
-}\r
-\r
-################### initialization ======================\r
-\r
-order.init netbuild checknet\r
-\r
-init.netbuild example.symphony.SymphonyNetworkBuilder\r
-{\r
-       symphony symphony\r
-       createLongLinks true\r
-       attempts 5\r
-}\r
-\r
-init.checknet example.symphony.SymphonyNetworkChecker\r
-{\r
-       symphony symphony\r
-       networkestimator networkestimator\r
-}\r
-\r
-################ control ==============================\r
-\r
-order.control sch checknet randomroutetest ringroutetest leavetest dnet estimationtest statistics\r
-\r
-control.randomroutetest example.symphony.RandomRouteTest\r
-{\r
-       symphony symphony\r
-       step CYCLE\r
-}\r
-\r
-control.ringroutetest example.symphony.RingRouteTest\r
-{\r
-       symphony symphony\r
-       startnode 0\r
-       step CYCLE\r
-}\r
-\r
-control.sch CDScheduler\r
-{\r
-       protocol symphonynetworkmanager\r
-       step CYCLE*2\r
-       randstart\r
-}\r
-\r
-control.checknet example.symphony.SymphonyNetworkChecker\r
-{\r
-       symphony symphony\r
-       networkestimator networkestimator\r
-       step CYCLE\r
-}\r
-\r
-control.dnet peersim.dynamics.DynamicNetwork\r
-{\r
-       add 0\r
-       maxsize 50\r
-       minsize SIZE/2\r
-       step CYCLE*2\r
-       init.0 example.symphony.SymphonyNodeInizializer\r
-       {\r
-               symphonynetworkmanager symphonynetworkmanager\r
-               symphony symphony\r
-               bootstrapnode 0\r
-       }\r
-}\r
-\r
-control.leavetest example.symphony.LeaveTest\r
-{\r
-       symphonynetworkmanager symphonynetworkmanager\r
-       n 1\r
-       minsizeOnline SIZE-1\r
-       waitTargetSizeToStart 2*SIZE\r
-       step CYCLE*2\r
-}\r
-\r
-control.statistics example.symphony.SymphonyStatistics\r
-{\r
-       symphony symphony\r
-       step (CYCLE*CYCLES)-1\r
-}\r
-\r
-control.estimationtest example.symphony.test.NetworkEstimationTest\r
-{\r
-       symphony symphony\r
-       symphonynetworkmanager symphonynetworkmanager\r
-       step CYCLE*4\r
-}\r
diff --git a/contrib/psg/lib.jar b/contrib/psg/lib.jar
deleted file mode 100644 (file)
index 8fd65fa..0000000
Binary files a/contrib/psg/lib.jar and /dev/null differ
diff --git a/contrib/psg/platforms/psg.xml b/contrib/psg/platforms/psg.xml
deleted file mode 100644 (file)
index bdd2e19..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid.dtd">
-<!--             _________
-                |          |
-                |  router  |
-    ____________|__________|_____________ backbone
-      |   |   |              |     |   |       
-    l0|        l1| l2|           l97| l96 |   | l99
-      |   |   |   ........   |     |   |
-      |                                |
-    c-0.me                             c-99.me 
-
--->
-<platform version="3">
-<config>
-<prop id="network/latency_factor" value="1.0"/>
-</config>
-<AS  id="AS0"  routing="Full">
-  <cluster id="my_cluster_1" prefix="" suffix=""
-               radical="0-50000"       power="1Gf"  bw="200Mbps" lat="0ms"
-        bb_bw="200Mbps" bb_lat="0ms"/>
-</AS>
-</platform>
diff --git a/contrib/psg/run.sh b/contrib/psg/run.sh
deleted file mode 100755 (executable)
index baac2ee..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-if [ $(uname -m) = "i686" ]; then
-       eval ulimit -s 64
-else 
-       eval ulimit -s 128
-fi
-echo '------------- Start execution..';
-java -Xmx1024m -cp lib.jar:classes:../../simgrid.jar peersim.Simulator $1
-echo '------------- done -------------';
-exit 0
-
-
-
-
diff --git a/contrib/psg/src/example/bittorrent/BTObserver.java b/contrib/psg/src/example/bittorrent/BTObserver.java
deleted file mode 100644 (file)
index ddd38da..0000000
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2007-2008 Fabrizio Frioli, Michele Pedrolli
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * --
- *
- * Please send your questions/suggestions to:
- * {fabrizio.frioli, michele.pedrolli} at studenti dot unitn dot it
- *
- */
-
-package example.bittorrent;
-
-import peersim.config.*;
-import peersim.core.*;
-import peersim.util.*;
-
-/**
- * This {@link Control} provides a way to keep track of some
- * parameters of the BitTorrent network.
- */
- public class BTObserver implements Control {
-        
-       /**
-        *      The protocol to operate on.
-        *      @config
-        */
-       private static final String PAR_PROT="protocol";
-       
-       /**
-        *      Protocol identifier, obtained from config property
-        */
-       private final int pid;
-       
-       /**
-        *      The basic constructor that reads the configuration file.
-        *      @param prefix the configuration prefix for this class
-        */
-       public BTObserver(String prefix) {
-               pid = Configuration.getPid(prefix + "." + PAR_PROT);
-       }
-       
-       /**
-        * Prints information about the BitTorrent network
-        * and the number of leechers and seeders.
-        * Please refer to the code comments for more details.
-        * @return always false
-        */
-       public boolean execute() {
-               IncrementalFreq nodeStatusStats = new IncrementalFreq();
-               IncrementalStats neighborStats = new IncrementalStats();
-               
-               int numberOfNodes = Network.size();
-               int numberOfCompletedPieces = 0;
-               
-               // cycles from 1, since the node 0 is the tracker
-               for (int i=1; i<numberOfNodes; ++i) {
-                       
-                       // stats on number of leechers and seeders in the network
-                       // and consequently also on number of completed files in the network
-                       nodeStatusStats.add(((BitTorrent)(Network.get(i).getProtocol(pid))).getPeerStatus());
-                       
-                       // stats on number of neighbors per peer
-                       neighborStats.add(((BitTorrent)(Network.get(i).getProtocol(pid))).getNNodes());
-               }
-               
-               // number of the pieces of the file, equal for every node, here 1 is chosen,
-               // since 1 is the first "normal" node (0 is the tracker)
-               int numberOfPieces = ((BitTorrent)(Network.get(1).getProtocol(pid))).nPieces;
-       
-               for (int i=1; i<numberOfNodes; ++i) {
-                       numberOfCompletedPieces = 0;
-                       
-                       // discovers the status of the current peer (leecher or seeder)
-                       int ps = ((BitTorrent)(Network.get(i).getProtocol(pid))).getPeerStatus();
-                       String peerStatus;
-                       if (ps==0) {
-                               peerStatus = "L"; //leecher
-                       }
-                       else {
-                               peerStatus = "S"; //seeder
-                       }
-                       
-                       
-                       if (Network.get(i)!=null) {
-                               
-                               // counts the number of completed pieces for the i-th node
-                               for (int j=0; j<numberOfPieces; j++) {
-                                       if ( ((BitTorrent)(Network.get(i).getProtocol(pid))).getFileStatus()[j] == 16) {
-                                               numberOfCompletedPieces++;
-                                       }
-                               }
-                               
-                               /*
-                                * Put here the output lines of the Observer. An example is provided with
-                                * basic information and stats.
-                                * CommonState.getTime() is used to print out time references
-                                * (useful for graph plotting).
-                                */
-                               
-                               System.out.println("OBS: node " + ((BitTorrent)(Network.get(i).getProtocol(pid))).getThisNodeID() + "(" + peerStatus + ")" + "\t pieces completed: " + numberOfCompletedPieces + "\t \t down: " + ((BitTorrent)(Network.get(i).getProtocol(pid))).nPiecesDown + "\t up: " + ((BitTorrent)(Network.get(i).getProtocol(pid))).nPiecesUp + " time: " + CommonState.getTime());
-                               //System.out.println("[OBS] t " + CommonState.getTime() + "\t pc " + numberOfCompletedPieces + "\t n " + ((BitTorrent)(Network.get(i).getProtocol(pid))).getThisNodeID());
-                               //System.out.println( CommonState.getTime() + "\t" + numberOfCompletedPieces + "\t" + ((BitTorrent)(Network.get(i).getProtocol(pid))).getThisNodeID());
-
-                       }
-                       else {
-                               //System.out.println("[OBS] t " + CommonState.getTime() + "\t pc " + "0" + "\t n " + "0");
-                       }
-               
-               }
-               
-               // prints the frequency of 0 (leechers) and 1 (seeders)
-               nodeStatusStats.printAll(System.out);
-               
-               // prints the average number of neighbors per peer
-               System.out.println("Avg number of neighbors per peer: " + neighborStats.getAverage());
-               
-               return false;
-       }
-}
\ No newline at end of file
diff --git a/contrib/psg/src/example/bittorrent/BitTorrent.java b/contrib/psg/src/example/bittorrent/BitTorrent.java
deleted file mode 100644 (file)
index 1604a4d..0000000
+++ /dev/null
@@ -1,1989 +0,0 @@
-/*
- * Copyright (c) 2007-2008 Fabrizio Frioli, Michele Pedrolli
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * --
- *
- * Please send your questions/suggestions to:
- * {fabrizio.frioli, michele.pedrolli} at studenti dot unitn dot it
- *
- */
-
-package example.bittorrent;
-
-import peersim.core.*;
-import peersim.config.*;
-import peersim.edsim.*;
-import peersim.transport.*;
-
-/**
- *     This is the class that implements the BitTorrent module for Peersim
- */
-public class BitTorrent implements EDProtocol {
-       /**
-        *      The size in Megabytes of the file being shared.
-        *      @config
-        */
-       private static final String PAR_SIZE="file_size";
-       /**
-        *      The Transport used by the the protocol.
-        *      @config
-        */
-       private static final String PAR_TRANSPORT="transport";
-       /**
-        *      The maximum number of neighbor that a node can have. 
-        *      @config
-        */
-       private static final String PAR_SWARM="max_swarm_size";
-       /**
-        *      The maximum number of peers returned by the tracker when a new
-        *      set of peers is requested through a <tt>TRACKER</tt> message.
-        *      @config
-        */
-       private static final String PAR_PEERSET_SIZE="peerset_size";
-       /**
-        *      Defines how much the network can grow with respect to the <tt>network.size</tt> 
-        *  when {@link NetworkDynamics} is used.
-        *      @config
-        */
-       private static final String PAR_MAX_GROWTH="max_growth";
-       /**
-        *      Is the number of requests of the same block sent to different peers.
-        *      @config
-        */
-       private static final String PAR_DUP_REQ = "duplicated_requests";
-       
-       /**
-        *      KEEP_ALIVE message.
-        *      @see SimpleEvent#type "Event types"
-        */
-       private static final int KEEP_ALIVE = 1;
-       
-       /**
-        *      CHOKE message.
-        *      @see SimpleEvent#type "Event types"
-        */
-       private static final int CHOKE = 2;
-       
-       /**
-        *      UNCHOKE message.
-        *      @see SimpleEvent#type "Event types"
-        */
-       private static final int UNCHOKE = 3;
-       
-       /**
-        *      INTERESTED message.
-        *      @see SimpleEvent#type "Event types"
-        */
-       private static final int INTERESTED = 4;
-       
-       /**
-        *      NOT_INTERESTED message.
-        *      @see SimpleEvent#type "Event types"
-        */
-       private static final int NOT_INTERESTED = 5;
-       
-       /**
-        *      HAVE message.
-        *      @see SimpleEvent#type "Event types"
-        */
-       private static final int HAVE = 6;
-       
-       /**
-        *      BITFIELD message.
-        *      @see SimpleEvent#type "Event types"
-        */
-       private static final int BITFIELD = 7;
-       
-       /**
-        *      REQUEST message.
-        *      @see SimpleEvent#type "Event types"
-        */
-       private static final int REQUEST = 8;
-       
-       /**
-        *      PIECE message.
-        *      @see SimpleEvent#type "Event types"
-        */     
-       private static final int PIECE = 9;
-
-       /**
-        *      CANCEL message.
-        *      @see SimpleEvent#type "Event types"
-        */     
-       private static final int CANCEL = 10;
-       
-       /**
-        *      TRACKER message.
-        *      @see SimpleEvent#type "Event types"
-        */     
-       private static final int TRACKER = 11;
-       
-       /**
-        *      PEERSET message.
-        *      @see SimpleEvent#type "Event types"
-        */     
-       private static final int PEERSET = 12;
-       
-       /**
-        *      CHOKE_TIME event.
-        *      @see SimpleEvent#type "Event types"
-        */     
-       private static final int CHOKE_TIME = 13;
-       
-       /**
-        *      OPTUNCHK_TIME event.
-        *      @see SimpleEvent#type "Event types"
-        */     
-       private static final int OPTUNCHK_TIME = 14;
-       
-       /**
-        *      ANTISNUB_TIME event.
-        *      @see SimpleEvent#type "Event types"
-        */     
-       private static final int ANTISNUB_TIME = 15;
-       
-       /**
-        *      CHECKALIVE_TIME event.
-        *      @see SimpleEvent#type "Event types"
-        */     
-       private static final int CHECKALIVE_TIME = 16;
-       
-       /**
-        *      TRACKERALIVE_TIME event.
-        *      @see SimpleEvent#type "Event types"
-        */     
-       private static final int TRACKERALIVE_TIME = 17;
-       
-       /**
-        *      DOWNLOAD_COMPLETED event.
-        *      @see SimpleEvent#type "Event types"
-        */     
-       private static final int DOWNLOAD_COMPLETED = 18;
-
-       /**
-        *      The maxium connection speed of the local node.
-        */
-       int maxBandwidth;
-       
-       /**
-        *      Stores the neighbors ordered by ID.
-        *  @see Element
-        */
-       private example.bittorrent.Element byPeer[];
-       
-       /**
-        *      Contains the neighbors ordered by bandwidth as needed by the unchocking
-        *      algorithm.
-        */
-       private example.bittorrent.Element byBandwidth[];
-       
-       /**
-        *      The Neighbors list.
-        */
-       private Neighbor cache[];
-       
-       /**
-        *      Reference to the neighbors that unchocked the local node.
-        */
-       private boolean unchokedBy[];
-       
-       /**
-        *      Number of neighbors in the cache. When it decreases under 20, a new peerset
-        *      is requested to the tracker.
-        */
-       private int nNodes = 0;
-       
-       /**
-        *      Maximum number of nodes in the network.
-        */
-       private int nMaxNodes;
-       
-       /**
-        *      The status of the local peer. 0 means that the current peer is a leecher, 1 a seeder.
-        */ 
-       private int peerStatus;
-       
-       /**
-        *      Defines how much the network can grow with respect to the <tt>network.size</tt> 
-        *  when {@link NetworkDynamics} is used.
-        */
-       public int maxGrowth;
-       
-       /**
-        *      File status of the local node. Contains the blocks owned by the local node.
-        */
-       private int status[];
-       
-       /**
-        *      Current number of Bitfield request sent. It must be taken into account 
-        *      before sending another one.
-        */
-       private int nBitfieldSent = 0;
-       
-       /**
-        *      Current number of pieces in upload from t