From f8158551346cd2f26f3ac48ce17bbb764ab747b5 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 15 Mar 2016 16:51:26 +0000
Subject: [PATCH] Working on formatiing the status
---
python/trisurf/trisurf.py | 24 +++++++++++++++++-------
python/tsmgr | 7 ++++---
2 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/python/trisurf/trisurf.py b/python/trisurf/trisurf.py
index 82c5c15..2d67a74 100644
--- a/python/trisurf/trisurf.py
+++ b/python/trisurf/trisurf.py
@@ -10,6 +10,9 @@
import mmap
import shlex
import psutil
+import time
+import datetime
+
'''
This is a trisurf instance manager written in python
@@ -102,11 +105,8 @@
self.path=path
self.filename=filename
self.fullname=os.path.join(path,filename)
- self.read()
+ self.fileOK=self.read()
return
-
- def __str__(self):
- return(str(self.fullname))
def exists(self):
if(os.path.isfile(self.fullname)):
@@ -141,14 +141,20 @@
n2=fields[1]
i=i+1
except:
- print("Cannot read statistics file in "+self.fullname+"\n")
+ #print("Cannot read statistics file in "+self.fullname+"\n")
return(False)
else:
- print("File "+self.fullname+" does not exists.\n")
+ #print("File "+self.fullname+" does not exists.\n")
return(False)
self.dT=(int(epoch2)-int(epoch1))/(int(n2)-int(n1))
+ self.last=n2
+ self.startDate=epoch1
return(True)
+
+ def __str__(self):
+ return(str(self.fullname))
+
class Runner:
@@ -227,7 +233,11 @@
def getStatistics(self, statfile="statistics.csv"):
self.Dir=Directory(maindir=self.maindir,simdir=self.subdir)
self.statistics=Statistics(self.Dir.fullpath(), statfile)
- return
+ if(self.statistics.fileOK):
+ report=time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(int(self.statistics.startDate)))+"\t"+str(datetime.timedelta(microseconds=(int(self.tape.config['iterations'])-int(self.statistics.last))*self.statistics.dT)*1000)+" ETA\t"+"STATUS"
+ else:
+ report="N/A\tN/A\t"+"STATUS"
+ return report
def __str__(self):
if(self.getStatus()==0):
diff --git a/python/tsmgr b/python/tsmgr
index ac4f1cb..52e3fdc 100755
--- a/python/tsmgr
+++ b/python/tsmgr
@@ -32,9 +32,10 @@
run.start()
elif opt == '-s':
for run in Runs:
- run.getStatistics()
- print(run)
- print(run.statistics)
+ reportstr=run.getStatistics()
+ print(reportstr)
+ #print(run)
+ #print(run.statistics)
else:
print('tsmgr [-h] [-r] [-s]')
sys.exit(2)
--
Gitblit v1.9.3