Mercurial > hg > orthanc

comparison OrthancServer/DicomProtocol/DicomServer.h @ 1681:ee4367497d0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
got rid of buggy BagOfRunnablesBySteps
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 06 Oct 2015 14:02:39 +0200
parents 4113a9a668b1
children 6414043df7d8
comparison
equal deleted inserted replaced
1680:4113a9a668b1 1681:ee4367497d0d
34 34
35 #include "IFindRequestHandlerFactory.h" 35 #include "IFindRequestHandlerFactory.h"
36 #include "IMoveRequestHandlerFactory.h" 36 #include "IMoveRequestHandlerFactory.h"
37 #include "IStoreRequestHandlerFactory.h" 37 #include "IStoreRequestHandlerFactory.h"
38 #include "IApplicationEntityFilter.h" 38 #include "IApplicationEntityFilter.h"
39 #include "../../Core/MultiThreading/BagOfRunnablesBySteps.h"
40 39
41 #include <boost/shared_ptr.hpp> 40 #include <boost/shared_ptr.hpp>
42 #include <boost/noncopyable.hpp> 41 #include <boost/noncopyable.hpp>
43
44 struct T_ASC_Network;
45 42
46 namespace Orthanc 43 namespace Orthanc
47 { 44 {
48 class DicomServer : public boost::noncopyable 45 class DicomServer : public boost::noncopyable
49 { 46 {
55 std::string aet_; 52 std::string aet_;
56 uint16_t port_; 53 uint16_t port_;
57 bool continue_; 54 bool continue_;
58 bool started_; 55 bool started_;
59 uint32_t clientTimeout_; 56 uint32_t clientTimeout_;
60 bool isThreaded_;
61 IFindRequestHandlerFactory* findRequestHandlerFactory_; 57 IFindRequestHandlerFactory* findRequestHandlerFactory_;
62 IMoveRequestHandlerFactory* moveRequestHandlerFactory_; 58 IMoveRequestHandlerFactory* moveRequestHandlerFactory_;
63 IStoreRequestHandlerFactory* storeRequestHandlerFactory_; 59 IStoreRequestHandlerFactory* storeRequestHandlerFactory_;
64 IApplicationEntityFilter* applicationEntityFilter_; 60 IApplicationEntityFilter* applicationEntityFilter_;
65 61
66 BagOfRunnablesBySteps bagOfDispatchers_; // This is used iff the server is threaded 62 static void ServerThread(DicomServer* server);
67
68 static void ServerThread(DicomServer* server,
69 T_ASC_Network *net);
70 63
71 public: 64 public:
72 DicomServer(); 65 DicomServer();
73 66
74 ~DicomServer(); 67 ~DicomServer();
75 68
76 void SetPortNumber(uint16_t port); 69 void SetPortNumber(uint16_t port);
77 uint16_t GetPortNumber() const; 70 uint16_t GetPortNumber() const;
78
79 void SetThreaded(bool isThreaded);
80 bool IsThreaded() const;
81 71
82 void SetClientTimeout(uint32_t timeout); 72 void SetClientTimeout(uint32_t timeout);
83 uint32_t GetClientTimeout() const; 73 uint32_t GetClientTimeout() const;
84 74
85 void SetCalledApplicationEntityTitleCheck(bool check); 75 void SetCalledApplicationEntityTitleCheck(bool check);