mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make the stream cache the serialized plugin thread-local

metadata
Edgar Velazquez-Armendariz 2013-01-24 14:34:23 -05:00
parent 8e372a61b7
commit fb857d67e5
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/shapes/serialized.cpp
View File

@ -25,6 +25,9 @@
#include <boost/make_shared.hpp> #include <boost/make_shared.hpp>
/// How many files to keep open in the cache, per thread
#define MTS_SERIALIZED_CACHE_SIZE 4
MTS_NAMESPACE_BEGIN MTS_NAMESPACE_BEGIN
/*!\plugin{serialized}{Serialized mesh loader} /*!\plugin{serialized}{Serialized mesh loader}
@ -156,8 +159,7 @@ public:
/* Load the geometry */ /* Load the geometry */
Log(EInfo, "Loading shape %i from \"%s\" ..", shapeIndex, filePath.filename().string().c_str()); Log(EInfo, "Loading shape %i from \"%s\" ..", shapeIndex, filePath.filename().string().c_str());
ref<Timer> timer = new Timer(); ref<Timer> timer = new Timer();
boost::shared_ptr<MeshLoader> meshLoader = Cache::getInstance()->get(filePath); loadCompressed(filePath, shapeIndex);
loadCompressed(meshLoader->seekStream(shapeIndex));
Log(EDebug, "Done (" SIZE_T_FMT " triangles, " SIZE_T_FMT " vertices, %i ms)", Log(EDebug, "Done (" SIZE_T_FMT " triangles, " SIZE_T_FMT " vertices, %i ms)",
m_triangleCount, m_vertexCount, timer->getMilliseconds()); m_triangleCount, m_vertexCount, timer->getMilliseconds());
@ -234,8 +236,8 @@ private:
* Positions the stream at the location for the given shape index. * Positions the stream at the location for the given shape index.
* Returns the modified stream. * Returns the modified stream.
*/ */
inline FileStream* seekStream(int shapeIndex) { inline FileStream* seekStream(size_t shapeIndex) {
if (shapeIndex < 0 || shapeIndex > (int) m_offsets.size()) { if (shapeIndex > m_offsets.size()) {
SLog(EError, "Unable to unserialize mesh, " SLog(EError, "Unable to unserialize mesh, "
"shape index is out of range! (requested %i out of 0..%i)", "shape index is out of range! (requested %i out of 0..%i)",
shapeIndex, (int) (m_offsets.size()-1)); shapeIndex, (int) (m_offsets.size()-1));
@ -250,27 +252,41 @@ private:
ref<FileStream> m_fstream; ref<FileStream> m_fstream;
}; };
struct Cache : LRUCache<fs::path, std::less<fs::path>, struct FileStreamCache : LRUCache<fs::path, std::less<fs::path>,
boost::shared_ptr<MeshLoader> > { boost::shared_ptr<MeshLoader> > {
boost::shared_ptr<MeshLoader> get(const fs::path& path) { inline boost::shared_ptr<MeshLoader> get(const fs::path& path) {
bool dummy; bool dummy;
return LRUCache::get(path, dummy); return LRUCache::get(path, dummy);
} }
static Cache* getInstance() { FileStreamCache() : LRUCache(MTS_SERIALIZED_CACHE_SIZE,
return m_instance; &boost::make_shared<MeshLoader, const fs::path&>) {}
};
/// Loads the mesh from the thread-local file stream cache
void loadCompressed(const fs::path& filePath, const int idx) {
if (EXPECT_NOT_TAKEN(idx < 0)) {
Log(EError, "Unable to unserialize mesh, "
"shape index is negative! (requested %i out of 0..%i)", idx);
} }
private: // Get the thread local cache; create it if this is the first time
Cache(size_t capacity) : LRUCache(capacity, FileStreamCache* cache = m_cache.get();
&boost::make_shared<MeshLoader, const fs::path&>) {} if (EXPECT_NOT_TAKEN(cache == NULL)) {
cache = new FileStreamCache();
m_cache.set(cache);
}
static ref<Cache> m_instance; boost::shared_ptr<MeshLoader> meshLoader = cache->get(filePath);
}; Assert(meshLoader != NULL);
TriMesh::loadCompressed(meshLoader->seekStream((size_t) idx));
}
static ThreadLocal<FileStreamCache> m_cache;
}; };
ref<SerializedMesh::Cache> SerializedMesh::Cache::m_instance(new SerializedMesh::Cache(8)); ThreadLocal<SerializedMesh::FileStreamCache> SerializedMesh::m_cache;
MTS_IMPLEMENT_CLASS_S(SerializedMesh, false, TriMesh) MTS_IMPLEMENT_CLASS_S(SerializedMesh, false, TriMesh)