X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fresourcemanager.h;h=9dcd9b997a56a25214ea691d27f2f616197ae55f;hp=a2a4975db5185eaf3eadf7348e995f9a0b4ca5b7;hb=f141ae14619bfbd51a7e6871c55edbdd17ac3417;hpb=508319df28270eccdfa03a880a8604549278a139

diff --git a/source/resourcemanager.h b/source/resourcemanager.h
index a2a4975d..9dcd9b99 100644
--- a/source/resourcemanager.h
+++ b/source/resourcemanager.h
@@ -11,11 +11,12 @@
 namespace Msp {
 namespace GL {
 
-class ResourceWatcher;
+class ResourceObserver;
 
 class resource_load_error: public std::runtime_error
 {
 public:
+	resource_load_error(const std::string &, const std::string &);
 	resource_load_error(const std::string &, const std::exception &);
 	virtual ~resource_load_error() throw() { }
 };
@@ -31,6 +32,15 @@ public:
 		LOAD_MANUALLY
 	};
 
+	struct ResourceLocation
+	{
+		DataFile::Collection *collection;
+		std::string name;
+
+		ResourceLocation();
+		ResourceLocation(DataFile::Collection &, const std::string &);
+	};
+
 private:
 	struct ManagedResource
 	{
@@ -45,14 +55,14 @@ private:
 		};
 
 		Resource *resource;
-		DataFile::Collection *collection;
-		std::string name;
+		ResourceLocation location;
+		bool load_priority;
 		IO::Seekable *io;
 		Resource::AsyncLoader *loader;
 		State state;
 		unsigned last_used;
 		UInt64 data_size;
-		std::vector<ResourceWatcher *> watchers;
+		std::vector<ResourceObserver *> observers;
 
 		ManagedResource(Resource &);
 
@@ -62,8 +72,8 @@ private:
 		void finish_loading();
 		void unload();
 
-		void add_watcher(ResourceWatcher &);
-		void remove_watcher(ResourceWatcher &);
+		void add_observer(ResourceObserver &);
+		void remove_observer(ResourceObserver &);
 	};
 
 	typedef std::list<ManagedResource *> LoadQueue;
@@ -78,6 +88,8 @@ private:
 		unsigned capacity;
 		unsigned size;
 		std::list<resource_load_error> error_queue;
+		Mutex data_size_mutex;
+		UInt64 loaded_data_size;
 		volatile bool done;
 
 	public:
@@ -96,6 +108,7 @@ private:
 	public:
 		bool sync();
 		bool needs_work() const { return size<capacity; }
+		UInt64 get_and_reset_loaded_data_size();
 
 		void terminate();
 	};
@@ -104,8 +117,10 @@ private:
 
 	LoadingPolicy policy;
 	bool async_loads;
+	mutable Mutex map_mutex;
 	ResourceMap resources;
 	LoadQueue queue;
+	UInt64 total_data_size;
 	UInt64 size_limit;
 	unsigned frame;
 	unsigned min_retain_frames;
@@ -124,14 +139,25 @@ public:
 	void set_max_retain_frames(unsigned);
 
 	void add_resource(Resource &);
-	void *get_data_for_resource(const Resource &);
+private:
+	const ManagedResource &get_managed_resource(const Resource &) const;
+	ManagedResource &get_managed_resource(const Resource &);
+public:
+	void *get_data_for_resource(const Resource &r) { return &get_managed_resource(r); }
 	void set_resource_location(Resource &, DataFile::Collection &, const std::string &);
+	void set_resource_location(Resource &, const ResourceLocation &);
+	const ResourceLocation *get_resource_location(const Resource &) const;
 	void load_resource(Resource &);
+	bool is_resource_loaded(const Resource &) const;
 	void resource_used(const Resource &);
 	void remove_resource(Resource &);
 
-	void watch_resource(const Resource &, ResourceWatcher &);
-	void unwatch_resource(const Resource &, ResourceWatcher &);
+	void observe_resource(const Resource &, ResourceObserver &);
+	void unobserve_resource(const Resource &, ResourceObserver &);
+
+	// Deprecated names
+	void watch_resource(const Resource &r, ResourceObserver &o) { observe_resource(r, o); }
+	void unwatch_resource(const Resource &r, ResourceObserver &o) { unobserve_resource(r, o); }
 
 	void tick();
 private:
@@ -139,7 +165,7 @@ private:
 	void unload_by_age();
 	void unload_by_size();
 public:
-	UInt64 get_total_data_size() const;
+	UInt64 get_total_data_size() const { return total_data_size; }
 
 private:
 	static bool age_order(ManagedResource *, ManagedResource *);