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

Google format

Browse Source
This commit is contained in:
Ian Gulliver
2019-05-18 12:15:11 -07:00
parent a39ef8e25d
commit 690c9ab8bd
13 changed files with 605 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

151
.clang-format Normal file
View File

@@ -0,0 +1,151 @@
---
Language: Cpp
# BasedOnStyle: Google
AccessModifierOffset: -1
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlines: Left
AlignOperands: true
AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: true
AllowShortLoopsOnASingleLine: true
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: Yes
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
AfterClass: false
AfterControlStatement: false
AfterEnum: false
AfterFunction: false
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: false
AfterUnion: false
AfterExternBlock: false
BeforeCatch: false
BeforeElse: false
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBinaryOperators: None
BreakBeforeBraces: Attach
BreakBeforeInheritanceComma: false
BreakInheritanceList: BeforeColon
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false
BreakConstructorInitializers: BeforeColon
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 80
CommentPragmas: '^ IWYU pragma:'
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DerivePointerAlignment: true
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: true
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
IncludeBlocks: Preserve
IncludeCategories:
- Regex: '^<ext/.*\.h>'
Priority: 2
- Regex: '^<.*\.h>'
Priority: 1
- Regex: '^<.*'
Priority: 2
- Regex: '.*'
Priority: 3
IncludeIsMainRegex: '([-_](test|unittest))?$'
IndentCaseLabels: true
IndentPPDirectives: None
IndentWidth: 2
IndentWrappedFunctionNames: false
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: false
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCBinPackProtocolList: Never
ObjCBlockIndentWidth: 2
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 1
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyReturnTypeOnItsOwnLine: 200
PointerAlignment: Left
RawStringFormats:
- Language: Cpp
Delimiters:
- cc
- CC
- cpp
- Cpp
- CPP
- 'c++'
- 'C++'
CanonicalDelimiter: ''
BasedOnStyle: google
- Language: TextProto
Delimiters:
- pb
- PB
- proto
- PROTO
EnclosingFunctions:
- EqualsProto
- EquivToProto
- PARSE_PARTIAL_TEXT_PROTO
- PARSE_TEST_PROTO
- PARSE_TEXT_PROTO
- ParseTextOrDie
- ParseTextProtoOrDie
CanonicalDelimiter: ''
BasedOnStyle: google
ReflowComments: true
SortIncludes: true
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
SpaceAfterTemplateKeyword: true
SpaceBeforeAssignmentOperators: true
SpaceBeforeCpp11BracedList: false
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeParens: ControlStatements
SpaceBeforeRangeBasedForLoopColon: true
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 2
SpacesInAngles: false
SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Auto
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
TabWidth: 8
UseTab: Never
...

54
connection.cc
View File

