orthanc-stone: Framework/Oracle/WebAssemblyOracle.cpp comparison

comparison Framework/Oracle/WebAssemblyOracle.cpp @ 1245:3d4dc87af04b broker

ParseDicomFromWadoCommand working in wasm

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 07 Jan 2020 11:56:20 +0100
parents	b17959d4da06
children	c1c83c1fb837

comparison

equal deleted inserted replaced

-:b17959d4da06
+:3d4dc87af04b
 #include "OracleCommandExceptionMessage.h"
 #include "SleepOracleCommand.h"
 #if ORTHANC_ENABLE_DCMTK == 1
 #  include "ParseDicomSuccessMessage.h"
+static unsigned int BUCKET_SOP = 1;
 #endif
 #include <Core/OrthancException.h>
 #include <Core/Toolbox.h>
 const T& GetTypedCommand() const
 {
 return dynamic_cast<T&>(*command_);
 }
+#if ORTHANC_ENABLE_DCMTK == 1
+void StoreInCache(const std::string& sopInstanceUid,
+std::auto_ptr<Orthanc::ParsedDicomFile>& dicom,
+size_t fileSize)
+{
+if (oracle_.dicomCache_.get())
+{
+// Store it into the cache for future use
+oracle_.dicomCache_->Acquire(BUCKET_SOP, sopInstanceUid,
+dicom.release(), fileSize, true);
+}
+}
+#endif
 static void SuccessCallback(emscripten_fetch_t *fetch)
 {
 /**
 * Firstly, make a local copy of the fetched information, and
 * free data associated with the fetch.
 if (fetch->numBytes > 0)
 {
 answer.assign(fetch->data, fetch->numBytes);
 }
 /**
-* TODO - HACK - As of emscripten-1.38.31, the fetch API does
+* Retrieving the headers of the HTTP answer.
-* not contain a way to retrieve the HTTP headers of the
+**/
-* answer. We make the assumption that the "Content-Type" header
+HttpHeaders headers;
-* of the response is the same as the "Accept" header of the
-* query. This should be fixed in future versions of emscripten.
+#if (__EMSCRIPTEN_major__ < 1 ||                                        \
+(__EMSCRIPTEN_major__ == 1 && __EMSCRIPTEN_minor__ < 38) ||        \
+(__EMSCRIPTEN_major__ == 1 && __EMSCRIPTEN_minor__ == 38 && __EMSCRIPTEN_tiny__ < 37))
+#  warning Consider upgrading Emscripten to a version above 1.38.37, incomplete support of Fetch API
+/**
+* HACK - If emscripten < 1.38.37, the fetch API does not
+* contain a way to retrieve the HTTP headers of the answer. We
+* make the assumption that the "Content-Type" header of the
+* response is the same as the "Accept" header of the
+* query. This is fixed thanks to the
+* "emscripten_fetch_get_response_headers()" function that was
+* added to "fetch.h" at emscripten-1.38.37 on 2019-06-26.
+*
+* https://github.com/emscripten-core/emscripten/blob/1.38.37/system/include/emscripten/fetch.h
 * https://github.com/emscripten-core/emscripten/pull/8486
-*
-* TODO - The function "emscripten_fetch_get_response_headers()"
-* was added to "fetch.h" at emscripten-1.38.37 on 2019-06-26.
-* https://github.com/emscripten-core/emscripten/blob/1.38.37/system/include/emscripten/fetch.h
 **/
-HttpHeaders headers;
 if (fetch->userData != NULL)
 {
 if (!context->GetExpectedContentType().empty())
 {
 headers["Content-Type"] = context->GetExpectedContentType();
 }
 }
+#else
+{
+size_t size = emscripten_fetch_get_response_headers_length(fetch);
+std::string plainHeaders(size + 1, '\0');
+emscripten_fetch_get_response_headers(fetch, &plainHeaders[0], size + 1);
+std::vector<std::string> tokens;
+Orthanc::Toolbox::TokenizeString(tokens, plainHeaders, '\n');
+for (size_t i = 0; i < tokens.size(); i++)
+{
+size_t p = tokens[i].find(':');
+if (p != std::string::npos)
+{
+std::string key = Orthanc::Toolbox::StripSpaces(tokens[i].substr(0, p));
+std::string value = Orthanc::Toolbox::StripSpaces(tokens[i].substr(p + 1));
+headers[key] = value;
+}
+}
+}
+#endif
 LOG(TRACE) << "About to call emscripten_fetch_close";
 emscripten_fetch_close(fetch);
 LOG(TRACE) << "Successfully called emscripten_fetch_close";
 }
 case IOracleCommand::Type_ParseDicomFromWado:
 {
 #if ORTHANC_ENABLE_DCMTK == 1
+const ParseDicomFromWadoCommand& command =
+context->GetTypedCommand<ParseDicomFromWadoCommand>();
 size_t fileSize;
 std::auto_ptr<Orthanc::ParsedDicomFile> dicom
 (ParseDicomSuccessMessage::ParseWadoAnswer(fileSize, answer, headers));
-LOG(WARNING) << "bingo";
+{
+ParseDicomSuccessMessage message(command, *dicom, fileSize, true);
+context->EmitMessage(message);
+}
+context->StoreInCache(command.GetSopInstanceUid(), dicom, fileSize);
 #else
 throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError);
 #endif
 break;
 }
 void WebAssemblyOracle::Execute(boost::weak_ptr<IObserver> receiver,
 ParseDicomFromWadoCommand* command)
 {
 std::auto_ptr<ParseDicomFromWadoCommand> protection(command);
-// TODO - CACHE
+#if ORTHANC_ENABLE_DCMTK == 1
+if (dicomCache_.get())
+{
+ParsedDicomCache::Reader reader(*dicomCache_, BUCKET_SOP, protection->GetSopInstanceUid());
+if (reader.IsValid() &&
+reader.HasPixelData())
+{
+// Reuse the DICOM file from the cache
+ParseDicomSuccessMessage message(*protection, reader.GetDicom(),
+reader.GetFileSize(), reader.HasPixelData());
+EmitMessage(receiver, message);
+return;
+}
+}
+#endif
 switch (command->GetRestCommand().GetType())
 {
 case IOracleCommand::Type_Http:
 {
 const HttpCommand& rest =
 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented);
 }
 return true;
 }
+void WebAssemblyOracle::SetDicomCacheSize(size_t size)
+{
+#if ORTHANC_ENABLE_DCMTK == 1
+if (size == 0)
+{
+dicomCache_.reset();
+}
+else
+{
+dicomCache_.reset(new ParsedDicomCache(size));
+}
+#else
+LOG(INFO) << "DCMTK support is disabled, the DICOM cache is disabled";
+#endif
+}
 }

Mercurial > hg > orthanc-stone

comparison Framework/Oracle/WebAssemblyOracle.cpp @ 1245:3d4dc87af04b broker