You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by aj...@apache.org on 2004/06/17 04:35:45 UTC
cvs commit: gump/python/gump/core gumprun.py
ajack 2004/06/16 19:35:45
Modified: python/gump/runner Tag: CleanUp demand.py
python/gump/document/xdocs Tag: CleanUp documenter.py
python/gump/core Tag: CleanUp gumprun.py
Log:
Attempt to optimize buildLog creation (since we do it so often).
Revision Changes Path
No revision
No revision
1.3.2.1 +10 -6 gump/python/gump/runner/demand.py
Index: demand.py
===================================================================
RCS file: /home/cvs/gump/python/gump/runner/demand.py,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- demand.py 3 Jun 2004 19:06:13 -0000 1.3
+++ demand.py 17 Jun 2004 02:35:44 -0000 1.3.2.1
@@ -59,8 +59,10 @@
printTopRefs(100,'Before Loop')
+ gumpSet=self.run.getGumpSet()
+
# In order...
- for project in self.run.getGumpSet().getProjectSequence():
+ for project in gumpSet.getProjectSequence():
# Process the module, upon demand
module=project.getModule()
@@ -68,17 +70,19 @@
self.updater.updateModule(module)
module.setUpdated(1) #:TODO: Move this...
self.run.generateEvent(module)
+ gumpSet.setCompletedModule(module)
# Process
self.builder.buildProject(project)
self.run.generateEvent(project)
+ gumpSet.setCompletedProject(project)
# Seems a nice place to peek/clean-up...
- printTopRefs(100,'Before Loop GC')
- invokeGarbageCollection(self.__class__.__name__)
- invokeGarbageCollection(self.__class__.__name__)
- invokeGarbageCollection(self.__class__.__name__)
- printTopRefs(100,'After GC')
+ #printTopRefs(100,'Before Loop GC')
+ #invokeGarbageCollection(self.__class__.__name__)
+ #invokeGarbageCollection(self.__class__.__name__)
+ #invokeGarbageCollection(self.__class__.__name__)
+ #printTopRefs(100,'After GC')
self.finalize()
No revision
No revision
1.9.2.11 +2 -10 gump/python/gump/document/xdocs/documenter.py
Index: documenter.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/xdocs/documenter.py,v
retrieving revision 1.9.2.10
retrieving revision 1.9.2.11
diff -u -r1.9.2.10 -r1.9.2.11
--- documenter.py 16 Jun 2004 23:38:31 -0000 1.9.2.10
+++ documenter.py 17 Jun 2004 02:35:44 -0000 1.9.2.11
@@ -708,8 +708,6 @@
def documentBuildLog(self,realTime=False):
#
- # ----------------------------------------------------------------------
- #
# buildLog.xml -- Modules/Projects in build order
#
spec=self.resolver.getFileSpec(self.workspace, 'buildLog')
@@ -736,10 +734,7 @@
modulesSection=document.createSection('Modules (in update order)')
modulesTable=modulesSection.createTable(['Updated','Name','State','Duration\nin state','Last Modified','Notes'])
mcount=0
- for module in self.gumpSet.getModuleSequence():
- # :TODO: Next line irrelevent?
- if not self.gumpSet.inModuleSequence(module): continue
- if realTime and module.isUnset(): continue
+ for module in self.gumpSet.getCompletedModules():
mcount+=1
@@ -775,10 +770,7 @@
projectsSection=document.createSection('Projects (in build order)')
projectsTable=projectsSection.createTable(['Time','Name','State','Duration\nin state','Last Modified','Notes'])
pcount=0
- for project in self.gumpSet.getProjectSequence():
- # :TODO: Next line irrelevent?
- if not self.gumpSet.inProjectSequence(project): continue
- if realTime and project.isUnset(): continue
+ for project in self.gumpSet.getCompletedProjects():
pcount+=1
No revision
No revision
1.9.2.5 +15 -0 gump/python/gump/core/gumprun.py
Index: gumprun.py
===================================================================
RCS file: /home/cvs/gump/python/gump/core/gumprun.py,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -u -r1.9.2.4 -r1.9.2.5
--- gumprun.py 16 Jun 2004 17:50:40 -0000 1.9.2.4
+++ gumprun.py 17 Jun 2004 02:35:44 -0000 1.9.2.5
@@ -105,6 +105,9 @@
self.repositories=self.getRepositoriesForModuleList(self.moduleSequence)
else:
self.repositories=repositories
+
+ self.completedModules=[]
+ self.completedProjects=[]
self.validate()
@@ -141,6 +144,12 @@
def getModuleSequence(self):
return self.moduleSequence
+
+ def getCompletedModules(self):
+ return self.completedModules
+
+ def setCompletedModule(self,module):
+ self.completedModules.append(module)
def inModuleSequence(self,module):
return module in self.moduleSequence
@@ -160,6 +169,12 @@
def getProjectExpression(self):
return self.projectexpression
+
+ def getCompletedProjects(self):
+ return self.completedProjects
+
+ def setCompletedProject(self,project):
+ self.completedProjects.append(project)
def getProjectSequence(self):
return self.projectSequence
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org