+#include <algorithm>
#include <msp/time/utils.h>
#include "resourcemanager.h"
+#include "resourcewatcher.h"
using namespace std;
{
thread.terminate();
- for(ResourceMap::iterator i=resources.begin(); i!=resources.end(); ++i)
- i->second.resource->set_manager(0);
+ while(!resources.empty())
+ resources.begin()->second.resource->set_manager(0);
}
void ResourceManager::set_loading_policy(LoadingPolicy p)
if(!managed.collection)
throw runtime_error("no location");
- if(managed.loader)
+ if(managed.state!=ManagedResource::NOT_LOADED)
return;
- managed.start_loading();
-
if(async_loads)
+ {
+ managed.state = ManagedResource::LOAD_QUEUED;
queue.push_back(&managed);
+ }
else
{
+ managed.start_loading();
while(!managed.loader->process()) ;
managed.finish_loading();
}
void ResourceManager::resource_used(const Resource &r)
{
ManagedResource *managed = reinterpret_cast<ManagedResource *>(r.get_manager_data());
- if(!managed->loaded && !managed->loader && policy!=LOAD_MANUALLY)
+ if(managed->state==ManagedResource::NOT_LOADED && policy!=LOAD_MANUALLY)
load_resource(*managed->resource);
managed->last_used = frame;
remove_existing(resources, &r);
}
+void ResourceManager::watch_resource(const Resource &r, ResourceWatcher &w)
+{
+ get_item(resources, &r).add_watcher(w);
+}
+
+void ResourceManager::unwatch_resource(const Resource &r, ResourceWatcher &w)
+{
+ get_item(resources, &r).remove_watcher(w);
+}
+
void ResourceManager::tick()
{
LoadingThread::State thread_state = thread.get_state();
next_unload = 0;
for(ResourceMap::iterator i=resources.begin(); i!=resources.end(); ++i)
- if(i->second.loaded)
+ if(i->second.state==ManagedResource::LOADED)
{
if(i->second.last_used<=unload_limit)
i->second.unload();
ManagedResource *best = 0;
UInt64 best_impact = 0;
for(ResourceMap::iterator i=resources.begin(); i!=resources.end(); ++i)
- if(i->second.loaded && i->second.last_used<unload_limit)
+ if(i->second.state==ManagedResource::LOADED && i->second.last_used<unload_limit)
{
UInt64 impact = i->second.data_size*(frame-i->second.last_used);
if(!best || impact>best_impact)
{
UInt64 total = 0;
for(ResourceMap::const_iterator i=resources.begin(); i!=resources.end(); ++i)
- if(i->second.loaded)
+ if(i->second.state==ManagedResource::LOADED)
total += i->second.data_size;
return total;
}
collection(0),
io(0),
loader(0),
- loaded(false),
+ state(NOT_LOADED),
last_used(0),
data_size(0)
{ }
io = 0;
throw logic_error("no loader created");
}
+ state = LOADING;
}
void ResourceManager::ManagedResource::finish_loading()
{
delete loader;
loader = 0;
- loaded = true;
+ state = LOADED;
delete io;
io = 0;
data_size = resource->get_data_size();
+
+ for(vector<ResourceWatcher *>::const_iterator i=watchers.begin(); i!=watchers.end(); ++i)
+ (*i)->resource_loaded(*resource);
}
void ResourceManager::ManagedResource::unload()
{
resource->unload();
- loaded = false;
+ state = NOT_LOADED;
+
+ for(vector<ResourceWatcher *>::const_iterator i=watchers.begin(); i!=watchers.end(); ++i)
+ (*i)->resource_unloaded(*resource);
+}
+
+void ResourceManager::ManagedResource::add_watcher(ResourceWatcher &w)
+{
+ if(find(watchers.begin(), watchers.end(), &w)==watchers.end())
+ watchers.push_back(&w);
+}
+
+void ResourceManager::ManagedResource::remove_watcher(ResourceWatcher &w)
+{
+ vector<ResourceWatcher *>::iterator end = remove(watchers.begin(), watchers.end(), &w);
+ if(end!=watchers.end())
+ watchers.erase(end, watchers.end());
}
}
resource = r;
- state = BUSY;
- sem.signal();
+ if(resource)
+ {
+ resource->start_loading();
+ state = BUSY;
+ sem.signal();
+ }
}
void ResourceManager::LoadingThread::sync()