.

wcfs/testprog/treegen.py

@@ -157,6 +157,7 @@ def Trees(zstor, r):
     xprint("start @%s root=%s" % (ashex(head), ashex(ztree._p_oid)))
     treetxtPrev = zctx.ztreetxt(ztree)
 
+    # XXX dup wrt AllStructsSrv
     while 1:
         treetxt = r.readline()
         if treetxt == '':
@@ -273,6 +274,18 @@ def AllStructs(zstor, kv1txt, kv2txt, n, seed=None):
         emit(delta, verify, tstruct)
 """
 
+# XXX
+@func
+def AllStructsSrv(r):
+    # XXX dup wrt Trees
+    while 1:
+        req = r.readline()
+        if req == '':
+            break # EOF
+        req = req.rstrip()  # trim trailing \n
+        if req.startswith('#'):
+            continue # skip comments
+
 # AllStructs generates topologies for subset of all possible tree changes in
 # between kv1 and kv2. See top-level documentation for details.
 @func
@@ -459,6 +472,13 @@ def cmd_allstructs(argv):
     seed = os.environ.get("treegen_SEED")
     AllStructs(kv1, kv2, maxdepth, maxsplit, n, seed)
 
+@func
+def cmd_allstructs_srv(argv):
+    if len(argv) != 1:
+        print("Usage: cat requests |treegen allstructs.srv", file=sys.stderr)
+        sys.exit(1)
+    AllStructsSrv(sys.stdin)
+
 @func
 def cmd_trees(argv):
     if len(argv) != 1:
@@ -478,8 +498,9 @@ def xprint(msg):
 
 
 cmdRegistry = {
-    'allstructs':   cmd_allstructs,
-    'trees':        cmd_trees,
+    'allstructs':       cmd_allstructs,
+    'allstructs_srv':   cmd_allstructs_srv,
+    'trees':            cmd_trees,
 }
 
 def main():