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

Simplify API with recursive mutex

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

28
request.cc
View File

@@ -54,7 +54,7 @@ const std::string_view& Request::GetBody() {
} }
void Request::WriteHeader(const std::string_view& name, const std::string_view& value) { void Request::WriteHeader(const std::string_view& name, const std::string_view& value) {
std::lock_guard<std::mutex> l(output_mu_); std::lock_guard<std::recursive_mutex> l(output_mu_);
CHECK(!body_written_); CHECK(!body_written_);
CHECK(out_buf_.Write(name)); CHECK(out_buf_.Write(name));
@@ -64,12 +64,17 @@ 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::recursive_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() {
std::lock_guard<std::mutex> l(output_mu_); std::lock_guard<std::recursive_mutex> l(output_mu_);
std::vector<iovec> vecs; std::vector<iovec> vecs;
@@ -87,9 +92,9 @@ bool Request::Flush() {
} }
bool Request::End() { bool Request::End() {
std::lock_guard<std::mutex> l(output_mu_); std::lock_guard<std::recursive_mutex> l(output_mu_);
WriteBodyLocked(""); WriteBody("");
std::vector<iovec> vecs; std::vector<iovec> vecs;
@@ -120,15 +125,4 @@ 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

13
request.h
View File

@@ -31,12 +31,11 @@ class Request {
bool End(); bool End();
template<typename...Args> template<typename...Args>
void WriteMany(const std::string_view& first, Args... more); void WriteBody(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;
@@ -46,14 +45,14 @@ class Request {
firebuf::Buffer out_buf_; firebuf::Buffer out_buf_;
bool body_written_; bool body_written_;
std::mutex output_mu_; std::recursive_mutex output_mu_;
}; };
template<typename...Args> template<typename...Args>
void Request::WriteMany(const std::string_view& first, Args... more) { void Request::WriteBody(const std::string_view& first, Args... more) {
std::lock_guard<std::mutex> l(output_mu_); std::lock_guard<std::recursive_mutex> l(output_mu_);
WriteBodyLocked(first); WriteBody(first);
WriteMany(std::forward(more)...); WriteBody(more...);
} }
} // namespace firecgi } // namespace firecgi