Implement EndPoint.

- Process ids are now 'EndPoint's instead of int. - Implement UdpEndPoint - Update examples - Remove generated .py files from repo - Add --full option to compiler.

Author: sadboy

compiler/__main__.py

@@ -1,34 +1,31 @@
 """Main entry point"""
 
-import sys
+import sys,os
 import time
 if sys.argv[0].endswith("__main__.py"):
- sys.argv[0] = "python -m disalgo"
+ sys.argv[0] = "python -m distalgo"
 
-args = dict()
+RUNTIMEPKG = "runtime"
+RUNTIMEFILES = ["event.py", "udp.py", "sim.py", "util.py"]
 
 def parseArgs(argv):
- if (len(argv) < 2):
- printUsage(argv[0])
- sys.exit(1)
-
- global args
- args['printsource'] = False
- args['optimize'] = False
- args['sourcefile'] = None
- args['run'] = False
- args['full'] = False
- for arg in argv:
- if (arg == "-p"):
- args['printsource'] = True
- elif (arg == "-o"):
- args['optimize'] = True
- elif (arg == "-r"):
- args['run'] = True
- elif (arg == "-F" or arg == "--full"):
- args['full'] = True
- else:
- args['sourcefile'] = arg
+
+ import optparse
+ p = optparse.OptionParser()
+
+ p.add_option("-p", action="store_true", dest='printsource')
+ p.add_option("-F", action="store_true", dest='genfull')
+ p.add_option("--full", action="store_true", dest='genfull')
+ p.add_option("-O", action="store_true", dest='optimize')
+ p.add_option("-D", action="store", dest='rootdir')
+
+ p.set_defaults(printsource=False,
+ genfull=False,
+ optimize=False,
+ rootdir=os.getcwd())
+
+ return p.parse_args()
+
 
 def printUsage(name):
  usage = """
@@ -37,30 +34,51 @@ def printUsage(name):
 """
  sys.stderr.write(usage % name)
 
-import ast
-
-from .dist import DistalgoTransformer
 from .codegen import to_source
 from .compiler import dist_compile
 
 def main():
- parseArgs(sys.argv)
+ opts, args = parseArgs(sys.argv)
+ print("rootdir is %s" % opts.rootdir)
 
  start = time.time()
- infd = open(args['sourcefile'], 'r')
- pytree = dist_compile(infd)
- infd.close()
- elapsed = time.time() - start
+ runtime = []
+ if opts.genfull:
+ for f in RUNTIMEFILES:
+ p = os.path.join(opts.rootdir, RUNTIMEPKG, f)
+ if not os.path.isfile(p):
+ sys.stderr.write("File %s not found. Please specify root directory using -D.\n"%p)
+ sys.exit(1)
+ else:
+ pfd = open(p, "r")
+ runtime.extend(pfd.readlines())
+ pfd.close()
+ postamble = ["\nif __name__ == \"__main__\":\n",
+ " main()\n"]
 
- pysource = to_source(pytree)
+ for f in args:
+ infd = open(f, 'r')
+ pytree = dist_compile(infd)
+ infd.close()
 
- outfile = args['sourcefile'][:-4] + ".py"
- outfd = open(outfile, 'w')
- outfd.write(pysource)
- outfd.close()
+ pysource = to_source(pytree)
 
- print("Total compilation time: %f second(s)." % elapsed)
- sys.exit(0)
+ if opts.printsource:
+ sys.stdout.write(pysource)
+ else:
+ outfile = f[:-4] + ".py"
+ outfd = open(outfile, 'w')
+ if opts.genfull:
+ outfd.writelines(runtime)
+ outfd.write(pysource)
+ if opts.genfull:
+ outfd.writelines(postamble)
+ outfd.close()
+ sys.stderr.write("Written %s.\n"%outfile)
+
+ elapsed = time.time() - start
+ sys.stderr.write("\nTotal compilation time: %f second(s).\n" % elapsed)
+ return 0
 
 if __name__ == '__main__':
  main()

compiler/consts.py

@@ -2,7 +2,7 @@
 SENT_PATTERN_VARNAME = "_sent_patterns"
 EVENT_PATTERN_VARNAME = "_event_patterns"
 LABEL_EVENTS_VARNAME = "_label_events"
-EVENT_PROC_FUNNAME = "_process_event_"
+EVENT_PROC_FUNNAME = "_process_event"
 
 TIMER_VARNAME = "__await_timer_"
 TIMEOUT_VARNAME = "_timeout"

compiler/dist.py

@@ -96,16 +96,15 @@ def genInitFunc(self, inf):
  body = []
  body.append(Call(Attribute(Name(DISTALGO_BASE_CLASSNAME, Load()),
  "__init__", Load()),
- [Name("self", Load()), Name("pid", Load()),
- Name("pipe", Load()), Name("perf_pipe", Load())],
+ [Name("self", Load()), Name("parent", Load()),
+ Name("initq", Load())],
  [], None, None))
  body.append(inf.genEventPatternStmt())
  body.append(inf.genSentPatternStmt())
  body.append(inf.genLabelEventsStmt())
  body.extend(inf.newstmts)
 
