From d665c0b94c289f6c34597af3010d6b9b38a08ac4 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 17 May 2016 21:30:40 +0000
Subject: [PATCH] Fixes error occuring when statistics.csv is empty.

---
 python/trisurf/trisurf.py |   27 +++++++++++++++++++--------
 1 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/python/trisurf/trisurf.py b/python/trisurf/trisurf.py
index ac8abaf..e3108b3 100644
--- a/python/trisurf/trisurf.py
+++ b/python/trisurf/trisurf.py
@@ -199,13 +199,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 +330,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

--
Gitblit v1.9.3