Skip to content

Commit

Permalink
:trollface: :trollface: :trollface: July-September RINASim release :trollface: :trollface: :trollface:
Browse files Browse the repository at this point in the history
Updating README.txt
Updating fingerprints
  • Loading branch information
kvetak committed Oct 7, 2015
1 parent 238a7a2 commit 316f514
Show file tree
Hide file tree
Showing 16 changed files with 63 additions and 34 deletions.
14 changes: 12 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@ RINA Simulator
====

###Version changelog

* July-September 2015 - RIBd notifiers, pre-EFCPv6 updates, CDAPProcessingBase interface,
merging partner's contribution (namely routing and congestion control),
added Hop Count to PDU header
* May/June 2015 - Enrollment, (N-1)-data/management separation, MIT relicensing,
EFCPv4+ updates, separation of QoSCubes and QoS requirements,
change of QoSCube-id datatype, source code split between
Expand All @@ -16,11 +18,15 @@ RINA Simulator
* November 2014 - Brussels RV1 with AllNodes examples
* October 2014 - Madrid F2F meeting with working SimpleRelay and TwoCSs scenarios

###Links
###Resources
* [OpenSourceProject Git with archived RINASim releases](https://opensourceprojects.eu/p/pristine/rinasimulator/rinasim/ci/b323f721944033c9f31924c02e2b67ba9c92c712/tree/)
* [VMWare Out-of-the-box virtual machine with RINASim](http://nes.fit.vutbr.cz/ivesely/vm/RINASim.zip)
* [PRISTINE webpage](http://ict-pristine.eu/)
* [Developer's mailing-list](https://www.fit.vutbr.cz/mailman/listinfo/rinasim)
* [Deliverable 2.4 describing RINASim basics](http://ict-pristine.eu/wp-content/uploads/2013/12/PRISTINE-D24-RINASim-draft.pdf)

###Papers
* [V.Vesely, M.Marek, T.Hykel, O.Rysavy; Skip This Paper - RINASim: Your Recursive InterNetwork Architecture Simulator](http://arxiv.org/abs/1509.03550)

###Directory structure

Expand All @@ -37,6 +43,10 @@ RINA Simulator
/DIF ... DIF component

/policies ... all programable RINA policies

/scripts
fingerprints.sh ... batch for checking/updating fingerprints
slocstats.sh ... counts source lines of code

###Available policies
/DAF ... DAF policies
Expand Down
4 changes: 2 additions & 2 deletions examples/Basics/AllNodes/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ sim-time-limit = 5min
**.printAtEnd = true

[Config Ping]
fingerprint = "6fd3-42b1"
fingerprint = "d5be-6971"
#PingApp setup
**.HostA1.applicationProcess1.applicationEntity.iae.dstApName = "AppB1"
**.HostA1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
Expand All @@ -113,7 +113,7 @@ fingerprint = "6fd3-42b1"
**.applicationProcess1.applicationEntity.iae.forceOrder = true

[Config PingWithDrop]
fingerprint = "f055-7f53"
fingerprint = "08b2-1d18"
#PingApp setup
**.HostA1.applicationProcess1.applicationEntity.iae.dstApName = "AppB1"
**.HostA1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
Expand Down
2 changes: 1 addition & 1 deletion examples/Basics/ExtendedPingTwoCSsSimple/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ seed-set = ${runnumber}


[Config Ping]
fingerprint = "78ba-057b"
fingerprint = "f758-f77f"
#PingApp setup
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
**.host1.applicationProcess1.applicationEntity.iae.startAt = 10s
Expand Down
6 changes: 3 additions & 3 deletions examples/Basics/SimpleRelay/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ seed-set = ${runnumber}
**.printAtEnd = true

[Config Ping]
fingerprint = "0107-fc77"
fingerprint = "be83-f0a5"
#PingApp setup
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
Expand All @@ -63,7 +63,7 @@ fingerprint = "0107-fc77"
**.host1.applicationProcess1.applicationEntity.iae.stopAt = 200s

[Config PingWithPreallocation]
fingerprint = "d012-d9be"
fingerprint = "c6fe-4ac8"
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
**.host1.applicationProcess1.applicationEntity.iae.startAt = 20s
Expand All @@ -76,7 +76,7 @@ fingerprint = "d012-d9be"
xmldoc("config.xml", "Configuration/ConnectionSets/ConnectionSet[@id='PingWithPreallocation']/")

[Config PingWithDiffServ]
fingerprint = "ae58-c4b7"
fingerprint = "17a3-f1c9"
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
**.host1.applicationProcess1.applicationEntity.iae.startAt = 10s
Expand Down
2 changes: 1 addition & 1 deletion examples/Basics/SingleCS/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ sim-time-limit = 5min
**.ra.qoscubesData = xmldoc("config.xml", "Configuration/QoSCubesSet")

[Config Ping]
fingerprint = "2e11-5c30"
fingerprint = "82a5-b954"
**.applicationProcess1.apName = "App1"
**.applicationProcess2.apName = "App2"
**.iae.aeName = "Ping"
Expand Down
2 changes: 1 addition & 1 deletion examples/Basics/SmallNetwork/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ seed-set = ${runnumber}


[Config Ping]
fingerprint = "1d36-9dc1"
fingerprint = "2fba-1b8d"
#PingApp setup
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App5"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
Expand Down
2 changes: 1 addition & 1 deletion examples/Basics/SmallNetwork2/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ seed-set = ${runnumber}


[Config Ping]
fingerprint = "b113-cddc"
fingerprint = "9443-3a2f"
#PingApp setup
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App4"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Stream4"
Expand Down
8 changes: 4 additions & 4 deletions examples/Basics/TwoCSs/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ sim-time-limit = 5min
**.host2.**.enrollment.isSelfEnrolled = true

[Config PingFC] #FIXME
fingerprint = "bd6d-4978"
fingerprint = "9a06-9084"
#PingApp setup
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
Expand All @@ -54,7 +54,7 @@ fingerprint = "bd6d-4978"
**.host*.ipcProcess0.efcp.efcp.rtt = 7s

[Config PingRX] #FIXME
fingerprint = "b6ce-c23f"
fingerprint = "0f9a-cddd"
#PingApp setup
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
Expand All @@ -65,7 +65,7 @@ fingerprint = "b6ce-c23f"
**.host1.ipcProcess1.efcp.efcp.pduDroppingEnabled = true

[Config Ping]
fingerprint = "bd6d-4978"
fingerprint = "9a06-9084"
#PingApp setup
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
Expand All @@ -78,7 +78,7 @@ fingerprint = "bd6d-4978"
#**.host*.ipcProcess0.relayAndMux.RxQueuingTime = 0.5s

[Config Ping-AppQos]
fingerprint = "bd6d-4978"
fingerprint = "9a06-9084"
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
**.host1.applicationProcess1.applicationEntity.iae.startAt = 10s
Expand Down
2 changes: 1 addition & 1 deletion examples/Basics/TwoCSsSimple/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ seed-set = ${runnumber}
**.host2.**.enrollment.isSelfEnrolled = true

[Config PingFC]
fingerprint = "04ba-1ab5"
fingerprint = "ae9c-f3b1"
#PingApp setup
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App2"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
Expand Down
4 changes: 2 additions & 2 deletions examples/Congestion/SimpleRelayCongestion/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ seed-set = ${runnumber}
#**.fa.createRequestTimeout = 15s
#**.host1.applicationProcess1.applicationEntity.iae.forceOrder = true
[Config CongestionPing]
fingerprint = "3572-500c"
fingerprint = "1dc5-1e70"

#Specify AE
**.applicationEntity.aeType = "AEPing"
Expand All @@ -71,7 +71,7 @@ fingerprint = "3572-500c"
**.host2.ipcProcess0.efcp.efcp.rcvCredit = 3

[Config CongestionStream]
fingerprint = "8c5c-4ff0"
fingerprint = "b049-b35f"

#Specify AE as Streaming app
**.applicationEntity.aeType = "AEStream"
Expand Down
2 changes: 1 addition & 1 deletion examples/Routing/BigRandNet/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ sim-time-limit = 5min
**.iae.aeName = "Ping"

[Config DistanceVector]
fingerprint = "f35f-97c4"
fingerprint = "483b-15fa"

# forwarding generator policies
**.H*.ipcProcess1.resourceAllocator.pdufgPolicyName = "SimpleGenerator"
Expand Down
2 changes: 1 addition & 1 deletion examples/Routing/DC/omnetpp.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Config DistanceVector]
fingerprint = "6ecd-720b"
fingerprint = "3dfe-550b"
**.applicationEntity.aeType = "AEPing"
**.iae.aeName = "Ping"

Expand Down
2 changes: 1 addition & 1 deletion examples/Routing/FatTreeTopology/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ debug-on-errors = true
xmldoc("config.xml", "Configuration/ConnectionSets/ConnectionSet[@id='all']/")

[Config FatTreeTopology]
fingerprint = "2ec4-a849"
fingerprint = "7b96-1500"
#
# AEs don't do anything. We're only evaluating the routing table now.
#
Expand Down
2 changes: 1 addition & 1 deletion examples/Routing/SmallNetRouting/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ seed-set = ${runnumber}
#
# AEs todo:
#
fingerprint = "b2eb-c808"
fingerprint = "91be-6ce7"
**.host1.applicationProcess1.applicationEntity.iae.dstApName = "App5"
**.host1.applicationProcess1.applicationEntity.iae.dstAeName = "Ping"
**.host1.applicationProcess1.applicationEntity.iae.startAt = 100s
Expand Down
2 changes: 1 addition & 1 deletion examples/Routing/SmallRandNet/omnetpp.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ simtime-scale = -11
**.iae.aeName = "Ping"

[Config DistanceVector]
fingerprint = "3bae-08de"
fingerprint = "9551-1eef"

# RMT Forwarding policies
**.H*.ipcProcess1.relayAndMux.ForwardingPolicyName = "SimpleTable"
Expand Down
41 changes: 30 additions & 11 deletions scripts/slocstats.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,31 @@
#!/bin/bash
echo "This script counts SLOCs of RINASim project"
echo "C++ code (*.cc, *.h)"
git ls-files .. | grep -E '*.cc|*.h'| xargs cat | wc -l
echo "OMNeT++ code (*.msg, *.ned)"
git ls-files .. | grep -E '*.msg|*.ned'| xargs cat | wc -l
echo "Simulation code (*.ini, *.xml)"
git ls-files .. | grep -E '*.ini|*.xml'| xargs cat | wc -l
echo "Whole project code (*.cc, *.h, *.msg, *.ned, *.ini, *.xml)"
git ls-files .. | grep -E '*.cc|*.h|*.msg|*.ned|*.xml|*.ini'| xargs cat | wc -l
echo "All files watched by GIT"
git ls-files .. | xargs cat | wc -l
printf "This script counts SLOCs of RINASim project\n"
printf "===============================================================\n"
printf "language extension\tall\texcl.comments\texcl.pattern\n"
printf "===============================================================\n"

#C++
cppall=`git ls-files .. | grep -E '*.cc|*.h' | xargs cat | wc -l`
cppexc=`git ls-files .. | grep -E '*.cc|*.h' | xargs cat | sed '/\/\//d' | sed '/^\s*$/d' | sed '/\/\*/,/*\//d' | wc -l`
printf "C++ *.cc *.h\t$cppall\t$cppexc\t\tempty // /**/\n"

#OMNeT
omnall=`git ls-files .. | grep -E '*.msg|*.ned' | xargs cat | wc -l`
omnexc=`git ls-files .. | grep -E '*.msg|*.ned' | xargs cat | sed '/\/\//d' | sed '/^\s*$/d' | wc -l`
printf "NED *.msg *.ned\t$omnall\t$omnexc\t\tempty //\n"

#Simul
simall=`git ls-files .. | grep -E '*.ini|*.xml' | xargs cat | wc -l`
simexc=`git ls-files .. | grep -E '*.ini|*.xml' | xargs cat | sed '/\s*#.*$/d' | sed '/^\s*$/d' | wc -l`
printf "OMNeT++ *.ini *.xml\t$simall\t$simexc\t\tempty #\n"
printf "===============================================================\n"

#All
sumall=`expr $cppall + $omnall + $simall`
sumexc=`expr $cppexc + $omnexc + $simexc`
printf "Summary \t\t$sumall\t$sumexc\n"

printf "===============================================================\n"
gitall=`git ls-files .. | xargs cat | wc -l`
gitexc=`git ls-files .. | xargs cat | sed '/^\s*$/d' | wc -l`
printf "GIT *.*\t\t$gitall\t$gitexc\t\tempty\n"

0 comments on commit 316f514

Please sign in to comment.