# HG changeset patch # User Sebastien Jodogne # Date 1355480524 -3600 # Node ID 40d3bf6cc8d913ccb0371061f5c2ce44cec5aea0 # Parent 471df5fecb1ecc05647d13c484d6410248704e1a logs diff -r 471df5fecb1e -r 40d3bf6cc8d9 Core/Cache/MemoryCache.cpp --- a/Core/Cache/MemoryCache.cpp Fri Dec 14 10:46:00 2012 +0100 +++ b/Core/Cache/MemoryCache.cpp Fri Dec 14 11:22:04 2012 +0100 @@ -32,6 +32,8 @@ #include "MemoryCache.h" +#include + namespace Orthanc { MemoryCache::Page& MemoryCache::Load(const std::string& id) @@ -40,6 +42,7 @@ Page* p = NULL; if (index_.Contains(id, p)) { + VLOG(1) << "Reusing a cache page"; assert(p != NULL); index_.TagAsMostRecent(id); return *p; @@ -49,6 +52,7 @@ // is full. if (index_.GetSize() == cacheSize_) { + VLOG(1) << "Dropping the oldest cache page"; index_.RemoveOldest(p); delete p; } @@ -59,6 +63,7 @@ result->content_.reset(provider_.Provide(id)); // Add the newly create page to the cache + VLOG(1) << "Registering new data in a cache page"; p = result.release(); index_.Add(id, p); return *p; diff -r 471df5fecb1e -r 40d3bf6cc8d9 INSTALL --- a/INSTALL Fri Dec 14 10:46:00 2012 +0100 +++ b/INSTALL Fri Dec 14 11:22:04 2012 +0100 @@ -68,15 +68,6 @@ # make -Debian/Ubuntu specific: Because of a packaging error for "libdcmtk", -you have to add the "wrap" and "oflog" libraries at the configuration -time: - -# cd ~/OrthancBuild -# cmake "-DDCMTK_LIBRARIES=wrap;oflog" -DSTATIC_BUILD=OFF -DCMAKE_BUILD_TYPE=DEBUG ~/Orthanc -# make - - Cross-Compilation for Windows under Linux ----------------------------------------- @@ -113,3 +104,17 @@ Visual Studio 2005: http://en.wikipedia.org/wiki/Microsoft_Windows_SDK. Read the CMake FAQ: http://goo.gl/By90B + + + +Debian/Ubuntu specific +---------------------- + +When dynamically linking against the system libraries, you have to +manually add the "wrap" and "oflog" libraries at the configuration +time (because of a packaging error in "libdcmtk"): + +# cd ~/OrthancBuild +# cmake "-DDCMTK_LIBRARIES=wrap;oflog" -DSTATIC_BUILD=OFF -DCMAKE_BUILD_TYPE=DEBUG ~/Orthanc +# make + diff -r 471df5fecb1e -r 40d3bf6cc8d9 OrthancServer/ServerContext.cpp --- a/OrthancServer/ServerContext.cpp Fri Dec 14 10:46:00 2012 +0100 +++ b/OrthancServer/ServerContext.cpp Fri Dec 14 11:22:04 2012 +0100 @@ -57,9 +57,6 @@ provider_(*this), dicomCache_(provider_, DICOM_CACHE_SIZE) { - // TODO RECYCLING SETUP HERE - //index_.SetMaximumPatientCount(4); - //index_.SetMaximumStorageSize(10); } void ServerContext::SetCompressionEnabled(bool enabled)