Typos

.clang-format

@@ -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
+...
+

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "firebuf"]
 	path = firebuf
 	url = ../firebuf.git
+[submodule "fireusage"]
+	path = fireusage
+	url = ../fireusage.git

Makefile

@@ -10,14 +10,17 @@ objects = server.o connection.o request.o parse.o
 firebuf/firebuf.o:
 	$(MAKE) --directory=firebuf firebuf.o
 
+fireusage/fireusage.o:
+	$(MAKE) --directory=fireusage fireusage.o
+
 firecgi.a: $(objects)
 	ar rcs $@ $^
 
-firecgi.o: $(objects) firebuf/firebuf.o
+firecgi.o: $(objects) firebuf/firebuf.o fireusage/fireusage.o
 	gold -z relro -z now -r --output=$@ $+
 
-firecgi.so: $(objects) firebuf/firebuf.o
+firecgi.so: $(objects) firebuf/firebuf.o fireusage/fireusage.o
-	$(FIRE_CXX) $(FIRE_CXXFLAGS) $(FIRE_LDFLAGS) -shared -o $@ $+ $(FIRE_LDFLIBS)
+	$(FIRE_CXX) $(FIRE_CXXFLAGS) $(FIRE_LDFLAGS) -shared -o $@ $+ $(FIRE_LDLIBS)
 
 example_simple: example_simple.o firecgi.o
 	$(FIRE_CXX) $(FIRE_CXXFLAGS) $(FIRE_LDFLAGS) -pie -o $@ $+ $(FIRE_LDLIBS)
@@ -27,6 +30,7 @@ example_simple: example_simple.o firecgi.o
 
 clean:
 	$(MAKE) --directory=firebuf clean
+	$(MAKE) --directory=fireusage clean
 	rm --force example_simple connection_afl *.so *.o *.a
 
 afl:

connection.cc

@@ -9,16 +9,19 @@
 
 namespace firecgi {
 
-Connection::Connection(int sock, const sockaddr_in6& client_addr, const std::function<void(Request*)>& callback, const std::unordered_set<std::string_view>& headers, 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),
       callback_(callback),
-		  headers_(headers),
       buf_(sock, max_request_len),
       request_(this) {
   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() {
@@ -57,10 +60,10 @@ int Connection::Read() {
     }
 
     switch (header->type) {
-		  case 1:
+      case 1: {
-		  	{
         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_;
         }
 
@@ -72,17 +75,17 @@ int Connection::Read() {
         }
 
         request_.NewRequest(header->RequestId());
-			}
+      } break;
-			break;
 
-		  case 4:
+      case 4: {
-		    {
         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_;
         }
 
-				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) {
           const auto *param_header = param_buf.ReadObj<ParamHeader>();
           if (!param_header) {
@@ -104,17 +107,14 @@ int Connection::Read() {
           }
           std::string_view value(value_buf, param_header->value_length);
 
-					if (headers_.find(key) != headers_.end()) {
           request_.AddParam(key, value);
         }
-				}
+      } break;
-			}
-			break;
 
-		  case 5:
+      case 5: {
-		  	{
         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_;
         }
 
@@ -125,12 +125,13 @@ int Connection::Read() {
           buf_.Consume();  // discard data and invalidate pointers
         } else {
           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:
         LOG(ERROR) << "unknown record type: " << header->type;
@@ -147,4 +148,6 @@ int Connection::Read() {
   return -1;
 }
 
+uint64_t Connection::Requests() const { return requests_; }
+
 }  // namespace firecgi

connection.h

@@ -1,7 +1,7 @@
 #pragma once
 
-#include <functional>
 #include <sys/uio.h>
+#include <functional>
 #include <unordered_map>
 #include <unordered_set>
 
@@ -13,21 +13,23 @@ namespace firecgi {
 
 class Connection {
  public:
-	Connection(int sock, const sockaddr_in6& client_addr, const std::function<void(Request*)>& callback, const std::unordered_set<std::string_view>& headers, int max_request_len);
+  Connection(int sock, const sockaddr_in6& client_addr,
+             const std::function<void(Request*)>& callback,
+             int max_request_len);
   ~Connection();
 
   [[nodiscard]] int Read();
   [[nodiscard]] bool Write(const std::vector<iovec>& vecs);
 
+  [[nodiscard]] uint64_t Requests() const;
+
  private:
   const int sock_;
   const std::function<void(Request*)>& callback_;
-	const std::unordered_set<std::string_view>& headers_;
   firebuf::StreamBuffer buf_;
   Request request_;
 
   uint64_t requests_ = 0;
-
 };
 
 }  // namespace firecgi

connection_afl.cc

@@ -7,7 +7,9 @@ int main(int argc, char* argv[]) {
   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());
   }
 

example_simple.cc

@@ -10,10 +10,17 @@ int main(int argc, char *argv[]) {
   google::InitGoogleLogging(argv[0]);
   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->WriteBody("Hello world");
         request->End();
-	}, FLAGS_threads);
+      },
+      FLAGS_threads);
+  server.RegisterSignalHandlers();
   server.Serve();
