bbangert / buildbot-xmlrpc / changeset / cdb0c18d5cf2

Up to file-list buildbot/locks.py:

@@ -10,6 +10,16 @@ else:
     debuglog = lambda m: None
 class BaseLock:
     """
     Class handling claiming and releasing of L{self}, and keeping track of
     current and waiting owners.
     @note: Ideally, we'd like to maintain FIFO order. The place to do that
            would be the L{isAvailable()} function. However, this function is
            called by builds/steps both for the first time, and after waking
            them up by L{self} from the L{self.waiting} queue. There is
            currently no way of distinguishing between them.
     """
     description = "<BaseLock>"
     def __init__(self, name, maxCount=1):
@@ -22,10 +32,12 @@ class BaseLock:
         return self.description
     def isAvailable(self):
         """ Return a boolean whether the lock is available for claiming """
         debuglog("%s isAvailable: self.owners=%r" % (self, self.owners))
         return len(self.owners) < self.maxCount
     def claim(self, owner):
         """ Claim the lock (lock must be available) """
         debuglog("%s claim(%s)" % (self, owner))
         assert owner is not None
         assert len(self.owners) < self.maxCount, "ask for isAvailable() first"
@@ -33,6 +45,7 @@ class BaseLock:
         debuglog(" %s is claimed" % (self,))
     def release(self, owner):
         """ Release the lock """
         debuglog("%s release(%s)" % (self, owner))
         assert owner in self.owners
         self.owners.remove(owner)
@@ -90,11 +103,21 @@ class RealSlaveLock:
         return self.locks[slavename]
 class BaseLockId(util.ComparableMixin):
     """ Abstract base class for LockId classes.
     Derived classes should add
     - Comparison with the L{util.ComparableMixin} via the L{compare_attrs}
       class variable.
     - Link to the actual lock class should be added with the L{lockClass}
       class variable.
     """
 # master.cfg should only reference the following MasterLock and SlaveLock
 # classes. They are identifiers that will be turned into real Locks later,
 # via the BotMaster.getLockByID method.
-class MasterLock(util.ComparableMixin):
+class MasterLock(BaseLockId):
     """I am a semaphore that limits the number of simultaneous actions.
     Builds and BuildSteps can declare that they wish to claim me as they run.
@@ -113,7 +136,7 @@ class MasterLock(util.ComparableMixin):
         self.name = name
         self.maxCount = maxCount
-class SlaveLock(util.ComparableMixin):
+class SlaveLock(BaseLockId):
     """I am a semaphore that limits simultaneous actions on each buildslave.
     Builds and BuildSteps can declare that they wish to claim me as they run.

Up to file-list buildbot/master.py:

@@ -27,7 +27,7 @@ from buildbot.changes.changes import Cha
 from buildbot.changes.changes import Change, ChangeMaster
 from buildbot.sourcestamp import SourceStamp
 from buildbot.buildslave import BuildSlave
-from buildbot import interfaces
+from buildbot import interfaces, locks
 from buildbot.process.properties import Properties
 ########################################
