From e1b97dcc9d4ad47bf4ceab66466fde2ce895cbe0 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sun, 15 May 2016 16:17:21 +0000
Subject: [PATCH] Added a file paramikoTest.py, an attempt to make remote connection
---
python/trisurf/trisurf.py | 105 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 88 insertions(+), 17 deletions(-)
diff --git a/python/trisurf/trisurf.py b/python/trisurf/trisurf.py
index 34c5ca8..c57de3e 100644
--- a/python/trisurf/trisurf.py
+++ b/python/trisurf/trisurf.py
@@ -12,13 +12,14 @@
import psutil
import time
import datetime
-
+import subprocess
# Process status
TS_NOLOCK=0 # lock file does not exist
TS_NONEXISTANT=0 # process is not in the list of processes
TS_STOPPED=1 # the process is listed, but is in stopped state
TS_RUNNING=2 # process is running
+TS_COMPLETED=3 #simulation is completed
class FileContent:
'''
@@ -142,7 +143,9 @@
'''Method makeifnotexist() creates directory if it does not exist.'''
if(self.exists()==0):
self.make()
- return
+ return True
+ else:
+ return False
def remove(self):
'''Method remove() removes directory recursively. WARNING! No questions asked.'''
@@ -207,7 +210,13 @@
Method read() reads the statistics if it exists. It sets local variable dT storing the time differential between two intervals of simulation (outer loops). It also stores last simulation loop and the start of the run.
'''
if(self.exists()):
+ # epoch1=0
+ # epoch2=0
+ # n1=0
+ # n2=0
nlines=self.mapcount()
+ if nlines<2:
+ return(False)
try:
with open(self.fullname, "r+") as fin:
i=0;
@@ -228,8 +237,10 @@
else:
#print("File "+self.fullname+" does not exists.\n")
return(False)
-
- self.dT=(int(epoch2)-int(epoch1))/(int(n2)-int(n1))
+ try:
+ self.dT=(int(epoch2)-int(epoch1))/(int(n2)-int(n1))
+ except:
+ self.dT=0
self.last=n2
self.startDate=epoch1
return(True)
@@ -246,11 +257,13 @@
'''
Class Runner consists of a single running or terminated instance of the trisurf. It manages starting, stopping, verifying the running process and printing the reports of the configured instances.
'''
- def __init__(self, subdir='run0', tape='', snapshot=''):
+ def __init__(self, subdir='run0', tape=None, snapshot=None, runArgs=[]):
self.subdir=subdir
- if(tape!=''):
+ self.runArgs=runArgs
+ self.fromSnapshot=False
+ if(tape!=None):
self.initFromTape(tape)
- if(snapshot!=''):
+ if(snapshot!=None):
self.initFromSnapshot(snapshot)
return
@@ -258,6 +271,7 @@
def initFromTape(self, tape):
self.tape=Tape()
self.tape.readTape(tape)
+ self.tapeFile=tape
def initFromSnapshot(self, snapshotfile):
try:
@@ -265,16 +279,17 @@
except:
print("Error reading snapshot file")
exit(1)
-
+ self.fromSnapshot=True
+ self.snapshotFile=snapshotfile
root = tree.getroot()
tapetxt=root.find('tape')
version=root.find('trisurfversion')
self.tape=Tape()
self.tape.setTape(tapetxt.text)
-
+
def getPID(self):
self.Dir=Directory(maindir=self.maindir,simdir=self.subdir)
- self.Dir.makeifnotexist()
+ #self.Dir.makeifnotexist()
try:
fp = open(os.path.join(self.Dir.fullpath(),'.lock'))
except IOError as e:
@@ -283,14 +298,33 @@
fp.close()
return int(pid)
+ def getLastIteration(self):
+ self.Dir=Directory(maindir=self.maindir,simdir=self.subdir)
+ #self.Dir.makeifnotexist()
+ try:
+ fp = open(os.path.join(self.Dir.fullpath(),'.status'))
+ except IOError as e:
+ return -1 #file probably does not exist. e==2??
+ status=fp.readline()
+ fp.close()
+ return int(status)
+
+ def isCompleted(self):
+ if (int(self.tape.getValue("iterations"))==self.getLastIteration()+1):
+ return True
+ else:
+ return False
+
def getStatus(self):
pid=self.getPID()
+ if(self.isCompleted()):
+ return TS_COMPLETED
if(pid==0):
return TS_NOLOCK
if(psutil.pid_exists(int(pid))):
proc= psutil.Process(int(pid))
- if proc.name=="trisurf":
- if proc.status=="stopped":
+ if proc.name()=="trisurf":
+ if proc.status()=="stopped":
return TS_STOPPED
else:
return TS_RUNNING
@@ -300,11 +334,46 @@
return TS_NONEXISTANT
def start(self):
- if(self.getStatus()==0):
+ if(self.getStatus()==0 or self.getStatus()==TS_COMPLETED):
self.Dir=Directory(maindir=self.maindir,simdir=self.subdir)
- self.Dir.makeifnotexist()
-# self.Dir.goto()
- print("Starting trisurf-ng executable at "+self.Dir.fullpath()+"\n")
+#Symlinks tape file to the directory or create tape file from snapshot in the direcory...
+ if(self.Dir.makeifnotexist()):
+ if(self.fromSnapshot==False):
+ try:
+ os.symlink(os.path.abspath(self.tapeFile), self.Dir.fullpath()+"/tape")
+ except:
+ print("Error while symlinking "+os.path.abspath(self.tapeFile)+" to "+self.Dir.fullpath()+"/tape")
+ exit(1)
+ else:
+ try:
+ with open (os.path.join(self.Dir.fullpath(),"tape"), "w") as myfile:
+ myfile.write("#This is automatically generated tape file from snapshot\n")
+ myfile.write(str(self.tape))
+ except:
+ print("Error -- cannot make tapefile "+ os.path.join(self.Dir.fullpath(),"tape")+" from the snapshot in the running directory")
+ exit(1)
+ try:
+ os.symlink(os.path.abspath(self.snapshotFile), os.path.join(self.Dir.fullpath(),self.snapshotFile))
+ except:
+ print("Error while symlinking "+os.path.abspath(self.snapshotFile)+" to "+os.path.join(self.Dir.fullpath(),self.snapshotFile))
+
+ #check if the simulation has been completed. in this case notify user and stop executing.
+ if(self.isCompleted() and ("--force-from-tape" not in self.runArgs) and ("--reset-iteration-count" not in self.runArgs)):
+ print("The simulation was completed. Not starting executable at localhost in "+self.Dir.fullpath()+"\n")
+ return
+
+ cwd=Directory(maindir=os.getcwd())
+ self.Dir.goto()
+ print("Starting trisurf-ng executable at localhost in "+self.Dir.fullpath()+"\n")
+ if(self.fromSnapshot==True):
+ params=["trisurf", "--restore-from-vtk",self.snapshotFile]+self.runArgs
+ else:
+ #veify if dump exists. If not it is a first run and shoud be run with --force-from-tape
+ if(os.path.isfile("dump.bin")==False):
+ self.runArgs.append("--force-from-tape")
+ params=["trisurf"]+self.runArgs
+ subprocess.Popen (params, stdout=subprocess.DEVNULL)
+ cwd.goto()
else:
print("Process already running. Not starting\n")
return
@@ -338,11 +407,13 @@
pid=""
elif status==TS_STOPPED:
statustxt="Stopped"
+ elif status==TS_COMPLETED:
+ statustxt="Completed"
else:
statustxt="Running"
if(self.statistics.fileOK):
- report=[time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(int(self.statistics.startDate))),str(datetime.timedelta(microseconds=(int(self.tape.config['iterations'])-int(self.statistics.last))*self.statistics.dT)*1000), statustxt, pid, str(self.Dir.fullpath()), self.Comment.getText()]
+ report=[time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(int(self.statistics.startDate))),str(datetime.timedelta(microseconds=(int(self.tape.config['iterations'])-int(self.statistics.last))*self.statistics.dT)*1000000), statustxt, pid, str(self.Dir.fullpath()), self.Comment.getText()]
else:
report=["N/A","N/A\t",statustxt, pid, str(self.Dir.fullpath()), self.Comment.getText()]
return report
--
Gitblit v1.9.3