Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-16 14:08:35 +08:00
Code Issues Projects Releases Wiki Activity

server: Add connection as part of a request

Browse Source
This commit is contained in:
Justin Berger
2017-03-24 21:57:04 -06:00
parent d4f5d35ca4
commit 5ddfb6a472
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmServer.cxx
View File

@@ -83,7 +83,7 @@ void cmServer::ProcessRequest(cmConnection* connection,
debug->PrintStatistics = debugValue["showStats"].asBool(); debug->PrintStatistics = debugValue["showStats"].asBool();
} }
const cmServerRequest request(this, value[kTYPE_KEY].asString(), const cmServerRequest request(this, connection, value[kTYPE_KEY].asString(),
value[kCOOKIE_KEY].asString(), value); value[kCOOKIE_KEY].asString(), value);
if (request.Type == "") { if (request.Type == "") {
@@ -323,7 +323,7 @@ void cmServer::WriteProgress(const cmServerRequest& request, int min,
obj[kPROGRESS_MAXIMUM_KEY] = max; obj[kPROGRESS_MAXIMUM_KEY] = max;
obj[kPROGRESS_CURRENT_KEY] = current; obj[kPROGRESS_CURRENT_KEY] = current;
this->WriteJsonObject(obj, nullptr); this->WriteJsonObject(request.Connection, obj, nullptr);
} }
void cmServer::WriteMessage(const cmServerRequest& request, void cmServer::WriteMessage(const cmServerRequest& request,
@@ -343,7 +343,7 @@ void cmServer::WriteMessage(const cmServerRequest& request,
obj[kTITLE_KEY] = title; obj[kTITLE_KEY] = title;
} }
WriteJsonObject(obj, nullptr); WriteJsonObject(request.Connection, obj, nullptr);
} }
void cmServer::WriteParseError(cmConnection* connection, void cmServer::WriteParseError(cmConnection* connection,

6
Source/cmServerProtocol.cxx
View File

@@ -125,11 +125,13 @@ void getCMakeInputs(const cmGlobalGenerator* gg, const std::string& sourceDir,
} // namespace } // namespace
cmServerRequest::cmServerRequest(cmServer* server, const std::string& t, cmServerRequest::cmServerRequest(cmServer* server, cmConnection* connection,
const std::string& c, const Json::Value& d) const std::string& t, const std::string& c,
const Json::Value& d)
: Type(t) : Type(t)
, Cookie(c) , Cookie(c)
, Data(d) , Data(d)
, Connection(connection)
, m_Server(server) , m_Server(server)
{ {
} }

5
Source/cmServerProtocol.h
View File

@@ -11,6 +11,7 @@
#include <string> #include <string>
#include <utility> #include <utility>
class cmConnection;
class cmFileMonitor; class cmFileMonitor;
class cmServer; class cmServer;
class cmServerRequest; class cmServerRequest;
@@ -52,9 +53,11 @@ public:
const std::string Type; const std::string Type;
const std::string Cookie; const std::string Cookie;
const Json::Value Data; const Json::Value Data;
cmConnection* Connection;
private: private:
cmServerRequest(cmServer* server, const std::string& t, const std::string& c, cmServerRequest(cmServer* server, cmConnection* connection,
const std::string& t, const std::string& c,
const Json::Value& d); const Json::Value& d);
void ReportProgress(int min, int current, int max, void ReportProgress(int min, int current, int max,