X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=soltesz.py;h=83100c45f5aa3ac231404962eeea9fc0f8bbd6d6;hb=2553c872a6bb8833643d284351d45042c1116a40;hp=2714f5fff3583bf0d7d7e5b9c9c3b4eaca7ecf3d;hpb=b9334d048a326519351238d197ca44ecb6a96dfe;p=monitor.git

diff --git a/soltesz.py b/soltesz.py
index 2714f5f..83100c4 100644
--- a/soltesz.py
+++ b/soltesz.py
@@ -1,6 +1,14 @@
 import os
 import sys
 import pickle
+noserial=False
+try:
+	from PHPSerialize import *
+	from PHPUnserialize import *
+except:
+	print >>sys.stderr, "PHPSerial db type not allowed."
+	noserial=True
+
 import inspect
 import shutil
 from config import config
@@ -9,49 +17,70 @@ config = config()
 DEBUG= 0
 PICKLE_PATH="pdb"
 
-def dbLoad(name):
-	return SPickle().load(name)
+def dbLoad(name, type=None):
+	return SPickle().load(name, type)
 
-def dbExists(name):
+def dbExists(name, type=None):
 	#if self.config.debug:
 	#	name = "debug.%s" % name
-	return SPickle().exists(name)
+	return SPickle().exists(name, type)
 
-def dbDump(name, obj=None):
+def dbDump(name, obj=None, type=None):
 	# depth of the dump is 2 now, since we're redirecting to '.dump'
-	return SPickle().dump(name, obj, 2)
+	return SPickle().dump(name, obj, type, 2)
 
-def if_cached_else(cond, name, function):
+def if_cached_else_refresh(cond, refresh, name, function, type=None):
 	s = SPickle()
-	if (cond and s.exists("production.%s" % name)) or \
-	   (cond and config.debug and s.exists("debug.%s" % name)):
-		o = s.load(name)
+	if refresh:
+		if not config.debug and s.exists("production.%s" % name, type):
+			s.remove("production.%s" % name, type)
+		if config.debug and s.exists("debug.%s" % name, type):
+			s.remove("debug.%s" % name, type)
+
+	return if_cached_else(cond, name, function, type)
+
+def if_cached_else(cond, name, function, type=None):
+	s = SPickle()
+	if (cond and s.exists("production.%s" % name, type)) or \
+	   (cond and config.debug and s.exists("debug.%s" % name, type)):
+		o = s.load(name, type)
 	else:
 		o = function()
 		if cond:
-			s.dump(name, o)	# cache the object using 'name'
+			s.dump(name, o, type)	# cache the object using 'name'
+			o = s.load(name, type)
+		# TODO: what if 'o' hasn't been converted...
 	return o
 
 class SPickle:
 	def __init__(self):
-		self.config = config
+		pass
 
-	def if_cached_else(self, cond, name, function):
-		if cond and self.exists("production.%s" % name):
-			o = self.load(name)
+	def if_cached_else(self, cond, name, function, type=None):
+		if cond and self.exists("production.%s" % name, type):
+			o = self.load(name, type)
 		else:
 			o = function()
 			if cond:
-				self.dump(name, o)	# cache the object using 'name'
+				self.dump(name, o, type)	# cache the object using 'name'
 		return o
 
-	def __file(self, name):
-		return "%s/%s.pkl" % (PICKLE_PATH, name)
+	def __file(self, name, type=None):
+		if type == None:
+			return "%s/%s.pkl" % (PICKLE_PATH, name)
+		else:
+			if noserial:
+				raise Exception("No PHPSerializer module available")
+
+			return "%s/%s.phpserial" % (PICKLE_PATH, name)
 		
-	def exists(self, name):
-		return os.path.exists(self.__file(name))
+	def exists(self, name, type=None):
+		return os.path.exists(self.__file(name, type))
+
+	def remove(self, name, type=None):
+		return os.remove(self.__file(name, type))
 
-	def load(self, name):
+	def load(self, name, type=None):
 		""" 
 		In debug mode, we should fail if neither file exists.
 			if the debug file exists, reset name
@@ -61,32 +90,38 @@ class SPickle:
 		Load the file
 		"""
 
-		if self.config.debug:
-			if self.exists("debug.%s" % name):
+		if config.debug:
+			if self.exists("debug.%s" % name, type):
 				name = "debug.%s" % name
-			elif self.exists("production.%s" % name):
+			elif self.exists("production.%s" % name, type):
 				debugname = "debug.%s" % name
-				if not self.exists(debugname):
+				if not self.exists(debugname, type):
 					name = "production.%s" % name
-					shutil.copyfile(self.__file(name), self.__file(debugname))
+					shutil.copyfile(self.__file(name, type), self.__file(debugname, type))
 				name = debugname
 			else:	# neither exist
-				raise Exception, "No such pickle based on %s" % self.__file("debug.%s" % name)
+				raise Exception, "No such pickle based on %s" % self.__file("debug.%s" % name, type)
 		else:
-			if not self.exists("production.%s" % name):
+			if not self.exists("production.%s" % name, type):
 				raise Exception, "No such file %s" % name
 			name = "production.%s" % name
 
-		print "loading %s" % self.__file(name)
-		f = open(self.__file(name), 'r')
-		o = pickle.load(f)
+		print "loading %s" % self.__file(name, type)
+		f = open(self.__file(name, type), 'r')
+		if type == None:
+			o = pickle.load(f)
+		else:
+			if noserial:
+				raise Exception("No PHPSerializer module available")
+			s = PHPUnserialize()
+			o = s.unserialize(f.read())
 		f.close()
 		return o
 			
 	
 	# use the environment to extract the data associated with the local
 	# variable 'name'
-	def dump(self, name, obj=None, depth=1):
+	def dump(self, name, obj=None, type=None, depth=1):
 		if obj == None:
 			o = inspect.getouterframes(inspect.currentframe())
 			up1 = o[depth][0] # get the frame one prior to (up from) this frame
@@ -95,12 +130,18 @@ class SPickle:
 			obj = argvals[3][name] # extract the local variable name 'name'
 		if not os.path.isdir("%s/" % PICKLE_PATH):
 			os.mkdir("%s" % PICKLE_PATH)
-		if self.config.debug:
+		if config.debug:
 			name = "debug.%s" % name
 		else:
 			name = "production.%s" % name
-		f = open(self.__file(name), 'w')
-		pickle.dump(obj, f)
+		f = open(self.__file(name, type), 'w')
+		if type == None:
+			pickle.dump(obj, f)
+		else:
+			if noserial:
+				raise Exception("No PHPSerializer module available")
+			s = PHPSerialize()
+			f.write(s.serialize(obj))
 		f.close()
 		return
 
@@ -123,7 +164,7 @@ class CMD:
 			# Reached a timeout!
 			print "TODO: kill subprocess: '%s'" % cmd
 			# TODO: kill subprocess??
-			return ("", "TIMEOUT")
+			return ("", "SCRIPTTIMEOUT")
 		o_value = f_out.read()
 		e_value = ""
 		if o_value == "":	# An error has occured