@@ -211,6 +211,7 @@ class BotMaster(service.MultiService):
         @param lockid: a locks.MasterLock or locks.SlaveLock instance
         @return: a locks.RealMasterLock or locks.RealSlaveLock instance
         """
         assert isinstance(lockid, (locks.MasterLock, locks.SlaveLock))
         if not lockid in self.locks:
             self.locks[lockid] = lockid.lockClass(lockid)
         # if the master.cfg file has changed maxCount= on the lock, the next
@@ -637,28 +638,28 @@ class BuildMaster(service.MultiService,
         # assert that all locks used by the Builds and their Steps are
         # uniquely named.
-        locks = {}
+        lock_dict = {}
         for b in builders:
             for l in b.get('locks', []):
                 if locks.has_key(l.name):
                     if locks[l.name] is not l:
                 if lock_dict.has_key(l.name):
                     if lock_dict[l.name] is not l:
                         raise ValueError("Two different locks (%s and %s) "
                                          "share the name %s"
-                                         % (l, locks[l.name], l.name))
+                                         % (l, lock_dict[l.name], l.name))
                 else:
-                    locks[l.name] = l
+                    lock_dict[l.name] = l
             # TODO: this will break with any BuildFactory that doesn't use a
             # .steps list, but I think the verification step is more
             # important.
             for s in b['factory'].steps:
                 for l in s[1].get('locks', []):
                     if locks.has_key(l.name):
                         if locks[l.name] is not l:
                     if lock_dict.has_key(l.name):
                         if lock_dict[l.name] is not l:
                             raise ValueError("Two different locks (%s and %s)"
                                              " share the name %s"
-                                             % (l, locks[l.name], l.name))
+                                             % (l, lock_dict[l.name], l.name))
                     else:
-                        locks[l.name] = l
+                        lock_dict[l.name] = l
         if not isinstance(properties, dict):
             raise ValueError("c['properties'] must be a dictionary")

Up to file-list buildbot/util.py:

@@ -71,10 +71,14 @@ class ComparableMixin:
         return hash(tuple(alist))
     def __cmp__(self, them):
         if cmp(type(self), type(them)):
             return cmp(type(self), type(them))
         if cmp(self.__class__, them.__class__):
             return cmp(self.__class__, them.__class__)
         result = cmp(type(self), type(them))
         if result:
             return result
         result = cmp(self.__class__, them.__class__)
         if result:
             return result
         assert self.compare_attrs == them.compare_attrs
         self_list= [getattr(self, name, _None) for name in self.compare_attrs]
         them_list= [getattr(them, name, _None) for name in self.compare_attrs]

Up to file-list docs/buildbot.texinfo:

@@ -5806,7 +5806,7 @@ simultaneous builds as there are machine
 simultaneous builds as there are machines.
 Each @code{Lock} is created with a unique name. Each lock gets a count
-of how many owners it may have: how many processes can claim it at ths
+of how many owners it may have: how many processes can claim it at the
 same time. This limit defaults to one, and is controllable through the
 @code{maxCount} argument. On @code{SlaveLock}s you can set the owner
 count on a per-slave basis by providing a dictionary (that maps from
@@ -5856,9 +5856,9 @@ f.addStep(source.SVN(svnurl="http://exam
 f.addStep(source.SVN(svnurl="http://example.org/svn/Trunk"))
 f.addStep(shell.ShellCommand(command="make all"))
 f.addStep(shell.ShellCommand(command="make test", locks=[db_lock]))
 b1 = @{'name': 'full1', 'slavename': 'bot-1', builddir='f1', 'factory': f@}
 b2 = @{'name': 'full2', 'slavename': 'bot-2', builddir='f2', 'factory': f@}
-b3 = @{'name': 'full3', 'slavename': 'bot-3', builddir='f3', 'factory': f@}
+b1 = @{'name': 'full1', 'slavename': 'bot-1', 'builddir': 'f1', 'factory': f@}
 b2 = @{'name': 'full2', 'slavename': 'bot-2', 'builddir': 'f2', 'factory': f@}
 b3 = @{'name': 'full3', 'slavename': 'bot-3', 'builddir': 'f3', 'factory': f@}
 c['builders'] = [b1, b2, b3]
 @end example
@@ -5885,12 +5885,12 @@ f22 = factory.Trial(source, trialpython=
 f22 = factory.Trial(source, trialpython=["python2.2"])
 f23 = factory.Trial(source, trialpython=["python2.3"])
 f24 = factory.Trial(source, trialpython=["python2.4"])
 b1 = @{'name': 'p22', 'slavename': 'bot-1', builddir='p22', 'factory': f22,
       'locks': [slow_lock] @}
 b2 = @{'name': 'p23', 'slavename': 'bot-1', builddir='p23', 'factory': f23,
       'locks': [slow_lock] @}
 b3 = @{'name': 'p24', 'slavename': 'bot-1', builddir='p24', 'factory': f24,
       'locks': [slow_lock] @}
 b1 = @{'name': 'p22', 'slavename': 'bot-1', 'builddir': 'p22',
       'factory': f22, 'locks': [slow_lock] @}
 b2 = @{'name': 'p23', 'slavename': 'bot-1', 'builddir': 'p23',
       'factory': f23, 'locks': [slow_lock] @}
 b3 = @{'name': 'p24', 'slavename': 'bot-1', 'builddir': 'p24',
       'factory': f24, 'locks': [slow_lock] @}
 c['builders'] = [b1, b2, b3]
 @end example
@@ -5918,13 +5918,13 @@ f.addStep(shell.ShellCommand(command="ma
 f.addStep(shell.ShellCommand(command="make test", locks=[cpu_lock]))
 f.addStep(shell.ShellCommand(command="make db-test", locks=[db_lock, cpu_lock]))
-b1 = @{'name': 'full1', 'slavename': 'bot-slow', builddir='full1',
+b1 = @{'name': 'full1', 'slavename': 'bot-slow', 'builddir': 'full1',
       'factory': f@}
-b2 = @{'name': 'full2', 'slavename': 'bot-slow', builddir='full2',
+b2 = @{'name': 'full2', 'slavename': 'bot-slow', 'builddir': 'full2',
       'factory': f@}
-b3 = @{'name': 'full3', 'slavename': 'bot-fast', builddir='full3',
+b3 = @{'name': 'full3', 'slavename': 'bot-fast', 'builddir': 'full3',
       'factory': f@}
-b4 = @{'name': 'full4', 'slavename': 'bot-fast', builddir='full4',
+b4 = @{'name': 'full4', 'slavename': 'bot-fast', 'builddir': 'full4',
       'factory': f@}
 c['builders'] = [b1, b2, b3, b4]
 @end example
@@ -6899,7 +6899,7 @@ from a future release.
 @example
 from buildbot.status import html
-w = html.Waterfall(http_port=8080)
+w = html.WebStatus(http_port=8080)
 c['status'].append(w)
 @end example

commit 714:	cdb0c18d5cf2
parent 713:	15e18eb06e53
branch:	default

Bitbucket

bbangert / buildbot-xmlrpc