Changes between Version 16 and Version 17 of OverSimDevelop

Timestamp:

Apr 20, 2009, 10:10:38 AM (16 years ago)

Author:

heep

Comment:

--

OverSimDevelop

@@ -40 +40 @@
 
 {{{
-
+#!cpp
 // sets the package, the name must match the path to the module (from src/ upwards)
 package oversim.overlay.myoverlay;
@@ -63 +63 @@
 
 {{{
+#!cpp
 // sets the package, the name must match the path to the module (from src/ upwards)
 package oversim.applications.myapplication;
@@ -93 +94 @@
 
 {{{
+#!cpp
 import oversim.common.IOverlay;
 
@@ -121 +123 @@
 
 {{{
+#!cpp
 import oversim.common.ITier;
 
@@ -157 +160 @@
 
 {{{
-
+#!cpp
 // Import the C++ TransportAddress class
 
@@ -197 +200 @@
                     Its value can be set in different ways when it's being initialized:[[BR]]
 {{{
-!OverlayKey();           // initializes the key as UNSPECIFIED. While in this value, most of the key operations are invalid! [[BR]]
-!OverlayKey(5);          // initializes the value as an 32-bit integer.[[BR]]
-!OverlayKey(buffer, 32); // initializes the value from the first 32 bytes of buffer.[[BR]]
-!OverlayKey().random();  // initializes the value as a random bit array.[[BR]]
+#!cpp
+OverlayKey();           // initializes the key as UNSPECIFIED. While in this value, most of the key operations are invalid!
+OverlayKey(5);          // initializes the value as an 32-bit integer.
+OverlayKey(buffer, 32); // initializes the value from the first 32 bytes of buffer.
+OverlayKey().random();  // initializes the value as a random bit array.
 }}}
                     OverlayKey operations include equality (==), order (<, >) and range (isBetween(key1, key2)).[[BR]]
@@ -217 +221 @@
 
 {{{
+#!cpp
 class MyApplication : public BaseApp
 {
@@ -243 +248 @@
 
 {{{
-
+#!cpp
 // This line tells the simulator that MyApplication is going to be extended using C++ code.
 // It *must* be present (only once) somewhere in your code, outside a function, for each module you'll be extending.
@@ -302 +307 @@
 // handleTimerEvent is called when a timer event triggers
 
-void MyApplication::handleTimerEvent(cMessage* msg) {
-
+void MyApplication::handleTimerEvent(cMessage* msg)
+{
     if (msg == timerMsg) {    // is this our timer?
 
@@ -325 +330 @@
             callRoute(randomKey, myMessage); // send it to the overlay
         }
-
     } else {
-
         delete msg; // who knows what this packet is?
-
     }
 }
@@ -336 +338 @@
 // Unhandled or unknown packets can be safely deleted here.
 
-void MyApplication::deliver(OverlayKey& key, cMessage* msg) {
-
+void MyApplication::deliver(OverlayKey& key, cMessage* msg)
+{
     // we are only expecting messages of type MyMessage, throw away any other
 
@@ -352 +354 @@
        myMsg->setType(MYMSG_PONG);                         // change type
        sendMessageToUDP(myMsg->getSenderAddress(), myMsg); // send it back to its owner
-
     } else {
-
        delete msg;     // unhandled!
-
     }
 }
@@ -364 +363 @@
 
 void MyApplication::handleUDPMessage(cMessage* msg) {
-
     // we are only expecting messages of type MyMessage
 
@@ -370 +368 @@
 
     if (myMsg && myMsg->getType() == MYMSG_PONG) {
-
        numReceived++;
-
     }
 
@@ -379 +375 @@
     delete msg;
 }
-
 }}}
 
@@ -390 +385 @@
 
 {{{
+#!cpp
 class MyOverlay : public BaseOverlay {
 public:
@@ -435 +431 @@
 
 {{{
+#!cpp
 // Important! This line must be present for each module you extend (see MyApplication)
 Define_Module(MyOverlay);
@@ -442 +439 @@
 
 // Called when the module is being initialized
-void MyOverlay::initializeOverlay(int stage) {
-
+void MyOverlay::initializeOverlay(int stage)
+{
     if (stage != MIN_STAGE_OVERLAY) return;         // see BaseApp.cc
 
@@ -458 +455 @@
 
 // Called to set our own overlay key (optional)
-void MyOverlay::setOwnNodeID() {
+void MyOverlay::setOwnNodeID()
+{
     thisNode.key = OverlayKey(myKey);   // create the corresponding overlay key
 }
 
 // Called when the module is ready to join the overlay
-void MyOverlay::joinOverlay() {
-
+void MyOverlay::joinOverlay()
+{
     // Set the information of the previous step in the chain
     prevNode.ip = IPAddress(BIGBIT | (myKey - 1));
@@ -518 +516 @@
 
 // Called when the module is about to be destroyed
-void MyOverlay::finalizeOverlay() {
+void MyOverlay::finalizeOverlay()
+{
     // remove this node from the overlay
     setOverlayReady(false);
@@ -527 +526 @@
 
 // Return the max amount of siblings that can be queried about
-int MyOverlay::getMaxNumSiblings() {
+int MyOverlay::getMaxNumSiblings()
+{
     return 1;
 }
 
 // Return the max amount of redundant that can be queried about
-int MyOverlay::getMaxNumRedundantNodes() {
+int MyOverlay::getMaxNumRedundantNodes()
+{
     return 1;
 }
@@ -546 +547 @@
 
 {{{
+#!cpp
 SimpleOverlay.overlayTerminal[5].overlay.myOverlay.enableDrops = true
 }}}
@@ -554 +556 @@
 
 {{{
+#!cpp
 *.overlayTerminal[5].overlay.myOverlay.enableDrops = true
 **.overlay.myOverlay.enableDrops = true
@@ -570 +573 @@
 Therefore, the last line of omnetpp.ini should look like this:
 {{{
+#!cpp
 include ./default.ini
 }}}
@@ -578 +582 @@
 
 {{{
+#!cpp
 [General]
 sim-time-limit = 1000s                                              // set all simulations to last 1000 seconds
@@ -594 +599 @@
 
 {{{
+#!cpp
 [Config ExampleConf]
 description = MyOverlay test (SimpleUnderlayNetwork)
@@ -611 +617 @@
 **.myApplication.numToSend = 1
 **.myApplication.largestKey = 10
-
 }}}
 
@@ -617 +622 @@
 
 {{{
-
+#!cpp
 [Config ExampleA]
 extends = ExampleConf
@@ -627 +632 @@
 **.myOverlay.dropChance = 0.5
 **.myApplication.sendPeriod = 2s
-
 }}}
 
@@ -635 +639 @@
 
 {{{
-
+#!cpp
 [Config ExampleC]
 extends = Example
 **.myOverlay.dropChance = ${Drop=0.1, 0.3, 0.5, 0.7}
 **.myApplication.sendPeriod = 1s
-
 }}}
 
@@ -650 +653 @@
 
 {{{
-
+#!cpp
 ...
 **.application.sendPeriod = ${Period=1s, 2s, 5s}
-
 }}}
 
@@ -659 +661 @@
 
 {{{
-
+#!cpp
 repeat = 3
-
 }}}
 
@@ -684 +685 @@
 
 {{{
+#!sh
 ../src/OverSim [-u Tkenv | CmdEnv] [-f customConfigFile] -c configName [-r runNumber]
 }}}
@@ -697 +699 @@
 
 {{{
+#!cpp
 class MyOverlay : public BaseOverlay {
     ...
@@ -737 +740 @@
 
 {{{
-
+#!cpp
 cplusplus {{
 #include <NodeHandle.h>
@@ -767 +770 @@
 
 {{{
+#!cpp
     void MyOverlay::getNeighbors(const OverlayKey &neighborKey) {
         MyNeighborCall *msg = new MyNeighborCall();
@@ -782 +786 @@
 
 {{{
-
+#!cpp
     // Handle an incoming Call message
     // Only delete msg if the RPC is handled here, and you won't respond using sendRpcResponse!
@@ -862 +866 @@
         RPC_SWITCH_END();
     }
-
 }}}