Added indirection level to internally used types to allow others to exchange them with their own implementations.

Author: Byron

smmap/mman.py

@@ -29,6 +29,11 @@ class MemoryCursor(object):
 					'_size'		# maximum size we should provide
 				)
 
+	#{ Configuration
+	MemoryWindowCls = MemoryWindow
+	MappedRegionCls = MappedRegion
+	#} END configuration
+	
 	def __init__(self, manager = None, regions = None):
 		self._manager = manager
 		self._rlist = regions
@@ -129,9 +134,9 @@ def use_region(self, offset, size, flags = 0, _is_recursive=False):
 			#END while bisecting
 
 			if existing_region is None:
-				left = MemoryWindow(0, 0)
-				mid = MemoryWindow(offset, size)
-				right = MemoryWindow(self.file_size(), 0)
+				left = self.MemoryWindowCls(0, 0)
+				mid = self.MemoryWindowCls(offset, size)
+				right = self.MemoryWindowCls(self.file_size(), 0)
 
 				# we want to honor the max memory size, and assure we have anough
 				# memory available
@@ -162,13 +167,13 @@ def use_region(self, offset, size, flags = 0, _is_recursive=False):
 				# possible mapping
 				if insert_pos == 0:
 					if len_regions:
-						right = MemoryWindow.from_region(a[insert_pos])
+						right = self.MemoryWindowCls.from_region(a[insert_pos])
 					#END adjust right side 
 				else:
 					if insert_pos != len_regions:
-						right = MemoryWindow.from_region(a[insert_pos])
+						right = self.MemoryWindowCls.from_region(a[insert_pos])
 					# END adjust right window
-					left = MemoryWindow.from_region(a[insert_pos - 1])
+					left = self.MemoryWindowCls.from_region(a[insert_pos - 1])
 				#END adjust surrounding windows
 
 				mid.extend_left_to(left, window_size)
@@ -185,7 +190,7 @@ def use_region(self, offset, size, flags = 0, _is_recursive=False):
 					if man._handle_count >= man._max_handle_count:
 						raise Exception
 					#END assert own imposed max file handles
-					self._region = MappedRegion(a.path(), mid.ofs, mid.size, flags)
+					self._region = self.MappedRegionCls(a.path(), mid.ofs, mid.size, flags)
 				except Exception:
 					# apparently we are out of system resources or hit a limit
 					# As many more operations are likely to fail in that condition (
@@ -302,6 +307,10 @@ class MappedMemoryManager(object):
 					'_handle_count',		# amount of currently allocated file handles
 				]
 
+	#{ Configuration
+	MappedRegionListCls = MappedRegionList
+	#} END configuration
+				
 	_MB_in_bytes = 1024 * 1024
 
 	def __init__(self, window_size = 0, max_memory_size = 0, max_open_handles = sys.maxint):
@@ -378,7 +387,7 @@ def make_cursor(self, path):
 		""":return: a cursor pointing to the given path. It can be used to map new regions of the file into memory"""
 		regions = self._fdict.get(path)
 		if regions is None:
-			regions = MappedRegionList(path)
+			regions = self.MappedRegionListCls(path)
 			self._fdict[path] = regions
 		# END obtain region for path
 		return MemoryCursor(self, regions)

smmap/test/test_buf.py

@@ -62,7 +62,7 @@ def test_basics(self):
 		# exagerate the manager's overhead, but measure the buffer overhead
 		# We do it once with an optimal setting, and with a worse manager which 
 		# will produce small mappings only !
-		max_num_accesses = 1000
+		max_num_accesses = 400
 		for manager, man_id in ( (man_optimal, 'optimal'), 
 								(man_worst_case, 'worst case')):
 			buf = MappedMemoryBuffer(manager.make_cursor(fc.path))