Added another variable called actualStats (HashMap) which gets the values from flowStats and will be passed as the statsReply to solve the problem of clearing of the map-flowStats and the flag is set as sent by the switch

Author: Sumanth Sathyanarayana

src/org/flowvisor/classifier/FVClassifier.java

@@ -76,6 +76,7 @@
 import org.openflow.protocol.OFMessage;
 import org.openflow.protocol.OFPhysicalPort;
 import org.openflow.protocol.OFPort;
+import org.openflow.protocol.OFStatisticsReply.OFStatisticsReplyFlags;
 import org.openflow.protocol.OFType;
 import org.openflow.protocol.OFError.OFHelloFailedCode;
 import org.openflow.protocol.action.OFAction;
@@ -127,6 +128,8 @@ public class FVClassifier implements FVEventHandler, FVSendMsg, FlowMapChangedLi
 	private boolean statsWindowOpen = true;
 	private HashMap<String, ArrayList<FVFlowStatisticsReply>> flowStats = 
 			new HashMap<String, ArrayList<FVFlowStatisticsReply>>();
+	private HashMap<String, ArrayList<FVFlowStatisticsReply>> actualStats = 
+			new HashMap<String, ArrayList<FVFlowStatisticsReply>>();
 	private ConcurrentLinkedQueue<String> toDeleteSlices = new ConcurrentLinkedQueue<String>();
 
 	// OFPP_FLOOD
@@ -984,8 +987,9 @@ public boolean isRateLimited(String sliceName) {
 
 	private synchronized ArrayList<FVFlowStatisticsReply> getFlowStats(String sliceName) {
 		ArrayList<FVFlowStatisticsReply> stats = new ArrayList<FVFlowStatisticsReply>();
-		if (flowStats.get(sliceName) != null)
-			stats.addAll(flowStats.get(sliceName));
+		if (actualStats.get(sliceName) != null)
+			stats.addAll(actualStats.get(sliceName));
+		FVLog.log(LogLevel.DEBUG, null, actualStats.toString());
 		return stats;
 	}
 
@@ -1045,7 +1049,7 @@ private boolean matchContainsPort(FVFlowStatisticsReply reply, short outPort) {
 		return false;
 	}
 
-	public void sendFlowStatsResp(FVSlicer fvSlicer, FVStatisticsRequest original) {
+	public void sendFlowStatsResp(FVSlicer fvSlicer, FVStatisticsRequest original, short flag) {
 		FVFlowStatisticsRequest orig = (FVFlowStatisticsRequest) original.getStatistics().get(0);
 
 
@@ -1069,7 +1073,7 @@ public void sendFlowStatsResp(FVSlicer fvSlicer, FVStatisticsRequest original) {
 
 		}
 		statsReply.setStatistics(stats);
-			
+		statsReply.setFlags(flag);	
 		statsReply.setXid(original.getXid());
 
 		statsReply.setVersion(original.getVersion());
@@ -1084,8 +1088,7 @@ public void sendFlowStatsResp(FVSlicer fvSlicer, FVStatisticsRequest original) {
 
 
 	public synchronized void classifyFlowStats(FVStatisticsReply fvStatisticsReply) {
-		
-		flowStats.clear();
+		actualStats.clear();
 		List<OFStatistics> stats = fvStatisticsReply.getStatistics();
 		for (OFStatistics s : stats) {
 			FVFlowStatisticsReply stat = (FVFlowStatisticsReply) s;
@@ -1098,6 +1101,11 @@ public synchronized void classifyFlowStats(FVStatisticsReply fvStatisticsReply)
 			stat.setCookie(pair.getCookie());
 			addToFlowStats(stat, pair.getSliceName());
 		}
+		actualStats.putAll(flowStats);
+		FVLog.log(LogLevel.DEBUG, this, " actualStats: ",actualStats.toString(), "flowStats: ", flowStats.toString()); 
+		if ((fvStatisticsReply.getFlags() != OFStatisticsReplyFlags.REPLY_MORE.getTypeValue()) ){
+			flowStats.clear();
+		}
 		for (String slice : toDeleteSlices) {
 			cleanUpFlowMods(slice);
 		}

src/org/flowvisor/message/statistics/FVFlowStatisticsReply.java

@@ -8,6 +8,7 @@
 import org.flowvisor.message.FVStatisticsReply;
 import org.flowvisor.message.FVStatisticsRequest;
 import org.flowvisor.slicer.FVSlicer;
+import org.openflow.protocol.OFStatisticsReply.OFStatisticsReplyFlags;
 import org.openflow.protocol.statistics.OFFlowStatisticsReply;
 import org.openflow.protocol.statistics.OFStatisticsType;
 
@@ -33,10 +34,14 @@ public void classifyFromSwitch(FVStatisticsReply msg, FVClassifier fvClassifier)
 			return;
 		}
 		FVStatisticsRequest original = (FVStatisticsRequest) pair.getOFMessage();
-		if (original.getStatisticType() == OFStatisticsType.FLOW)
-			fvClassifier.sendFlowStatsResp(pair.getSlicer(), original);
-		else if (original.getStatisticType() == OFStatisticsType.AGGREGATE)
-			fvClassifier.sendAggStatsResp(pair.getSlicer(), original);
+		
+		if(msg.getFlags() != OFStatisticsReplyFlags.REPLY_MORE.getTypeValue()){
+			if (original.getStatisticType() == OFStatisticsType.FLOW)
+				fvClassifier.sendFlowStatsResp(pair.getSlicer(), original, msg.getFlags());
+				//fvClassifier.sendFlowStatsResp(pair.getSlicer(), original);
+			else if (original.getStatisticType() == OFStatisticsType.AGGREGATE)
+				fvClassifier.sendAggStatsResp(pair.getSlicer(), original);
+		}	
 	}
 
 

src/org/flowvisor/message/statistics/FVFlowStatisticsRequest.java

@@ -26,7 +26,7 @@ public void sliceFromController(FVStatisticsRequest msg, FVClassifier fvClassifi
 			FVSlicer fvSlicer) {
 		FVMessageUtil.translateXidMsg(msg,fvClassifier, fvSlicer);
 		if (!fvClassifier.pollFlowTableStats(msg))
-			fvClassifier.sendFlowStatsResp(fvSlicer, msg);
+			fvClassifier.sendFlowStatsResp(fvSlicer, msg, (short)0);
 
 	}