X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fresourcemanager.h;h=a1ff7aee2fc32adda60d12b0a63166c635e81822;hb=b152e4f63170e8ccd6c9fb9397964c628fb6efeb;hp=f5ccac3bbf9a212eefe8611a865bb25a059737b2;hpb=3c09b67afba6d560eab5817016a98268e1544bc4;p=libs%2Fgl.git

diff --git a/source/resourcemanager.h b/source/resourcemanager.h
index f5ccac3b..a1ff7aee 100644
--- a/source/resourcemanager.h
+++ b/source/resourcemanager.h
@@ -26,12 +26,21 @@ public:
 private:
 	struct ManagedResource
 	{
+		enum State
+		{
+			NOT_LOADED,
+			LOAD_QUEUED,
+			LOADING,
+			LOAD_FINISHED,
+			LOADED
+		};
+
 		Resource *resource;
 		DataFile::Collection *collection;
 		std::string name;
 		IO::Seekable *io;
 		Resource::AsyncLoader *loader;
-		bool loaded;
+		State state;
 		unsigned last_used;
 		UInt64 data_size;
 		std::vector<ResourceWatcher *> watchers;
@@ -39,6 +48,8 @@ private:
 		ManagedResource(Resource &);
 
 		void start_loading();
+		bool process(bool);
+		void finish_loading(bool);
 		void finish_loading();
 		void unload();
 
@@ -46,41 +57,40 @@ private:
 		void remove_watcher(ResourceWatcher &);
 	};
 
+	typedef std::list<ManagedResource *> LoadQueue;
+
 	class LoadingThread: public Thread
 	{
-	public:
-		enum State
-		{
-			IDLE,
-			SYNC_PENDING,
-			BUSY,
-			LOAD_FINISHED,
-			TERMINATING
-		};
-
 	private:
-		ResourceManager &manager;
 		Semaphore sem;
-		ManagedResource *volatile resource;
-		volatile State state;
+		Mutex queue_mutex;
+		LoadQueue async_queue;
+		LoadQueue sync_queue;
+		unsigned capacity;
+		unsigned size;
+		volatile bool done;
 
 	public:
-		LoadingThread(ResourceManager &);
+		LoadingThread();
 
 	private:
 		virtual void main();
 
+		ManagedResource *front(LoadQueue &);
+
+	public:
+		void add_resource(ManagedResource &);
+		void remove_resource(ManagedResource &);
+	private:
+		bool try_remove_resource(ManagedResource &);
 	public:
-		void set_resource(ManagedResource *);
-		ManagedResource *get_resource() const { return resource; }
-		void sync();
-		State get_state() const { return state; }
+		bool sync();
+		bool needs_work() const { return size<capacity; }
 
 		void terminate();
 	};
 
 	typedef std::map<const Resource *, ManagedResource> ResourceMap;
-	typedef std::list<ManagedResource *> LoadQueue;
 
 	LoadingPolicy policy;
 	bool async_loads;
@@ -114,7 +124,15 @@ public:
 	void unwatch_resource(const Resource &, ResourceWatcher &);
 
 	void tick();
+private:
+	void dispatch_work();
+	void unload_by_age();
+	void unload_by_size();
+public:
 	UInt64 get_total_data_size() const;
+
+private:
+	static bool age_order(ManagedResource *, ManagedResource *);
 };
 
 } // namespace GL