- arglist = [arg("self", None), arg("pid", None), arg("pipe", None),
- arg("perf_pipe", None)]
+ arglist = [arg("self", None), arg("parent", None), arg("initq", None)]
  args = arguments(arglist, None, None, [], None,
  None, [], None)
  return FunctionDef("__init__", args, body, [], None)

examples/2pc/2pc.dis

@@ -1,14 +1,12 @@
 from random import randint
 
 class Proposer(DistProcess):
- def setup(nodes, increment):
- ballot = self # Our starting ballot number
+ def setup(nodes):
+ ballot = (0, self) # Our starting ballot number
  value = self
- increment = increment # Increment to ensure unique ballot number
- nodes = nodes # Set of all acceptors
 
  def main():
- retry = 0 
+ retry = 0
  while True:
  --transact_start
  retry += 1
@@ -21,9 +19,9 @@ class Proposer(DistProcess):
  # otherwise abort:
  if (len(received(Agree(ballot, src))) == len(nodes)):
  send(Commit(ballot), nodes)
- output("Committed ballot %d on %dth attempt"%(ballot, retry))
+ output("Committed ballot %r on %dth attempt"%(ballot, retry))
  retry = 0
- ballot += increment
+ ballot = (ballot[0]+1, self)
  break
  else:
  send(Abort(ballot), nodes)
@@ -34,8 +32,8 @@ class Proposer(DistProcess):
 class Acceptor(DistProcess):
  def setup(rate):
  failure_rate = rate
- staging = {}
- localdb = {}
+ staging = dict()
+ localdb = dict()
 
  def main():
  await(False)

examples/2pc/2pc.py

@@ -1,18 +1,16 @@
-from runtime.sim import DistProcess
-
-global DistProcess
-global TIMEOUT
 TIMEOUT = 5
-
 dist_source("2pc.dis")
 
-def config():
+def main():
  nproposers = 5
  nacceptors = 10
- fail_rate = 0
+ fail_rate = 5
+
+ config_endpoint("udp")
 
  accpts = createprocs(Acceptor, nacceptors, [fail_rate])
- propsrs = createprocs(Proposer, nproposers, [accpts, nproposers])
+ propsrs = createprocs(Proposer, nproposers, [accpts])
+ config_max_event_timeout(accpts | propsrs, 3)
 
- config_max_event_timeout(3)
- config_trace(True)
+ startprocs(accpts)
+ startprocs(propsrs)

examples/2pc/2pc.run

@@ -0,0 +1,18 @@
+TIMEOUT = 3
+dist_source("opt.dis")
+
+def main():
+ nproposers = 3
+ nacceptors = 15
+ f = (nacceptors - 1) /3
+
+ acceptors = createprocs(Acceptor, nacceptors)
+ proposers = createprocs(Proposer, nproposers)
+
+ setupprocs(acceptors, [(acceptors|proposers), nacceptors/2+f, f])
+ setupprocs(proposers, [acceptors, nacceptors/2+f, f])
+
+ config_max_event_timeout(acceptors|proposers, 1)
+
+ startprocs(acceptors)
+ startprocs(proposers)

examples/byzpaxos/byzopt.run

@@ -10,18 +10,17 @@ class Proposer(DistProcess):
  propVal = self # Current value to propose
 
  def main():
- --start
  while True:
- --prepare
+ --start
  send(Prepare(propNum, self), acpts)
  await(len(received(Promise(propNum, _vp, _vv, _a)))>maj, TIMEOUT)
  --propose
  if (not _timeout):
  safeval = -1
  props = [(n, v)
  for (n, v, _) in
- received(Promise(propNum, vp,vv, a))
- if len(received(Promise(propNum, n, v, a))) > f]
+ received(Promise(propNum, _n, _v, _a))
+ if len(received(Promise(propNum, n, v, _a))) > f]
  if (len(props) > 0):
  _, safeval = max(props)
  if (safeval >= 0):
@@ -31,7 +30,8 @@ class Proposer(DistProcess):
  await(len(received(TwoAv(propNum, propVal, a))) > maj, TIMEOUT)
  if (not _timeout): # We're done
  --end
- return
+ output("Succeeded proposing %d" % propVal)
+ continue
  --reinit
  output("Failed ballot %d, retrying."%(propNum))
  # Try again with a higher proposal number
@@ -41,9 +41,8 @@ class Proposer(DistProcess):
  return propNum+total_procs
 
 class Acceptor(DistProcess):
- def setup(allprocs, quorumSize, tolerence):
+ def setup(allprocs, tolerence):
  peers = allprocs
- maj = quorumSize
  f = tolerence
 
  def main():
@@ -61,7 +60,7 @@ class Acceptor(DistProcess):
  if (n >= maxpromised() and islegal(n, v) and
  len(sent(TwoAv(n, _v, self))) == 0):
  send(TwoAv(n, v, self), peers)
- output("Sent 2av for %d in ballot %d"%(v, n))
+# output("Sent 2av for %d in ballot %d"%(v, n))
 
  def OnTwoAv(propnum, propval, p):
  pass