Changeset ec9962b

Timestamp:

May 17, 2010 2:34:04 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

c7a982b

Parents:

b14b495

Message:

Make it simpler to specify multiple files on the command line.

File:

• fedd/compose.py (modified) (5 diffs)

fedd/compose.py

@@ -6 +6 @@
 import random
 
-from optparse import OptionParser
+from optparse import OptionParser, OptionValueError
 from federation.remote_service import service_caller
 from federation import topdl
@@ -231 +231 @@
     top.incorporate_elements()
 
+def import_tcl_constraints(marks, provides, accepts, contents):
+    """
+    Contents is a list containing the lines of an annotated ns2 file.  This
+    routine extracts the constraint comment lines and convertes them into
+    constraints in the namespace of the tcl experiment, as well as inserting
+    them in the accepts and provides indices.
+    """
+    for l in contents:
+        m = const_re.search(l)
+        if m:
+            add_to_map(re.sub('\s', '', m.group(1)), marks, provides, 
+                    accepts)
+
+
+def multi_callback(option, opt_str, value, parser):
+    """
+    Parse a --multifile command line option.  The parameter is of the form
+    filename,count.  This splits the argument at the rightmost comma and
+    inserts the filename, count tuple into the "files" option.  It handles a
+    couple error cases, too.  This is an optparse.OptionParser callback.
+    """
+    idx = value.rfind(',')
+    if idx != -1:
+        try:
+            parser.values.files.append((value[0:idx], int(value[idx+1:])))
+        except ValueError, e:
+            raise OptionValueError("Can't convert %s to int in multifile (%s)" \
+                    % (value[idx+1:], value))
+    else:
+        raise OptionValueError("Bad format (need a comma) for multifile: %s" \
+                % value)
+
+
 
 # Main line begins
@@ -243 +276 @@
 parser.add_option('--seed', dest='seed', type='int', default=None,
         help='Random number seed')
+parser.add_option('--multifile', dest='files', default=[], type='string', 
+        action='callback', callback=multi_callback, 
+        help="Include file multiple times")
 
 opts, args = parser.parse_args()
-
 
 if opts.cert:
@@ -256 +291 @@
 random.seed(opts.seed)
 
+files = opts.files
+files.extend([ (a, 1) for a in args])
+
 comps = [ ]
 names = set()
@@ -261 +299 @@
 provides = { }
 accepts = { }
-for fn in args:
+for fn, cnt in files:
     marks = { }
-    contents = ""
     try:
         f = open(fn, "r")
-        for l in f:
-            contents += l
-            m = const_re.search(l)
-            if m:
-                add_to_map(re.sub('\s', '', m.group(1)), marks, provides, 
-                        accepts)
+        contents = [ l for l in f ]
     except EnvironmentError, e:
         print >>sys.stderr, "Error on %s: %s" % (fn, e)
         continue
 
-    top = remote_ns2topdl(opts.url, contents, cert)
+    top = remote_ns2topdl(opts.url, "".join(contents), cert)
     if not top:
         sys.exit("Cannot create topology from: %s" % fn)
-    add_interfaces(top, marks)
-    localize_names(top, names, marks)
-    top.incorporate_elements()
-    constraints.extend(marks.values())
-    comps.append(top)
+
+    for i in range(0, cnt):
+        t = top.clone()
+        import_tcl_constraints(marks, provides, accepts, contents)
+        add_interfaces(t, marks)
+        localize_names(t, names, marks)
+        t.incorporate_elements()
+        constraints.extend(marks.values())
+        comps.append(t)
 
 # Let the user know if they messed up on specifying constraints.