Change the units. omnetpp 4.2 port

inetmanet · Feb 10, 2012 · 07463fd · 07463fd
1 parent 9733000
commit 07463fd
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 16 deletions.
diff --git a/examples/inet/multicast/MulticastNetwork.ned b/examples/inet/multicast/MulticastNetwork.ned
@@ -39,7 +39,7 @@ network MulticastNetwork
         channel dialup extends DatarateChannel
         {
             delay = normal(0.004s, 0.0018s);
-            datarate = 64Kbps;
+            datarate = 64kbps;
         }
         channel fiberrouter extends DatarateChannel
         {

diff --git a/examples/mpls/ldp/LDPTEST.ned b/examples/mpls/ldp/LDPTEST.ned
@@ -27,17 +27,17 @@ network LDPTEST
     types:
         channel C5 extends DatarateChannel
         {
-            datarate = 600Kbps;
+            datarate = 600kbps;
             delay = 5us;
         }
         channel C10 extends DatarateChannel
         {
-            datarate = 600Kbps;
+            datarate = 600kbps;
             delay = 10us;
         }
         channel C15 extends DatarateChannel
         {
-            datarate = 600Kbps;
+            datarate = 600kbps;
             delay = 15us;
         }
     submodules:

diff --git a/examples/mpls/net37/r37-orig.ned b/examples/mpls/net37/r37-orig.ned
@@ -24,7 +24,7 @@ network R37orig
         channel line extends DatarateChannel
         {
             delay = 15ms;
-            datarate = 60Kbps;
+            datarate = 60kbps;
         }
     submodules:
         configurator: NetworkConfigurator;

diff --git a/examples/mpls/net37/r37.ned b/examples/mpls/net37/r37.ned
@@ -26,7 +26,7 @@ network R37
         channel line extends DatarateChannel
         {
             delay = 15ms;
-            datarate = 128Kbps;
+            datarate = 128kbps;
         }
     submodules:
         configurator: NetworkConfigurator {

diff --git a/src/applications/ethernet/EtherAppCli.ned b/src/applications/ethernet/EtherAppCli.ned
@@ -30,7 +30,7 @@ simple EtherAppCli
         double startTime @unit("s") = default(this.waitTime);  // time of sending the first request
         volatile double waitTime @unit("s") = default(uniform(0s,1s));  // interval between sending requests
         volatile int reqLength @unit(B) = default(100B);  // length of request packets
-        volatile int respLength @unit(B) = default(1KB);  // length of response packets
+        volatile int respLength @unit(B) = default(1KiB);  // length of response packets
         bool registerSAP = default(false);   // whether to sent IEEE802CTRL_REGISTER_DSAP on startup
         @display("i=block/app");
     gates:

diff --git a/src/applications/tcpapp/TCPBasicClientApp.ned b/src/applications/tcpapp/TCPBasicClientApp.ned
@@ -71,7 +71,7 @@ simple TCPBasicClientApp like TCPApp
         double startTime @unit("s") = default(1s); // time first session begins
         volatile int numRequestsPerSession = default(1);  // number of requests sent per session
         volatile int requestLength @unit(B) = default(200B); // length of a request
-        volatile int replyLength @unit("B") = default(1MB); // length of a reply
+        volatile int replyLength @unit("B") = default(1MiB); // length of a reply
         volatile double thinkTime @unit("s"); // time gap between requests
         volatile double idleInterval @unit(s); // time gap between sessions
         volatile double reconnectInterval @unit("s") = default(30s);  // if connection breaks, waits this much before trying to reconnect

diff --git a/src/applications/tcpapp/TCPSessionApp.ned b/src/applications/tcpapp/TCPSessionApp.ned
@@ -65,7 +65,7 @@ simple TCPSessionApp like TCPApp
         int connectPort = default(1000);
         double tOpen @unit("s") = default(1s);
         double tSend @unit("s") = default(1s);
-        int sendBytes @unit("B") = default(1MB);
+        int sendBytes @unit("B") = default(1MiB);
         string sendScript = default("");
         double tClose @unit("s") = default(2s);
         @display("i=block/app");

diff --git a/src/applications/udpapp/UDPBasicBurst2.h b/src/applications/udpapp/UDPBasicBurst2.h
@@ -111,7 +111,12 @@ class INET_API UDPBasicBurst2 : public UDPAppBase
     virtual void handleMessage(cMessage *msg);
     virtual void finish();
   public:
-    UDPBasicBurst2() {}
+    UDPBasicBurst2() {
+       pktDelayFtoF=NULL;
+       pktDelayFtoM=NULL;
+       pktDelayMtoM=NULL;
+       pktDelayMtoF=NULL;
+    }
     ~UDPBasicBurst2();
 };
 

diff --git a/src/linklayer/etherswitch/MACRelayUnitNP.ned b/src/linklayer/etherswitch/MACRelayUnitNP.ned
@@ -41,8 +41,8 @@ simple MACRelayUnitNP like MACRelayUnit
         double agingTime @unit("s") = default(120s); // see MACRelayUnit
         int numCPUs = default(1);  // number of CPUs
         double processingTime @unit("s") = default(0s);  // processing time of one frame
-        int bufferSize @unit("B") = default(1MB);  // memory
-        int highWatermark @unit("B") = default(512KB);  // buffer usage threshold to send PAUSE frame
+        int bufferSize @unit("B") = default(1MiB);  // memory
+        int highWatermark @unit("B") = default(512KiB);  // buffer usage threshold to send PAUSE frame
         int pauseUnits = default(300);  // time to put in PAUSE frames (in units of 512 bit times)
         @display("i=block/switch");
     gates:

diff --git a/src/linklayer/etherswitch/MACRelayUnitPP.ned b/src/linklayer/etherswitch/MACRelayUnitPP.ned
@@ -40,8 +40,8 @@ simple MACRelayUnitPP like MACRelayUnit
         int addressTableSize = default(100); // see MACRelayUnit
         double agingTime @unit("s") = default(120s); // see MACRelayUnit
         double processingTime @unit("s") = default(0s);   // processing time of one frame
-        int bufferSize @unit("B") = default(1MB);   // memory
-        int highWatermark @unit("B") = default(512KB); // buffer usage threshold to send PAUSE frame
+        int bufferSize @unit("B") = default(1MiB);   // memory
+        int highWatermark @unit("B") = default(512KiB); // buffer usage threshold to send PAUSE frame
         int pauseUnits = default(300);       // time to put in PAUSE frames (in units of 512 bit times)
         @display("i=block/switch");
     gates:

diff --git a/src/underTest/linklayer/rstp/MACRelayUnitSTPNP.ned b/src/underTest/linklayer/rstp/MACRelayUnitSTPNP.ned
@@ -42,8 +42,8 @@ simple MACRelayUnitSTPNP like MACRelayUnit
         double agingTime @unit("s") = default(300s); // see MACRelayUnit
         int numCPUs = default(1);  // number of CPUs
         double processingTime @unit("s") = default(0s);  // processing time of one frame
-        int bufferSize @unit("B") = default(1MB);  // memory
-        int highWatermark @unit("B") = default(512KB);  // buffer usage threshold to send PAUSE frame
+        int bufferSize @unit("B") = default(1MiB);  // memory
+        int highWatermark @unit("B") = default(512KiB);  // buffer usage threshold to send PAUSE frame
         int pauseUnits = default(300);  // time to put in PAUSE frames (in units of 512 bit times)
 
         // RSTP parameters