@@ -9,15 +9,19 @@
namespace firecgi { namespace firecgi {
Connection::Connection(int sock, const sockaddr_in6& client_addr, const std::function<void(Request*)>& callback, int max_request_len) Connection::Connection(int sock, const sockaddr_in6 &client_addr,
const std::function<void(Request *)> &callback,
int max_request_len)
: sock_(sock), : sock_(sock),
callback_(callback), callback_(callback),
buf_(sock, max_request_len), buf_(sock, max_request_len),
request_(this) { request_(this) {
char client_addr_str[INET6_ADDRSTRLEN]; char client_addr_str[INET6_ADDRSTRLEN];
PCHECK(inet_ntop(AF_INET6, &client_addr.sin6_addr, client_addr_str, sizeof(client_addr_str))); PCHECK(inet_ntop(AF_INET6, &client_addr.sin6_addr, client_addr_str,
sizeof(client_addr_str)));
LOG(INFO) << "new connection: [" << client_addr_str << "]:" << ntohs(client_addr.sin6_port); LOG(INFO) << "new connection: [" << client_addr_str
<< "]:" << ntohs(client_addr.sin6_port);
} }
Connection::~Connection() { Connection::~Connection() {
@@ -25,9 +29,9 @@ Connection::~Connection() {
LOG(INFO) << "connection closed (handled " << requests_ << " requests)"; LOG(INFO) << "connection closed (handled " << requests_ << " requests)";
} }
bool Connection::Write(const std::vector<iovec>& vecs) { bool Connection::Write(const std::vector<iovec> &vecs) {
ssize_t total_size = 0; ssize_t total_size = 0;
for (const auto& vec : vecs) { for (const auto &vec : vecs) {
total_size += vec.iov_len; total_size += vec.iov_len;
} }
return writev(sock_, vecs.data(), vecs.size()) == total_size; return writev(sock_, vecs.data(), vecs.size()) == total_size;
@@ -56,10 +60,10 @@ int Connection::Read() {
} }
switch (header->type) { switch (header->type) {
case 1: case 1: {
{
if (header->ContentLength() != sizeof(BeginRequest)) { if (header->ContentLength() != sizeof(BeginRequest)) {
LOG(ERROR) << "FCGI_BeginRequestBody is the wrong length: " << header->ContentLength(); LOG(ERROR) << "FCGI_BeginRequestBody is the wrong length: "
<< header->ContentLength();
return sock_; return sock_;
} }
@@ -71,17 +75,17 @@ int Connection::Read() {
} }
request_.NewRequest(header->RequestId()); request_.NewRequest(header->RequestId());
} } break;
break;
case 4: case 4: {
{
if (header->RequestId() != request_.RequestId()) { if (header->RequestId() != request_.RequestId()) {
LOG(ERROR) << "out of order FCGI_PARAMS record, or client is multiplexing requests (which we don't support)"; LOG(ERROR) << "out of order FCGI_PARAMS record, or client is "
"multiplexing requests (which we don't support)";
return sock_; return sock_;
} }
firebuf::ConstBuffer param_buf(buf_.Read(header->ContentLength()), header->ContentLength()); firebuf::ConstBuffer param_buf(buf_.Read(header->ContentLength()),
header->ContentLength());
while (param_buf.ReadMaxLen() > 0) { while (param_buf.ReadMaxLen() > 0) {
const auto *param_header = param_buf.ReadObj<ParamHeader>(); const auto *param_header = param_buf.ReadObj<ParamHeader>();
if (!param_header) { if (!param_header) {
@@ -105,13 +109,12 @@ int Connection::Read() {
request_.AddParam(key, value); request_.AddParam(key, value);
} }
} } break;
break;
case 5: case 5: {
{
if (header->RequestId() != request_.RequestId()) { if (header->RequestId() != request_.RequestId()) {
LOG(ERROR) << "out of order FCGI_STDIN record, or client is multiplexing requests (which we don't support)"; LOG(ERROR) << "out of order FCGI_STDIN record, or client is "
"multiplexing requests (which we don't support)";
return sock_; return sock_;
} }
@@ -122,12 +125,13 @@ int Connection::Read() {
buf_.Consume(); // discard data and invalidate pointers buf_.Consume(); // discard data and invalidate pointers
} else { } else {
if (!request_.GetBody().empty()) { if (!request_.GetBody().empty()) {
LOG(ERROR) << "received multiple stdin records. have you set \"fastcgi_request_buffering on\"?"; LOG(ERROR) << "received multiple stdin records. have you set "
"\"fastcgi_request_buffering on\"?";
} }
request_.SetBody({buf_.Read(header->ContentLength()), header->ContentLength()}); request_.SetBody(
{buf_.Read(header->ContentLength()), header->ContentLength()});
} }
} } break;
break;
default: default:
LOG(ERROR) << "unknown record type: " << header->type; LOG(ERROR) << "unknown record type: " << header->type;
@@ -144,8 +148,6 @@ int Connection::Read() {
return -1; return -1;
} }
uint64_t Connection::Requests() const { uint64_t Connection::Requests() const { return requests_; }
return requests_;
}
} // namespace firecgi } // namespace firecgi

7
connection.h
View File

@@ -1,7 +1,7 @@
#pragma once #pragma once
#include <functional>
#include <sys/uio.h> #include <sys/uio.h>
#include <functional>
#include <unordered_map> #include <unordered_map>
#include <unordered_set> #include <unordered_set>
@@ -13,7 +13,9 @@ namespace firecgi {
class Connection { class Connection {
public: public:
Connection(int sock, const sockaddr_in6& client_addr, const std::function<void(Request*)>& callback, int max_request_len); Connection(int sock, const sockaddr_in6& client_addr,
const std::function<void(Request*)>& callback,
int max_request_len);
~Connection(); ~Connection();
[[nodiscard]] int Read(); [[nodiscard]] int Read();
@@ -28,7 +30,6 @@ class Connection {
Request request_; Request request_;
uint64_t requests_ = 0; uint64_t requests_ = 0;
}; };
} // namespace firecgi } // namespace firecgi

4
connection_afl.cc
View File

@@ -7,7 +7,9 @@ int main(int argc, char* argv[]) {
gflags::ParseCommandLineFlags(&argc, &argv, true); gflags::ParseCommandLineFlags(&argc, &argv, true);
{ {
firecgi::Connection conn(STDIN_FILENO, {}, [](firecgi::Request* req) { req->End(); }, {}, 16*1024); firecgi::Connection conn(
STDIN_FILENO, {}, [](firecgi::Request* req) { req->End(); }, {},
16 * 1024);
static_cast<void>(conn.Read()); static_cast<void>(conn.Read());
} }

9
example_simple.cc
View File

@@ -6,15 +6,18 @@
DEFINE_int32(port, 9000, "TCP port to bind"); DEFINE_int32(port, 9000, "TCP port to bind");
DEFINE_int32(threads, 1, "Number of server threads"); DEFINE_int32(threads, 1, "Number of server threads");
int main(int argc, char *argv[]) { int main(int argc, char* argv[]) {
google::InitGoogleLogging(argv[0]); google::InitGoogleLogging(argv[0]);
gflags::ParseCommandLineFlags(&argc, &argv, true); gflags::ParseCommandLineFlags(&argc, &argv, true);
firecgi::Server server(FLAGS_port, [](firecgi::Request* request) { firecgi::Server server(
FLAGS_port,
[](firecgi::Request* request) {
request->WriteHeader("Content-Type", "text/plain"); request->WriteHeader("Content-Type", "text/plain");
request->WriteBody("Hello world"); request->WriteBody("Hello world");
request->End(); request->End();
}, FLAGS_threads); },
FLAGS_threads);
server.RegisterSignalHandlers(); server.RegisterSignalHandlers();
server.Serve(); server.Serve();

2
firebuf

Submodule firebuf updated: 2102147a2f...858b291f46

2
fireusage

Submodule fireusage updated: a70d79e869...7972d253ab

5
parse.h
View File

@@ -9,6 +9,7 @@ struct Header {
uint8_t version = 1; uint8_t version = 1;
uint8_t type; uint8_t type;
private: private:
uint16_t request_id_; // network byte order uint16_t request_id_; // network byte order
uint16_t content_length_; // network byte order uint16_t content_length_; // network byte order
@@ -20,7 +21,9 @@ struct Header {
uint16_t ContentLength() const { return ntohs(content_length_); } uint16_t ContentLength() const { return ntohs(content_length_); }
void SetRequestId(uint16_t request_id) { request_id_ = htons(request_id); } void SetRequestId(uint16_t request_id) { request_id_ = htons(request_id); }
void SetContentLength(uint16_t content_length) { content_length_ = htons(content_length); } void SetContentLength(uint16_t content_length) {
content_length_ = htons(content_length);
}
}; };
struct BeginRequest { struct BeginRequest {

27
request.cc
View File

@@ -7,7 +7,8 @@
namespace firecgi { namespace firecgi {
namespace { namespace {
template<class T> void AppendVec(const T& obj, std::vector<iovec>* vec) { template <class T>
void AppendVec(const T& obj, std::vector<iovec>* vec) {
vec->push_back(iovec{ vec->push_back(iovec{
.iov_base = (void*)(&obj), .iov_base = (void*)(&obj),
.iov_len = sizeof(obj), .iov_len = sizeof(obj),
@@ -16,9 +17,7 @@ template<class T> void AppendVec(const T& obj, std::vector<iovec>* vec) {
} // namespace } // namespace
Request::Request(Connection* conn) Request::Request(Connection* conn) : conn_(conn), out_buf_(64 * 1024) {}
: conn_(conn),
out_buf_(64*1024) {}
Request::~Request() { Request::~Request() {
if (on_close_) { if (on_close_) {
@@ -39,17 +38,14 @@ void Request::NewRequest(uint16_t request_id) {
body_written_ = false; body_written_ = false;
} }
uint16_t Request::RequestId() const { uint16_t Request::RequestId() const { return request_id_; }
return request_id_;
}
void Request::AddParam(const std::string_view& key, const std::string_view& value) { void Request::AddParam(const std::string_view& key,
const std::string_view& value) {
params_.try_emplace(key, value); params_.try_emplace(key, value);
} }
void Request::SetBody(const std::string_view& body) { void Request::SetBody(const std::string_view& body) { body_ = body; }
body_ = body;
}
const std::string_view& Request::GetParam(const std::string_view& key) const { const std::string_view& Request::GetParam(const std::string_view& key) const {
auto iter = params_.find(key); auto iter = params_.find(key);
@@ -60,15 +56,14 @@ const std::string_view& Request::GetParam(const std::string_view& key) const {
return iter->second; return iter->second;
} }
const std::string_view& Request::GetBody() const { const std::string_view& Request::GetBody() const { return body_; }
return body_;
}
void Request::OnClose(const std::function<void()>& on_close) { void Request::OnClose(const std::function<void()>& on_close) {
on_close_ = on_close; on_close_ = on_close;
} }
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::recursive_mutex> l(output_mu_); std::lock_guard<std::recursive_mutex> l(output_mu_);
CHECK(!body_written_); CHECK(!body_written_);
@@ -131,7 +126,7 @@ bool Request::End() {
iovec Request::OutputVec() { iovec Request::OutputVec() {
const auto output_len = out_buf_.ReadMaxLen(); const auto output_len = out_buf_.ReadMaxLen();
return iovec{ return iovec{
.iov_base = (void *)(CHECK_NOTNULL(out_buf_.Read(output_len))), .iov_base = (void*)(CHECK_NOTNULL(out_buf_.Read(output_len))),
.iov_len = output_len, .iov_len = output_len,
}; };
} }

12
request.h
View File

@@ -14,7 +14,7 @@ class Connection;
class Request { class Request {
public: public:
Request(Connection *conn); Request(Connection* conn);
~Request(); ~Request();
void NewRequest(uint16_t request_id); void NewRequest(uint16_t request_id);
@@ -34,17 +34,17 @@ class Request {
[[nodiscard]] bool Flush(); [[nodiscard]] bool Flush();
bool End(); bool End();
template<typename...Args> template <typename... Args>
void WriteBody(const std::string_view& first, Args... more); void WriteBody(const std::string_view& first, Args... more);
template<typename T> template <typename T>
T InTransaction(const std::function<T()>& callback); T InTransaction(const std::function<T()>& callback);
private: private:
Header OutputHeader(); Header OutputHeader();
iovec OutputVec(); iovec OutputVec();
Connection *conn_; Connection* conn_;
uint16_t request_id_ = 0; uint16_t request_id_ = 0;
std::unordered_map<std::string_view, std::string_view> params_; std::unordered_map<std::string_view, std::string_view> params_;
@@ -57,14 +57,14 @@ class Request {
std::recursive_mutex output_mu_; std::recursive_mutex output_mu_;
}; };
template<typename...Args> template <typename... Args>
void Request::WriteBody(const std::string_view& first, Args... more) { void Request::WriteBody(const std::string_view& first, Args... more) {
std::lock_guard<std::recursive_mutex> l(output_mu_); std::lock_guard<std::recursive_mutex> l(output_mu_);
WriteBody(first); WriteBody(first);
WriteBody(more...); WriteBody(more...);
} }
template<typename T> template <typename T>
T Request::InTransaction(const std::function<T()>& callback) { T Request::InTransaction(const std::function<T()>& callback) {
std::lock_guard<std::recursive_mutex> l(output_mu_); std::lock_guard<std::recursive_mutex> l(output_mu_);
return callback(); return callback();

31
server.cc
View File

@@ -1,5 +1,4 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <iomanip>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/tcp.h> #include <netinet/tcp.h>
#include <signal.h> #include <signal.h>
@@ -7,16 +6,18 @@
#include <sys/eventfd.h> #include <sys/eventfd.h>
#include <sys/resource.h> #include <sys/resource.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <iomanip>
#include <thread> #include <thread>
#include "fireusage/usage.h" #include "fireusage/usage.h"
#include "server.h"
#include "connection.h" #include "connection.h"
#include "server.h"
namespace firecgi { namespace firecgi {
Server::Server(int port, const std::function<void(Request*)>& callback, int threads, int max_request_len) Server::Server(int port, const std::function<void(Request*)>& callback,
int threads, int max_request_len)
: port_(port), : port_(port),
callback_(callback), callback_(callback),
threads_(threads), threads_(threads),
@@ -28,9 +29,7 @@ Server::Server(int port, const std::function<void(Request*)>& callback, int thre
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
} }
Server::~Server() { Server::~Server() { PCHECK(close(close_fd_) == 0); }
PCHECK(close(close_fd_) == 0);
}
void Server::Serve() { void Server::Serve() {
std::vector<std::thread> threads; std::vector<std::thread> threads;
@@ -71,7 +70,7 @@ void Server::ServeInt() {
char new_conn; char new_conn;
{ {
struct epoll_event ev{ struct epoll_event ev {
.events = EPOLLIN, .events = EPOLLIN,
.data = { .data = {
.ptr = &new_conn, .ptr = &new_conn,
@@ -82,7 +81,7 @@ void Server::ServeInt() {
char shutdown; char shutdown;
{ {
struct epoll_event ev{ struct epoll_event ev {
.events = EPOLLIN, .events = EPOLLIN,
.data = { .data = {
.ptr = &shutdown, .ptr = &shutdown,
@@ -136,16 +135,19 @@ Connection* Server::NewConn(int listen_sock, int epoll_fd) {
sockaddr_in6 client_addr; sockaddr_in6 client_addr;
socklen_t client_addr_len = sizeof(client_addr); socklen_t client_addr_len = sizeof(client_addr);
auto client_sock = accept(listen_sock, (sockaddr*) &client_addr, &client_addr_len); auto client_sock =
accept(listen_sock, (sockaddr*)&client_addr, &client_addr_len);
PCHECK(client_sock >= 0) << "accept()"; PCHECK(client_sock >= 0) << "accept()";
CHECK_EQ(client_addr.sin6_family, AF_INET6); CHECK_EQ(client_addr.sin6_family, AF_INET6);
int flags = 1; int flags = 1;
PCHECK(setsockopt(client_sock, SOL_TCP, TCP_NODELAY, &flags, sizeof(flags)) == 0); PCHECK(setsockopt(client_sock, SOL_TCP, TCP_NODELAY, &flags, sizeof(flags)) ==
0);
auto *conn = new Connection(client_sock, client_addr, callback_, max_request_len_); auto* conn =
new Connection(client_sock, client_addr, callback_, max_request_len_);
{ {
struct epoll_event ev{ struct epoll_event ev {
.events = EPOLLIN, .events = EPOLLIN,
.data = { .data = {
.ptr = conn, .ptr = conn,
@@ -163,7 +165,8 @@ int Server::NewListenSock() {
{ {
int optval = 1; int optval = 1;
PCHECK(setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, &optval, sizeof(optval)) == 0); PCHECK(setsockopt(sock, SOL_SOCKET, SO_REUSEPORT, &optval,
sizeof(optval)) == 0);
} }
{ {
@@ -172,7 +175,7 @@ int Server::NewListenSock() {
.sin6_port = htons(port_), .sin6_port = htons(port_),
.sin6_addr = IN6ADDR_LOOPBACK_INIT, .sin6_addr = IN6ADDR_LOOPBACK_INIT,
}; };
PCHECK(bind(sock, (sockaddr*) &bind_addr, sizeof(bind_addr)) == 0); PCHECK(bind(sock, (sockaddr*)&bind_addr, sizeof(bind_addr)) == 0);
} }
PCHECK(listen(sock, 128) == 0); PCHECK(listen(sock, 128) == 0);

7
server.h
View File

@@ -10,7 +10,8 @@ namespace firecgi {
class Server { class Server {
public: public:
Server(int port, const std::function<void(Request*)>& callback, int threads=1, int max_request_len=(16*1024)); Server(int port, const std::function<void(Request*)>& callback,
int threads = 1, int max_request_len = (16 * 1024));
~Server(); ~Server();
void Serve(); void Serve();
@@ -18,7 +19,7 @@ class Server {
void RegisterSignalHandlers(); void RegisterSignalHandlers();
private: private:
Connection *NewConn(int listen_sock, int epoll_fd); Connection* NewConn(int listen_sock, int epoll_fd);
int NewListenSock(); int NewListenSock();
void ServeInt(); void ServeInt();
@@ -30,4 +31,4 @@ class Server {
int close_fd_; int close_fd_;
}; };
} // firecgi } // namespace firecgi