Mercurial > hg > piper-cpp

comparison utilities/vampipe-server.cpp @ 69:91fda9470ee2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch jsonrpc
author Chris Cannam <c.cannam@qmul.ac.uk>
date Thu, 06 Oct 2016 14:33:12 +0100
parents a5ba837bca28
children 7bfc07576830
comparison
equal deleted inserted replaced
66:6f160dee1192 69:91fda9470ee2
43 rr.type = RRType::NotValid; 43 rr.type = RRType::NotValid;
44 return rr; 44 return rr;
45 } 45 }
46 46
47 ::capnp::InputStreamMessageReader message(buffered); 47 ::capnp::InputStreamMessageReader message(buffered);
48 VampRequest::Reader reader = message.getRoot<VampRequest>(); 48 RpcRequest::Reader reader = message.getRoot<RpcRequest>();
49 49
50 rr.type = VampnProto::getRequestResponseType(reader); 50 rr.type = VampnProto::getRequestResponseType(reader);
51 51
52 switch (rr.type) { 52 switch (rr.type) {
53 53
54 case RRType::List: 54 case RRType::List:
55 VampnProto::readVampRequest_List(reader); // type check only 55 VampnProto::readRpcRequest_List(reader); // type check only
56 break; 56 break;
57 case RRType::Load: 57 case RRType::Load:
58 VampnProto::readVampRequest_Load(rr.loadRequest, reader); 58 VampnProto::readRpcRequest_Load(rr.loadRequest, reader);
59 break; 59 break;
60 case RRType::Configure: 60 case RRType::Configure:
61 VampnProto::readVampRequest_Configure(rr.configurationRequest, 61 VampnProto::readRpcRequest_Configure(rr.configurationRequest,
62 reader, mapper); 62 reader, mapper);
63 break; 63 break;
64 case RRType::Process: 64 case RRType::Process:
65 VampnProto::readVampRequest_Process(rr.processRequest, reader, mapper); 65 VampnProto::readRpcRequest_Process(rr.processRequest, reader, mapper);
66 break; 66 break;
67 case RRType::Finish: 67 case RRType::Finish:
68 VampnProto::readVampRequest_Finish(rr.finishRequest, reader, mapper); 68 VampnProto::readRpcRequest_Finish(rr.finishRequest, reader, mapper);
69 break; 69 break;
70 case RRType::NotValid: 70 case RRType::NotValid:
71 break; 71 break;
72 } 72 }
73 73
76 76
77 void 77 void
78 writeResponseCapnp(RequestOrResponse &rr) 78 writeResponseCapnp(RequestOrResponse &rr)
79 { 79 {
80 ::capnp::MallocMessageBuilder message; 80 ::capnp::MallocMessageBuilder message;
81 VampResponse::Builder builder = message.initRoot<VampResponse>(); 81 RpcResponse::Builder builder = message.initRoot<RpcResponse>();
82 82
83 if (!rr.success) { 83 if (!rr.success) {
84 84
85 VampnProto::buildVampResponse_Error(builder, rr.errorText, rr.type); 85 VampnProto::buildRpcResponse_Error(builder, rr.errorText, rr.type);
86 86
87 } else { 87 } else {
88 88
89 switch (rr.type) { 89 switch (rr.type) {
90 90
91 case RRType::List: 91 case RRType::List:
92 VampnProto::buildVampResponse_List(builder, rr.listResponse); 92 VampnProto::buildRpcResponse_List(builder, rr.listResponse);
93 break; 93 break;
94 case RRType::Load: 94 case RRType::Load:
95 VampnProto::buildVampResponse_Load(builder, rr.loadResponse, mapper); 95 VampnProto::buildRpcResponse_Load(builder, rr.loadResponse, mapper);
96 break; 96 break;
97 case RRType::Configure: 97 case RRType::Configure:
98 VampnProto::buildVampResponse_Configure(builder, rr.configurationResponse, mapper); 98 VampnProto::buildRpcResponse_Configure(builder, rr.configurationResponse, mapper);
99 break; 99 break;
100 case RRType::Process: 100 case RRType::Process:
101 VampnProto::buildVampResponse_Process(builder, rr.processResponse, mapper); 101 VampnProto::buildRpcResponse_Process(builder, rr.processResponse, mapper);
102 break; 102 break;
103 case RRType::Finish: 103 case RRType::Finish:
104 VampnProto::buildVampResponse_Finish(builder, rr.finishResponse, mapper); 104 VampnProto::buildRpcResponse_Finish(builder, rr.finishResponse, mapper);
105 break; 105 break;
106 case RRType::NotValid: 106 case RRType::NotValid:
107 break; 107 break;
108 } 108 }
109 } 109 }
113 113
114 void 114 void
115 writeExceptionCapnp(const std::exception &e, RRType type) 115 writeExceptionCapnp(const std::exception &e, RRType type)
116 { 116 {
117 ::capnp::MallocMessageBuilder message; 117 ::capnp::MallocMessageBuilder message;
118 VampResponse::Builder builder = message.initRoot<VampResponse>(); 118 RpcResponse::Builder builder = message.initRoot<RpcResponse>();
119 VampnProto::buildVampResponse_Exception(builder, e, type); 119 VampnProto::buildRpcResponse_Exception(builder, e, type);
120 120
121 writeMessageToFd(1, message); 121 writeMessageToFd(1, message);
122 } 122 }
123 123
124 RequestOrResponse 124 RequestOrResponse