Merge pull request iovisor#299 from iovisor/bblanco_dev

p4: fixed bugs in control-flow generation

src/cc/frontends/p4/compiler/ebpfProgram.py

@@ -483,12 +483,10 @@ def generatePipelineInternal(self, serializer, nodestoadd, nextEntryPoint):
  done = set()
  while len(nodestoadd) > 0:
  todo = nodestoadd.pop()
- if todo is None:
- todo = nextEntryPoint
- if todo is None:
- continue
  if todo in done:
  continue
+ if todo is None:
+ continue
 
  print("Generating ", todo.name)
 
@@ -503,3 +501,6 @@ def generatePipeline(self, serializer):
  for e in self.entryPoints:
  todo.add(e)
  self.generatePipelineInternal(serializer, todo, self.egressEntry)
+ todo = set()
+ todo.add(self.egressEntry)
+ self.generatePipelineInternal(serializer, todo, None)

src/cc/frontends/p4/compiler/ebpfTable.py

@@ -365,6 +365,12 @@ def serializeCode(self, serializer, program, nextNode):
  serializer.newline()
 
  serializer.blockEnd(True)
+ if not "hit" in nextNode:
+ # Catch-all
+ serializer.emitIndent()
+ serializer.appendFormat("goto end;")
+ serializer.newline()
+
  serializer.blockEnd(True)
 
  def runAction(self, serializer, tableName, valueName, program, nextNode):

src/cc/frontends/p4/compiler/topoSorting.py

@@ -86,4 +86,3 @@ def visit(node, topo_sorting, sequence=None):
  return None
 
  return topo_sorting
-