Hand merge. Stuff probably doesn't compile.

--HG--
rename : arch/alpha/isa_desc => arch/alpha/isa/main.isa
rename : arch/alpha/alpha_linux_process.cc => arch/alpha/linux/process.cc
rename : arch/alpha/alpha_linux_process.hh => arch/alpha/linux/process.hh
rename : arch/alpha/alpha_tru64_process.cc => arch/alpha/tru64/process.cc
rename : arch/alpha/alpha_tru64_process.hh => arch/alpha/tru64/process.hh
rename : cpu/exec_context.cc => cpu/cpu_exec_context.cc
rename : cpu/exec_context.hh => cpu/cpu_exec_context.hh
extra : convert_revision : 7d1efcedd708815d985a951f6f010fbd83dc27e8

1 files changed, 36 insertions, 7 deletions

diff --git a/util/pbs/jobfile.py b/util/pbs/jobfile.py
index d36b5ee6d..fd19b3bf5 100644
--- a/util/pbs/jobfile.py
+++ b/util/pbs/jobfile.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2005 The Regents of The University of Michigan
+# Copyright (c) 2005-2006 The Regents of The University of Michigan
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -277,10 +277,11 @@ class Option(Data):
             return name
 
         if attr == 'desc':
-            desc = self.__dict__[attr]
-            if self._suboption is not None:
-                desc = '%s, %s' % (desc, self._suboption.desc)
-            return desc
+            desc = [ self.__dict__[attr] ]
+            if self._suboption is not None and self._suboption.desc:
+                desc.append(self._suboption.desc)
+            return ', '.join(desc)
+
 
         return super(Option, self).__getattribute__(attr)
 
@@ -356,6 +357,8 @@ class Configuration(Data):
     def __init__(self, name, desc, **kwargs):
         super(Configuration, self).__init__(name, desc, **kwargs)
         self._groups = []
+        self._posfilters = []
+        self._negfilters = []
 
     def group(self, name, desc, **kwargs):
         grp = Group(name, desc, **kwargs)
@@ -402,13 +405,39 @@ class Configuration(Data):
                 if checkpoint:
                     yield options
 
+    def addfilter(self, filt, pos=True):
+        import re
+        filt = re.compile(filt)
+        if pos:
+            self._posfilters.append(filt)
+        else:
+            self._negfilters.append(filt)
+
+    def jobfilter(self, job):
+        for filt in self._negfilters:
+            if filt.match(job.name):
+                return False
+
+        if not self._posfilters:
+            return True
+
+        for filt in self._posfilters:
+            if filt.match(job.name):
+                return True
+
+        return False
+
     def checkpoints(self, groups = None):
         for options in self.options(groups, True):
-            yield Job(options)
+            job = Job(options)
+            if self.jobfilter(job):
+                yield job
 
     def jobs(self, groups = None):
         for options in self.options(groups, False):
-            yield Job(options)
+            job = Job(options)
+            if self.jobfilter(job):
+                yield job
 
     def alljobs(self, groups = None):
         for options in self.options(groups, True):