Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: src/shared/Communication.h

Issue 11013110: Cleanup (Closed)
Left Patch Set: Created July 5, 2013, 3:28 a.m.
Right Patch Set: More beautification and addressing comments Created July 29, 2013, 12:13 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « src/plugin/Resource.h ('k') | src/shared/Communication.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
1 #ifndef COMMUNICATION_H 1 #ifndef COMMUNICATION_H
2 #define COMMUNICATION_H 2 #define COMMUNICATION_H
3 3
4 #include <memory> 4 #include <memory>
5 #include <sstream> 5 #include <sstream>
6 #include <stdexcept> 6 #include <stdexcept>
7 #include <stdint.h> 7 #include <stdint.h>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 #include <Windows.h> 10 #include <Windows.h>
11 11
12 namespace Communication 12 namespace Communication
13 { 13 {
14 extern const std::wstring pipeName; 14 extern const std::wstring pipeName;
15 15
16 enum ProcType : uint32_t { 16 enum ProcType : uint32_t {
17 PROC_MATCHES, 17 PROC_MATCHES,
18 PROC_GET_ELEMHIDE_SELECTORS, 18 PROC_GET_ELEMHIDE_SELECTORS,
19 PROC_AVAILABLE_SUBSCRIPTIONS, 19 PROC_AVAILABLE_SUBSCRIPTIONS,
20 PROC_LISTED_SUBSCRIPTIONS, 20 PROC_LISTED_SUBSCRIPTIONS,
21 PROC_SET_SUBSCRIPTION, 21 PROC_SET_SUBSCRIPTION,
22 PROC_UPDATE_ALL_SUBSCRIPTIONS, 22 PROC_UPDATE_ALL_SUBSCRIPTIONS,
23 PROC_GET_EXCEPTION_DOMAINS, 23 PROC_GET_EXCEPTION_DOMAINS,
24 PROC_IS_WHITELISTED_URL, 24 PROC_IS_WHITELISTED_URL,
25 PROC_ADD_FILTER, 25 PROC_ADD_FILTER,
26 PROC_REMOVE_FILTER, 26 PROC_REMOVE_FILTER,
27 PROC_SET_PREF,
28 PROC_GET_PREF
27 }; 29 };
28 enum ValueType : uint32_t { 30 enum ValueType : uint32_t {
29 TYPE_PROC, TYPE_STRING, TYPE_WSTRING, TYPE_INT64, TYPE_INT32, TYPE_BOOL 31 TYPE_PROC, TYPE_STRING, TYPE_WSTRING, TYPE_INT64, TYPE_INT32, TYPE_BOOL
30 }; 32 };
31 typedef uint32_t SizeType; 33 typedef uint32_t SizeType;
32 34
33 class InputBuffer 35 class InputBuffer
34 { 36 {
35 public: 37 public:
38 InputBuffer() : buffer(), hasType(false) {}
36 InputBuffer(const std::string& data) : buffer(data), hasType(false) {} 39 InputBuffer(const std::string& data) : buffer(data), hasType(false) {}
40 InputBuffer(const InputBuffer& copy)
41 {
42 hasType = copy.hasType;
43 buffer = std::istringstream(copy.buffer.str());
44 currentType = copy.currentType;
45 }
37 InputBuffer& operator>>(ProcType& value) { return Read(value, TYPE_PROC); } 46 InputBuffer& operator>>(ProcType& value) { return Read(value, TYPE_PROC); }
38 InputBuffer& operator>>(std::string& value) { return ReadString(value, TYPE_ STRING); } 47 InputBuffer& operator>>(std::string& value) { return ReadString(value, TYPE_ STRING); }
39 InputBuffer& operator>>(std::wstring& value) { return ReadString(value, TYPE _WSTRING); } 48 InputBuffer& operator>>(std::wstring& value) { return ReadString(value, TYPE _WSTRING); }
40 InputBuffer& operator>>(int64_t& value) { return Read(value, TYPE_INT64); } 49 InputBuffer& operator>>(int64_t& value) { return Read(value, TYPE_INT64); }
41 InputBuffer& operator>>(int32_t& value) { return Read(value, TYPE_INT32); } 50 InputBuffer& operator>>(int32_t& value) { return Read(value, TYPE_INT32); }
42 InputBuffer& operator>>(bool& value) { return Read(value, TYPE_BOOL); } 51 InputBuffer& operator>>(bool& value) { return Read(value, TYPE_BOOL); }
52 InputBuffer& operator=(const InputBuffer& copy)
53 {
54 hasType = copy.hasType;
55 buffer = std::istringstream(copy.buffer.str());
56 currentType = copy.currentType;
57 return *this;
58 }
59 ValueType GetType();
43 private: 60 private:
44 std::istringstream buffer; 61 std::istringstream buffer;
45 ValueType currentType; 62 ValueType currentType;
46 bool hasType; 63 bool hasType;
47 64
48 void CheckType(ValueType expectedType); 65 void CheckType(ValueType expectedType);
49 66
50 template<class T> 67 template<class T>
51 InputBuffer& ReadString(T& value, ValueType expectedType) 68 InputBuffer& ReadString(T& value, ValueType expectedType)
52 { 69 {
(...skipping 18 matching lines...) Expand all
71 ReadBinary(value); 88 ReadBinary(value);
72 return *this; 89 return *this;
73 } 90 }
74 91
75 template<class T> 92 template<class T>
76 void ReadBinary(T& value) 93 void ReadBinary(T& value)
77 { 94 {
78 buffer.read(reinterpret_cast<char*>(&value), sizeof(T)); 95 buffer.read(reinterpret_cast<char*>(&value), sizeof(T));
79 if (buffer.fail()) 96 if (buffer.fail())
80 throw new std::runtime_error("Unexpected end of input buffer"); 97 throw new std::runtime_error("Unexpected end of input buffer");
98 hasType = false;
81 } 99 }
82 }; 100 };
83 101
84 class OutputBuffer 102 class OutputBuffer
85 { 103 {
86 public: 104 public:
87 OutputBuffer() {} 105 OutputBuffer() {}
88 106
89 // Explicit copy constructor to allow returning OutputBuffer by value 107 // Explicit copy constructor to allow returning OutputBuffer by value
90 OutputBuffer(const OutputBuffer& copy) : buffer(copy.buffer.str()) {} 108 OutputBuffer(const OutputBuffer& copy) : buffer(copy.buffer.str()) {}
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 177
160 InputBuffer ReadMessage(); 178 InputBuffer ReadMessage();
161 void WriteMessage(OutputBuffer& message); 179 void WriteMessage(OutputBuffer& message);
162 180
163 protected: 181 protected:
164 HANDLE pipe; 182 HANDLE pipe;
165 }; 183 };
166 } 184 }
167 185
168 #endif 186 #endif
LEFTRIGHT

Powered by Google App Engine
This is Rietveld