log work

Author: vinniefalco

example/server/http_responder.hpp

@@ -37,7 +37,8 @@ class http_responder
     http_responder(
         server& srv,
         router_type& rr)
-        : id_(
+        : sect_(srv.sections().get("http_responder"))
+        , id_(
             []() noexcept
             {
                 static std::size_t n = 0;

include/boost/http_io/server/impl/workers.hpp

@@ -66,6 +66,7 @@ workers(
     std::size_t num_workers,
     Args&&... args)
     : srv_(srv)
+    , sect_(srv.sections().get("workers"))
     , ex_(ex)
     , vw_(num_workers)
     , concurrency_(concurrency)

include/boost/http_io/server/logger.hpp

@@ -12,14 +12,24 @@
 
 #include <boost/http_io/detail/config.hpp>
 #include <boost/core/detail/string_view.hpp>
+#include <memory>
 #include <sstream>
+#include <string>
 
 namespace boost {
 namespace http_io {
 
 struct section
 {
-    int threshold() const noexcept { return 0; }
+    BOOST_HTTP_IO_DECL
+    section() noexcept;
+
+    /** Return the level below which logging is squelched
+    */
+    int threshold() const noexcept
+    {
+        return impl_->level;
+    }
 
     template<class... Args>
     void operator()(
@@ -72,6 +82,18 @@ struct section
 
     BOOST_HTTP_IO_DECL
     void write(int, boost::core::string_view);
+
+    section(core::string_view);
+
+    friend class log_sections;
+
+    struct impl
+    {
+        std::string name;
+        int level = 0;
+    };
+
+    std::shared_ptr<impl> impl_;
 };
 
 //------------------------------------------------
@@ -103,7 +125,6 @@ class log_stream
 
 //------------------------------------------------
 
-#if 0
 class log_sections
 {
 public:
@@ -130,7 +151,6 @@ class log_sections
     struct impl;
     impl* impl_;
 };
-#endif
 
 //------------------------------------------------
 

include/boost/http_io/server/server.hpp

@@ -18,6 +18,8 @@
 namespace boost {
 namespace http_io {
 
+class log_sections;
+
 /** A generic server interface
 
     In this model a server contains zero or more parts, where each part
@@ -73,6 +75,9 @@ class BOOST_SYMBOL_VISIBLE
     BOOST_HTTP_IO_DECL
     rts::context& services() noexcept;
 
+    BOOST_HTTP_IO_DECL
+    log_sections& sections() noexcept;
+
     BOOST_HTTP_IO_DECL
     void install(std::unique_ptr<part> pp);
 

include/boost/http_io/server/workers.hpp

@@ -115,12 +115,12 @@ class workers
     void do_stop();
 
     http_io::server& srv_;
+    section sect_;
     Executor ex_;
     fixed_array<worker> vw_;
     std::vector<acceptor> va_;
     worker* idle_ = nullptr;
     std::size_t n_idle_ = 0;
-    section sect_;
     unsigned concurrency_;
 };
 

src/server/logger.cpp

@@ -10,10 +10,14 @@
 #include <boost/http_io/server/logger.hpp>
 #include <iostream>
 #include <mutex>
+#include <unordered_map>
 
 namespace boost {
 namespace http_io {
 
+section::
+section() noexcept = default;
+
 void
 section::
 write(
@@ -36,7 +40,8 @@ format_impl(
     std::size_t* plen,
     std::size_t n)
 {
-    std::string s;
+    std::string s = impl_->name;
+    s.push_back(' ');
     char const* p = fs.data();
     char const* end = fs.data() + fs.size();
     auto p0 = p;
@@ -63,5 +68,55 @@ format_impl(
     write(level, s);
 }
 
+section::
+section(core::string_view name)
+    : impl_(std::make_shared<impl>())
+{
+    impl_->name = name;
+}
+
+//------------------------------------------------
+
+struct log_sections::impl
+{
+    struct hash
+    {
+        std::size_t
+        operator()(core::string_view const& s) const noexcept
+        {
+            std::size_t hash = 1469598103934665603ull; // FNV offset basis
+            for (unsigned char c : s)
+                hash ^= c, hash *= 1099511628211ull;   // FNV prime
+            return hash;
+        }
+    };
+
+    std::unordered_map<core::string_view, section, hash> map;
+};
+
+log_sections::
+~log_sections()
+{
+    delete impl_;
+}
+
+log_sections::
+log_sections()
+    : impl_(new impl)
+{
+}
+
+section
+log_sections::
+get(core::string_view name)
+{
+    auto it = impl_->map.find(name);
+    if(it != impl_->map.end())
+        return it->second;
+    auto v = section(name);
+    impl_->map.emplace( core::string_view(v.impl_->name), v);
+    return v;
+}
+
 } // http_io
 } // boost

src/server/server.cpp

@@ -7,6 +7,7 @@
 // Official repository: https://github.com/cppalliance/http_io
 //
 
+#include <boost/http_io/server/logger.hpp>
 #include <boost/http_io/server/server.hpp>
 #include <boost/http_io/detail/except.hpp>
 #include <mutex>
@@ -28,6 +29,7 @@ struct server::impl
 {
     std::mutex m;
     rts::context services;
+    log_sections sections;
     std::vector<std::unique_ptr<part>> v;
     state st = state::none;
 };
@@ -62,6 +64,13 @@ services() noexcept
     return impl_->services;
 }
 
+log_sections&
+server::
+sections() noexcept
+{
+    return impl_->sections;
+}
+
 void
 server::
 install(std::unique_ptr<part> pp)