cpp/firecgi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add WriteMany()

Browse Source
This commit is contained in:
flamingcow
2019-05-09 23:04:04 -07:00
parent ad0281f9d2
commit 10bdc8e775
2 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
request.cc
View File

@@ -65,13 +65,7 @@ void Request::WriteHeader(const std::string_view& name, const std::string_view&
void Request::WriteBody(const std::string_view& body) { void Request::WriteBody(const std::string_view& body) {
std::lock_guard<std::mutex> l(output_mu_); std::lock_guard<std::mutex> l(output_mu_);
WriteBodyLocked(body);
if (!body_written_) {
CHECK(out_buf_.Write("\n"));
body_written_ = true;
}
// TODO: make this able to span multiple packets
CHECK(out_buf_.Write(body));
} }
bool Request::Flush() { bool Request::Flush() {
@@ -95,10 +89,7 @@ bool Request::Flush() {
bool Request::End() { bool Request::End() {
std::lock_guard<std::mutex> l(output_mu_); std::lock_guard<std::mutex> l(output_mu_);
if (!body_written_) { WriteBodyLocked("");
// Fully empty response not allowed
CHECK(out_buf_.Write("\n"));
}
std::vector<iovec> vecs; std::vector<iovec> vecs;
@@ -129,4 +120,15 @@ Header Request::OutputHeader() {
return Header(6, request_id_, out_buf_.ReadMaxLen()); return Header(6, request_id_, out_buf_.ReadMaxLen());
} }
void Request::WriteBodyLocked(const std::string_view& body) {
CHECK(!output_mu_.try_lock());
if (!body_written_) {
CHECK(out_buf_.Write("\n"));
body_written_ = true;
}
// TODO: make this able to span multiple packets
CHECK(out_buf_.Write(body));
}
} // namespace firecgi } // namespace firecgi

11
request.h
View File

@@ -30,9 +30,13 @@ class Request {
[[nodiscard]] bool Flush(); [[nodiscard]] bool Flush();
bool End(); bool End();
template<typename...Args>
void WriteMany(const std::string_view& first, Args... more);
private: private:
Header OutputHeader(); Header OutputHeader();
iovec OutputVec(); iovec OutputVec();
void WriteBodyLocked(const std::string_view& body);
Connection *conn_; Connection *conn_;
uint16_t request_id_ = 0; uint16_t request_id_ = 0;
@@ -45,4 +49,11 @@ class Request {
std::mutex output_mu_; std::mutex output_mu_;
}; };
template<typename...Args>
void Request::WriteMany(const std::string_view& first, Args... more) {
std::lock_guard<std::mutex> l(output_mu_);
WriteBodyLocked(first);
WriteMany(std::forward(more)...);
}
} // namespace firecgi } // namespace firecgi