X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fresourcemanager.cpp;h=9835adde3e8dd7efffe038f6eeb7f39a7c26101c;hp=52e5866a6aa887ce536d704f528dfbc5051f06cf;hb=bb162b9edd4b8c0e9faeed75da4148f5b9735450;hpb=5ef508ffc324d4f00239555c0566e4c1f2c9c5c4

diff --git a/source/resourcemanager.cpp b/source/resourcemanager.cpp
index 52e5866a..9835adde 100644
--- a/source/resourcemanager.cpp
+++ b/source/resourcemanager.cpp
@@ -24,6 +24,7 @@ resource_load_error::resource_load_error(const string &name, const exception &ex
 ResourceManager::ResourceManager():
 	policy(LOAD_ON_DEMAND),
 	async_loads(true),
+	total_data_size(0),
 	size_limit(0),
 	frame(0),
 	min_retain_frames(30),
@@ -126,6 +127,7 @@ void ResourceManager::load_resource(Resource &r)
 		managed.start_loading();
 		while(!managed.loader->process()) ;
 		managed.finish_loading(true);
+		total_data_size += managed.data_size;
 	}
 }
 
@@ -161,6 +163,9 @@ void ResourceManager::remove_resource(Resource &r)
 	else if(state>ManagedResource::LOAD_QUEUED && state<ManagedResource::LOADED)
 		thread.remove_resource(managed);
 
+	for(vector<ResourceWatcher *>::const_iterator i=managed.watchers.begin(); i!=managed.watchers.end(); ++i)
+		(*i)->resource_removed(r);
+
 	MutexLock lock(map_mutex);
 	remove_existing(resources, &r);
 }
@@ -181,7 +186,10 @@ void ResourceManager::tick()
 
 	bool do_unload = (frame>=next_unload);
 	if(thread.sync())
+	{
+		total_data_size += thread.get_and_reset_loaded_data_size();
 		do_unload = true;
+	}
 
 	if(thread.needs_work() && !queue.empty())
 		dispatch_work();
@@ -231,14 +239,17 @@ void ResourceManager::unload_by_age()
 
 	for(ResourceMap::iterator i=resources.begin(); i!=resources.end(); ++i)
 		if(i->second.state==ManagedResource::LOADED && i->second.last_used<unload_limit)
+		{
 			i->second.unload();
+			total_data_size -= i->second.data_size;
+		}
 }
 
 void ResourceManager::unload_by_size()
 {
 	unsigned unload_limit = frame-min_retain_frames;
 
-	while(get_total_data_size_()>size_limit)
+	while(total_data_size>size_limit)
 	{
 		ManagedResource *best = 0;
 		UInt64 best_impact = 0;
@@ -257,24 +268,10 @@ void ResourceManager::unload_by_size()
 			break;
 
 		best->unload();
+		total_data_size -= best->data_size;
 	}
 }
 
-UInt64 ResourceManager::get_total_data_size_() const
-{
-	UInt64 total = 0;
-	for(ResourceMap::const_iterator i=resources.begin(); i!=resources.end(); ++i)
-		if(i->second.state==ManagedResource::LOADED)
-			total += i->second.data_size;
-	return total;
-}
-
-UInt64 ResourceManager::get_total_data_size() const
-{
-	MutexLock lock(map_mutex);
-	return get_total_data_size_();
-}
-
 bool ResourceManager::age_order(ManagedResource *mr1, ManagedResource *mr2)
 {
 	return mr1->last_used>mr2->last_used;
@@ -381,6 +378,7 @@ ResourceManager::LoadingThread::LoadingThread():
 	sem(1),
 	capacity(2),
 	size(0),
+	loaded_data_size(0),
 	done(false)
 {
 	launch();
@@ -416,13 +414,13 @@ void ResourceManager::LoadingThread::main()
 	}
 }
 
-ResourceManager::ManagedResource *ResourceManager::LoadingThread::front(LoadQueue &queue)
+ResourceManager::ManagedResource *ResourceManager::LoadingThread::front(LoadQueue &que)
 {
 	MutexLock lock(queue_mutex);
-	if(queue.empty())
+	if(que.empty())
 		return 0;
 
-	return queue.front();
+	return que.front();
 }
 
 void ResourceManager::LoadingThread::add_resource(ManagedResource &r)
@@ -449,6 +447,11 @@ void ResourceManager::LoadingThread::remove_resource(ManagedResource &r)
 		Time::sleep(Time::msec);
 
 	r.finish_loading();
+	if(r.state==ManagedResource::LOADED)
+	{
+		MutexLock lock(data_size_mutex);
+		loaded_data_size += r.data_size;
+	}
 }
 
 bool ResourceManager::LoadingThread::try_remove_resource(ManagedResource &r)
@@ -501,6 +504,11 @@ bool ResourceManager::LoadingThread::sync()
 		if(managed->state==ManagedResource::LOAD_ERROR || managed->process(true))
 		{
 			managed->finish_loading();
+			if(managed->state==ManagedResource::LOADED)
+			{
+				MutexLock lock(data_size_mutex);
+				loaded_data_size += managed->data_size;
+			}
 			any_finished = true;
 			--size;
 
@@ -520,6 +528,14 @@ bool ResourceManager::LoadingThread::sync()
 	return any_finished;
 }
 
+UInt64 ResourceManager::LoadingThread::get_and_reset_loaded_data_size()
+{
+	MutexLock lock(data_size_mutex);
+	UInt64 result = loaded_data_size;
+	loaded_data_size = 0;
+	return result;
+}
+
 void ResourceManager::LoadingThread::terminate()
 {
 	done = true;