From aafd67f2d592799167864698ea07eb8aadcc86a7 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 25 May 2016 18:37:21 +0000
Subject: [PATCH] Merge branch 'master' of bitbucket.org:samop/trisurf-ng with work done on removing the memory leaks.
---
python/trisurf/trisurf.py | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/python/trisurf/trisurf.py b/python/trisurf/trisurf.py
index ac8abaf..8b36d27 100644
--- a/python/trisurf/trisurf.py
+++ b/python/trisurf/trisurf.py
@@ -1,5 +1,3 @@
-#!/usr/bin/python3
-
import configobj
import xml.etree.ElementTree as ET
import base64
@@ -84,6 +82,9 @@
'''
try:
self.config=configobj.ConfigObj(tape)
+ with open (tape, "r") as myfile:
+ self.rawText=myfile.read() #read the file
+
except:
print("Error reading or parsing tape file!\n")
exit(1)
@@ -91,6 +92,7 @@
def setTape(self, string):
'''Method setTape(string) parses the string in memory that hold the tape contents.'''
self.config=configobj.ConfigObj(io.StringIO(string))
+ self.rawText=string
return
def getValue(self,key):
@@ -199,13 +201,18 @@
Internal method for determining the number of the lines in the most efficient way. Is it really the most efficient?
'''
f = open(self.fullname, "r+")
- buf = mmap.mmap(f.fileno(), 0)
- lines = 0
- readline = buf.readline
- while readline():
- lines += 1
+ try:
+ buf = mmap.mmap(f.fileno(), 0)
+ lines = 0
+ readline = buf.readline
+ while readline():
+ lines += 1
+ f.close()
+ except:
+ lines=0
+ f.close()
return lines
-
+
def read(self):
'''
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.
@@ -325,8 +332,14 @@
if(psutil.pid_exists(int(pid))):
proc= psutil.Process(int(pid))
#psutil.__version__ == '3.4.2' requires name() and status(), some older versions reguire name, status
- if proc.name()=="trisurf":
- if proc.status()=="stopped":
+ if(psutil.__version__>='2.0.0'):
+ procname=proc.name()
+ procstat=proc.status()
+ else:
+ procname=proc.name
+ procstat=proc.status
+ if procname=="trisurf":
+ if procstat=="stopped":
return TS_STOPPED
else:
return TS_RUNNING
@@ -353,13 +366,13 @@
else:
try:
with open (os.path.join(self.Dir.fullpath(),"tape"), "w") as myfile:
- myfile.write("#This is automatically generated tape file from snapshot")
- myfile.write(str(self.tape))
+ #myfile.write("#This is automatically generated tape file from snapshot")
+ myfile.write(str(self.tape.rawText))
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))
+ os.symlink(os.path.abspath(self.snapshotFile), os.path.join(self.Dir.fullpath(),"initial_snapshot.vtu"))
except:
print("Error while symlinking "+os.path.abspath(self.snapshotFile)+" to "+os.path.join(self.Dir.fullpath(),self.snapshotFile))
@@ -372,7 +385,7 @@
self.Dir.goto()
print("Starting trisurf-ng executable in "+self.Dir.fullpath())
if(self.fromSnapshot==True):
- params=["trisurf", "--restore-from-vtk",self.snapshotFile]+self.runArgs
+ params=["trisurf", "--restore-from-vtk","initial_snapshot.vtu"]+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):
@@ -384,8 +397,6 @@
print("Process in "+self.Dir.fullpath()+" already running. Not starting.")
return
- def stop(self):
- pass
def setMaindir(self,prefix,variables):
maindir=""
@@ -430,6 +441,11 @@
report=["N/A","N/A",statustxt, pid, str(self.Dir.fullpath()), self.Comment.getText()]
return report
+
+ def stop(self):
+ p=psutil.Process(self.getPID())
+ p.kill()
+
def writeComment(self, data, mode='w'):
self.Dir=Directory(maindir=self.maindir,simdir=self.subdir)
self.Comment=FileContent(os.path.join(self.Dir.fullpath(),".comment"))
--
Gitblit v1.9.3