ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/CRAB/python/fillCrabFjr.py

Comparing COMP/CRAB/python/fillCrabFjr.py (file contents):
Revision 1.3 by farinafa, Wed Jun 4 17:45:52 2008 UTC vs.
Revision 1.5 by farinafa, Wed Jun 18 08:32:02 2008 UTC

#	Line 13 | Line 13 | import popen2
13		from ProdCommon.FwkJobRep.ReportParser import readJobReport
14		from ProdCommon.FwkJobRep.FwkJobReport import FwkJobReport
15
16	+	from ProdCommon.FwkJobRep.PerformanceReport import PerformanceReport
17	+
18		class fjrParser:
19		def __init__(self, argv):
20		try:
#	Line 33 | Line 35 | class fjrParser:
35		self.wrapperTime = 'NULL'
36		self.exeTime = 'NULL'
37		self.stageoutTime = 'NULL'
38	+	self.cpuTime = 'NULL'
39		try:
40		self.wrapperTime = argv[3]
41		self.exeTime = argv[4]
42		self.stageoutTime = argv[5]
43	+	# pay attenition that the input env var is actually a string of 3 attrutes # Fabio
44	+	self.cpuTime = "%s %s %s"%(argv[6], argv[7], argv[8])
45		except:
46		pass
47		else:
#	Line 119 | Line 124 | class fjrParser:
124		jobReport.write(self.reportFileName)
125
126		elif valid == 1 and self.directive=='--timing':
127	+	jobReport = readJobReport(self.reportFileName)[0]
128		# add here timing settings
129	<	jobReport.performance.addSummary("ExeTime", self.exeTime)
130	<	jobReport.performance.addSummary("WrapperTime", self.wrapperTime)
131	<	jobReport.performance.addSummary("StageoutTime", self.stageoutTime)
129	>	perf = jobReport.performance
130	>	perf.addSummary("CrabTiming",  WrapperTime = self.wrapperTime, ExeTime = self.exeTime,\
131	>	StageoutTime = self.stageoutTime, CpuTime = self.cpuTime)
132	>	jobReport.write(self.reportFileName)
133		pass
134		else:
135		self.writeFJR()

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines