orthanc: Core/HttpClient.cpp comparison

comparison Core/HttpClient.cpp @ 3590:d5740d3b1d67

fix for issue #156: Chunked Dicom-web transfer uses 100% CPU

author	Alain Mazy <alain@mazy.be>
date	Mon, 23 Dec 2019 10:42:59 +0100
parents	96780208dbd7
children	19d88138c30f

comparison

equal deleted inserted replaced

-:a648c2d67a65
+:d5740d3b1d67
 #include <string.h>
 #include <curl/curl.h>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/thread/mutex.hpp>
+#include <list>
 // Default timeout = 60 seconds (in Orthanc <= 1.5.6, it was 10 seconds)
 static const unsigned int DEFAULT_HTTP_TIMEOUT = 60;
 class HttpClient::CurlRequestBody : public boost::noncopyable
 {
 private:
 HttpClient::IRequestBody*  body_;
-std::string                buffer_;
+std::string                sourceBuffer_;
+size_t                     sourceBufferTransmittedSize_;
 size_t CallbackInternal(char* curlBuffer,
 size_t curlBufferSize)
 {
 if (body_ == NULL)
 {
 throw OrthancException(ErrorCode_InternalError);
 }
 // Read chunks from the body stream so as to fill the target buffer
-std::string chunk;
+size_t curlBufferFilledSize = 0;
+size_t sourceRemainingSize = sourceBuffer_.size() - sourceBufferTransmittedSize_;
+bool hasMore = true;
-while (buffer_.size() < curlBufferSize &&
+while (sourceRemainingSize < curlBufferSize && hasMore)
-body_->ReadNextChunk(chunk))
+{
-{
+if (sourceRemainingSize > 0)
-buffer_ += chunk;
+{
-}
+// transmit the end of current source buffer
+memcpy(curlBuffer + curlBufferFilledSize, sourceBuffer_.data() + sourceBufferTransmittedSize_, sourceRemainingSize);
-size_t s = std::min(buffer_.size(), curlBufferSize);
+curlBufferFilledSize += sourceRemainingSize;
-if (s != 0)
+}
-{
-memcpy(curlBuffer, buffer_.c_str(), s);
+// start filling a new source buffer
+sourceBufferTransmittedSize_ = 0;
-// Remove the bytes that were actually sent from the buffer
+sourceBuffer_.clear();
-buffer_.erase(0, s);
-}
+hasMore = body_->ReadNextChunk(sourceBuffer_);
-return s;
+sourceRemainingSize = sourceBuffer_.size();
+}
+if (sourceRemainingSize > 0 && (curlBufferSize - curlBufferFilledSize) > 0)
+{
+size_t s = std::min(sourceRemainingSize, curlBufferSize - curlBufferFilledSize);
+memcpy(curlBuffer + curlBufferFilledSize, sourceBuffer_.data() + sourceBufferTransmittedSize_, s);
+sourceBufferTransmittedSize_ += s;
+curlBufferFilledSize += s;
+}
+return curlBufferFilledSize;
 }
 public:
 CurlRequestBody() :
-body_(NULL)
+body_(NULL),
+sourceBufferTransmittedSize_(0)
 {
 }
 void SetBody(HttpClient::IRequestBody& body)
 {
 body_ = &body;
-buffer_.clear();
+sourceBufferTransmittedSize_ = 0;
+sourceBuffer_.clear();
 }
 void Clear()
 {
 body_ = NULL;
-buffer_.clear();
+sourceBufferTransmittedSize_ = 0;
+sourceBuffer_.clear();
 }
 bool IsValid() const
 {
 return body_ != NULL;

Mercurial > hg > orthanc

comparison Core/HttpClient.cpp @ 3590:d5740d3b1d67