X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fresourcemanager.h;h=afa2c2d073e45b32b25332a91a3be9c7c8568461;hp=a1ff7aee2fc32adda60d12b0a63166c635e81822;hb=cfd4d36c2b6b6095ada3aef8082e5d409a233a21;hpb=d184ad8a88156a5b0cfe926e5aa66fd574556560

diff --git a/source/resourcemanager.h b/source/resourcemanager.h
index a1ff7aee..afa2c2d0 100644
--- a/source/resourcemanager.h
+++ b/source/resourcemanager.h
@@ -13,6 +13,15 @@ namespace GL {
 
 class ResourceWatcher;
 
+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() { }
+};
+
+
 class ResourceManager
 {
 public:
@@ -23,6 +32,15 @@ public:
 		LOAD_MANUALLY
 	};
 
+	struct ResourceLocation
+	{
+		DataFile::Collection *collection;
+		std::string name;
+
+		ResourceLocation();
+		ResourceLocation(DataFile::Collection &, const std::string &);
+	};
+
 private:
 	struct ManagedResource
 	{
@@ -32,12 +50,13 @@ private:
 			LOAD_QUEUED,
 			LOADING,
 			LOAD_FINISHED,
-			LOADED
+			LOADED,
+			LOAD_ERROR
 		};
 
 		Resource *resource;
-		DataFile::Collection *collection;
-		std::string name;
+		ResourceLocation location;
+		bool load_priority;
 		IO::Seekable *io;
 		Resource::AsyncLoader *loader;
 		State state;
@@ -68,6 +87,9 @@ private:
 		LoadQueue sync_queue;
 		unsigned capacity;
 		unsigned size;
+		std::list<resource_load_error> error_queue;
+		Mutex data_size_mutex;
+		UInt64 loaded_data_size;
 		volatile bool done;
 
 	public:
@@ -86,6 +108,7 @@ private:
 	public:
 		bool sync();
 		bool needs_work() const { return size<capacity; }
+		UInt64 get_and_reset_loaded_data_size();
 
 		void terminate();
 	};
@@ -94,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;
@@ -114,9 +139,16 @@ 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 &);
 
@@ -129,7 +161,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 *);