+
+  gflags::ShutDownCommandLineFlags();
+  google::ShutdownGoogleLogging();
 }

parse.h

@@ -9,6 +9,7 @@ struct Header {
 
   uint8_t version = 1;
   uint8_t type;
+
  private:
   uint16_t request_id_;      // network byte order
   uint16_t content_length_;  // network byte order
@@ -20,7 +21,9 @@ struct Header {
   uint16_t ContentLength() const { return ntohs(content_length_); }
 
   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 {

request.cc

@@ -7,7 +7,8 @@
 namespace firecgi {
 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{
       .iov_base = (void*)(&obj),
       .iov_len = sizeof(obj),
@@ -16,31 +17,37 @@ template<class T> void AppendVec(const T& obj, std::vector<iovec>* vec) {
 
 }  // namespace
 
-Request::Request(Connection* conn)
+Request::Request(Connection* conn) : conn_(conn), out_buf_(64 * 1024) {}
-		: conn_(conn),
+
-		  out_buf_(64*1024) {}
+Request::~Request() {
+  if (on_close_) {
+    on_close_();
+  }
+}
 
 void Request::NewRequest(uint16_t request_id) {
+  if (on_close_) {
+    on_close_();
+  }
+
   request_id_ = request_id;
   params_.clear();
   body_ = {};
+  on_close_ = nullptr;
   out_buf_.Reset();
   body_written_ = false;
 }
 
-uint16_t Request::RequestId() {
+uint16_t Request::RequestId() const { return request_id_; }
-	return request_id_;
+
+void Request::AddParam(const std::string_view& key,
+                       const std::string_view& value) {
+  params_.try_emplace(key, value);
 }
 
-void Request::AddParam(const std::string_view& key, const std::string_view& value) {
+void Request::SetBody(const std::string_view& body) { body_ = body; }
-	params_.try_emplace(std::string(key), std::string(value));
-}
 
-void Request::SetBody(const std::string_view& body) {
+const std::string_view& Request::GetParam(const std::string_view& key) const {
-	body_ = body;
-}
-
-const std::string_view& Request::GetParam(const std::string& key) {
   auto iter = params_.find(key);
   if (iter == params_.end()) {
     static const std::string_view none;
@@ -49,11 +56,14 @@ const std::string_view& Request::GetParam(const std::string& key) {
   return iter->second;
 }
 
-const std::string_view& Request::GetBody() {
+const std::string_view& Request::GetBody() const { return body_; }
-	return body_;
+
+void Request::OnClose(const std::function<void()>& 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_);
 
   CHECK(!body_written_);

request.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <functional>
 #include <mutex>
 #include <unordered_map>
 
@@ -14,16 +15,19 @@ class Connection;
 class Request {
  public:
   Request(Connection* conn);
+  ~Request();
 
   void NewRequest(uint16_t request_id);
 
-	uint16_t RequestId();
+  uint16_t RequestId() const;
 
   void AddParam(const std::string_view& key, const std::string_view& value);
   void SetBody(const std::string_view& in);
 
-	const std::string_view& GetParam(const std::string& key);
+  const std::string_view& GetParam(const std::string_view& key) const;
-	const std::string_view& GetBody();
+  const std::string_view& GetBody() const;
+
+  void OnClose(const std::function<void()>& callback);
 
   void WriteHeader(const std::string_view& name, const std::string_view& value);
   void WriteBody(const std::string_view& body);
@@ -33,6 +37,9 @@ class Request {
   template <typename... Args>
   void WriteBody(const std::string_view& first, Args... more);
 
+  template <typename T>
+  T InTransaction(const std::function<T()>& callback);
+
  private:
   Header OutputHeader();
   iovec OutputVec();
@@ -43,6 +50,8 @@ class Request {
   std::unordered_map<std::string_view, std::string_view> params_;
   std::string_view body_;
 
+  std::function<void()> on_close_;
+
   firebuf::Buffer out_buf_;
   bool body_written_;
   std::recursive_mutex output_mu_;
@@ -55,4 +64,10 @@ void Request::WriteBody(const std::string_view& first, Args... more) {
   WriteBody(more...);
 }
 
+template <typename T>
+T Request::InTransaction(const std::function<T()>& callback) {
+  std::lock_guard<std::recursive_mutex> l(output_mu_);
+  return callback();
+}
+
 }  // namespace firecgi

server.cc

@@ -3,31 +3,63 @@
 #include <netinet/tcp.h>
 #include <signal.h>
 #include <sys/epoll.h>
+#include <sys/eventfd.h>
+#include <sys/resource.h>
 #include <sys/socket.h>
+#include <iomanip>
 #include <thread>
 
-#include "server.h"
+#include "fireusage/usage.h"
+
 #include "connection.h"
+#include "server.h"
 
 namespace firecgi {
 
-Server::Server(int port, const std::function<void(Request*)>& callback, int threads, const std::unordered_set<std::string_view>& headers, int max_request_len)
+Server::Server(int port, const std::function<void(Request*)>& callback,
+               int threads, int max_request_len)
     : port_(port),
       callback_(callback),
       threads_(threads),
-		  headers_(headers),
+      max_request_len_(max_request_len),
-		  max_request_len_(max_request_len) {
+      close_fd_(eventfd(0, 0)) {
-	LOG(INFO) << "listening on [::1]:" << port_;
+  CHECK_GE(close_fd_, 0);
 
+  LOG(INFO) << "listening on [::1]:" << port_;
   signal(SIGPIPE, SIG_IGN);
 }
 
+Server::~Server() { PCHECK(close(close_fd_) == 0); }
+
 void Server::Serve() {
   std::vector<std::thread> threads;
   for (int i = 0; i < threads_ - 1; ++i) {
     threads.emplace_back([this]() { ServeInt(); });
   }
   ServeInt();
+  for (auto& thread : threads) {
+    thread.join();
+  }
+  LOG(INFO) << "all threads shut down";
+}
+
+void Server::Shutdown() {
+  uint64_t shutdown = 1;
+  PCHECK(write(close_fd_, &shutdown, sizeof(shutdown)) == sizeof(shutdown));
+}
+
+namespace {
+Server* shutdown_server = nullptr;
+}  // namespace
+
+void Server::RegisterSignalHandlers() {
+  shutdown_server = this;
+  for (auto sig : {SIGINT, SIGTERM}) {
+    signal(sig, [](int signum) {
+      LOG(INFO) << "received " << strsignal(signum);
+      shutdown_server->Shutdown();
+    });
+  }
 }
 
 void Server::ServeInt() {
@@ -36,16 +68,33 @@ void Server::ServeInt() {
 
   auto listen_sock = NewListenSock();
 
+  char new_conn;
   {
     struct epoll_event ev {
       .events = EPOLLIN,
       .data = {
-				.ptr = nullptr,
+          .ptr = &new_conn,
       },
     };
     PCHECK(epoll_ctl(epoll_fd, EPOLL_CTL_ADD, listen_sock, &ev) == 0);
   }
 
+  char shutdown;
+  {
+    struct epoll_event ev {
+      .events = EPOLLIN,
+      .data = {
+          .ptr = &shutdown,
+      },
+    };
+    PCHECK(epoll_ctl(epoll_fd, EPOLL_CTL_ADD, close_fd_, &ev) == 0);
+  }
+
+  std::unordered_set<Connection*> connections;
+
+  fireusage::UsageTracker usage_tracker;
+  usage_tracker.Start();
+
   while (true) {
     constexpr auto max_events = 256;
     struct epoll_event events[max_events];
@@ -56,13 +105,25 @@ void Server::ServeInt() {
     PCHECK(num_fd > 0) << "epoll_wait()";
 
     for (auto i = 0; i < num_fd; ++i) {
-			if (events[i].data.ptr == nullptr) {
+      if (events[i].data.ptr == &new_conn) {
-				NewConn(listen_sock, epoll_fd);
+        connections.insert(CHECK_NOTNULL(NewConn(listen_sock, epoll_fd)));
+      } else if (events[i].data.ptr == &shutdown) {
+        for (auto& conn : connections) {
+          usage_tracker.AddEvents(conn->Requests());
+          delete conn;
+        }
+        usage_tracker.Stop();
+        PCHECK(close(listen_sock) == 0);
+        PCHECK(close(epoll_fd) == 0);
+        usage_tracker.Log("requests");
+        return;
       } else {
         auto conn = static_cast<Connection*>(events[i].data.ptr);
         auto fd = conn->Read();
         if (fd != -1) {
           PCHECK(epoll_ctl(epoll_fd, EPOLL_CTL_DEL, fd, nullptr) == 0);
+          usage_tracker.AddEvents(conn->Requests());
+          connections.erase(conn);
           delete conn;
         }
       }
@@ -70,19 +131,22 @@ void Server::ServeInt() {
   }
 }
 
-void Server::NewConn(int listen_sock, int epoll_fd) {
+Connection* Server::NewConn(int listen_sock, int epoll_fd) {
   sockaddr_in6 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()";
   CHECK_EQ(client_addr.sin6_family, AF_INET6);
 
   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_, headers_, max_request_len_);
     struct epoll_event ev {
       .events = EPOLLIN,
       .data = {
@@ -91,6 +155,8 @@ void Server::NewConn(int listen_sock, int epoll_fd) {
     };
     PCHECK(epoll_ctl(epoll_fd, EPOLL_CTL_ADD, client_sock, &ev) == 0);
   }
+
+  return conn;
 }
 
 int Server::NewListenSock() {
@@ -99,7 +165,8 @@ int Server::NewListenSock() {
 
   {
     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);
   }
 
   {

server.h

@@ -10,19 +10,25 @@ namespace firecgi {
 
 class Server {
  public:
-	Server(int port, const std::function<void(Request*)>& callback, int threads=1, const std::unordered_set<std::string_view>& headers={}, 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();
+
   void Serve();
+  void Shutdown();
+  void RegisterSignalHandlers();
 
  private:
-	void NewConn(int listen_sock, int epoll_fd);
+  Connection* NewConn(int listen_sock, int epoll_fd);
   int NewListenSock();
   void ServeInt();
 
   const int port_;
   const std::function<void(Request*)> callback_;
   const int threads_;
-	const std::unordered_set<std::string_view> headers_;
   const int max_request_len_;
+
+  int close_fd_;
 };
 
-} // firecgi
+}  // namespace firecgi