[haizea-commit] r545 - trunk/src/haizea/resourcemanager

[haizea-commit at mailman.cs.uchicago.edu]

Author: borja
Date: 2008-11-19 18:31:43 -0600 (Wed, 19 Nov 2008)
New Revision: 545

Modified:
   trunk/src/haizea/resourcemanager/configfile.py
Log:
Attributes included in a multiconfig file are now passed along to the individual configuration files.

Modified: trunk/src/haizea/resourcemanager/configfile.py
===================================================================
--- trunk/src/haizea/resourcemanager/configfile.py	2008-11-20 00:30:48 UTC (rev 544)
+++ trunk/src/haizea/resourcemanager/configfile.py	2008-11-20 00:31:43 UTC (rev 545)
@@ -594,8 +594,16 @@
             doc         = """
             Specifies how many seconds will be alloted to
             boot and shutdown of the lease.                
-            """)
+            """),
                   
+     Option(name        = "override-memory",
+            getter      = "override-memory",
+            type        = OPTTYPE_INT,
+            required    = False,
+            default     = constants.NO_MEMORY_OVERRIDE,
+            doc         = """
+            Overrides memory requirements specified in tracefile.
+            """),
     ]
     sections.append(tracefile)
     
@@ -679,7 +687,7 @@
         self.attrs = {}
         if self._options["attributes"] != None:
             self.attrs = {}
-            attrs = self._options["attributes"].split(";")
+            attrs = self._options["attributes"].split(",")
             for attr in attrs:
                 (k,v) = attr.split("=")
                 self.attrs[k] = v
@@ -762,9 +770,11 @@
                     profileconfig.set("general", "datafile", datafile)
                     
                     # Set "attributes" option (only used internally)
-                    attrs = {"profile":profile}
+                    attrs = {"profile":profile,"tracefile":tracefile,"injectfile":injectfile}
                     # TODO: Load additional attributes from trace/injfiles
                     attrs_str = ",".join(["%s=%s" % (k,v) for (k,v) in attrs.items()])
+                    if profileconfig.has_option("general", "attributes"):
+                        attrs_str += ",%s" % profileconfig.get("general", "attributes")
                     profileconfig.set("general", "attributes", attrs_str)
                     
                     try: