MCB-0001: [Susana] Fixed random SCH per SCH interval

Author: surodri

vanets/src/Mac16094Metrics.cc

@@ -16,6 +16,7 @@
 
 #include <../../veins/src/veins/modules/phy/DeciderResult80211.h>
 #include <../../veins/src/veins/base/phyLayer/PhyToMacControlInfo.h>
+#include <../../veins/src/veins/modules/utility/Consts80211p.h>
 #include "veins/modules/messages/PhyControlMessage_m.h"
 using namespace std;
 #define DBG_MAC EV
@@ -220,7 +221,19 @@ void Mac16094Metrics::handleUpperMsg(cMessage* message) {
 }
 
 int Mac16094Metrics::randomizeSCH( int min, int max) {
-	return rand()%( max - min + 1) + min;
+
+    srand((unsigned)time(NULL));
+	int randomSCHNumber= rand()%( max - min) + min;
+	int randomSCHEnum = 0;
+	switch (randomSCHNumber) {
+	    case 1: randomSCHEnum = Channels::SCH1; break;
+	    case 2: randomSCHEnum = Channels::SCH2; break;
+	    case 3: randomSCHEnum = Channels::SCH3; break;
+	    case 4: randomSCHEnum = Channels::SCH4; break;
+	    default: throw cRuntimeError("Random Service Channel must be between 1 and 4"); break;
+	}
+
+	return randomSCHEnum;
 }
 
 void Mac16094Metrics::handleSelfMsg(cMessage* message) {
@@ -231,13 +244,15 @@ void Mac16094Metrics::handleSelfMsg(cMessage* message) {
         scheduleAt(simTime() + SWITCHING_INTERVAL_11P, nextChannelSwitch);
 
         mySCH = randomizeSCH(1, 4);
+        std::cout<<"Mac16094Metrics:: mySCH  "<< mySCH << std::endl;
 
         switch (activeChannel) {
         case type_CCH:
             DBG_MAC << "CCH --> SCH" << std::endl;
             channelBusySelf(false);
             setActiveChannel(type_SCH);
             channelIdle(true);
+            std::cout<<"Mac16094Metrics:: frequency[mySCH] " << frequency[mySCH]<<std::endl;
             phy11p->changeListeningFrequency(frequency[mySCH]);
             break;
         case type_SCH:

vanets/src/omnetpp.ini

@@ -583,4 +583,5 @@ description = "CCH & SCH BeaconLength 100Bytes, ServicePacketLength Safety, Queu
 
 *.**.nic.mac1609_4.queueSize = 5
 *.**.nic.mac1609_4.useServiceChannel = true
+*.**.nic.mac1609_4.serviceChannel = 2
 *.manager.launchConfig = xmldoc("northampton/LowDenScenNorthampton.launchd.xml")

veins/src/veins/modules/phy/Decider80211p.cc

@@ -297,6 +297,11 @@ enum Decider80211p::PACKET_OK_RESULT Decider80211p::packetOk(double snirMin, dou
 
 	double rand = RNGCONTEXT dblrand();
 
+	std::cout<<"Decider80211::collectCollisionStats - "<< collectCollisionStats << std::endl;
+	std::cout<<"Decider80211::rand header "<< rand << std::endl;
+	std::cout<<"Decider80211::headerNoError "<< headerNoError << std::endl;
+	std::cout<<"Decider80211::headerNoErrorSnr "<< headerNoErrorSnr << std::endl;
+
 	if (!collectCollisionStats) {
 		if (rand > headerNoError)
 		    notDecoded++;
@@ -305,11 +310,6 @@ enum Decider80211p::PACKET_OK_RESULT Decider80211p::packetOk(double snirMin, dou
 	}
 	else {
 
-	    std::cout<<"headerNoErrorSnrOriginalValue: "<< headerNoErrorSnr<< std::endl;
-	    headerNoErrorSnr = 0 ;
-
-	    std::cout<<"headerNoErrorSnrTestValue: "<< headerNoErrorSnr<< std::endl;
-	    std::cout<<"rand between [0,1]: "<< rand<< std::endl;
 
 		if (rand > headerNoError) {
 			//ups, we have a header error. is that due to interference?
@@ -333,6 +333,10 @@ enum Decider80211p::PACKET_OK_RESULT Decider80211p::packetOk(double snirMin, dou
 
 	rand = RNGCONTEXT dblrand();
 
+	std::cout<<"Decider80211p::rand packet " << rand << std::endl;
+	std::cout<<"Decider80211p::packetOkSinr " << packetOkSinr << std::endl;
+	std::cout<<"Decider80211p::packetOkSnr " << packetOkSnr << std::endl;
+
 	if (!collectCollisionStats) {
 		if (rand > packetOkSinr) {
 		    std::cout<<"packetOk !collectedCollisionsStats notDecoded Packet generated: "<< notDecoded<< std::endl;