UPD | plan

Author: xiadnoring

main.cpp

@@ -126,7 +126,6 @@ int main() {
             db->add_slave(std::move(slave)).unwrap();
 
             manapi::unwrap(co_await route.config(manapi::fs::path::join(".", "config.json")));
-            manapi::unwrap(co_await route.start ());
         });
 
         cb();

src/ManapiErrors.cpp

@@ -9,6 +9,17 @@
 #include "std/ManapiAsyncContext.hpp"
 #include "./include/ManapiUtils.hpp"
 
+struct manapi_errors_string_hash
+{
+    using hash_type = std::hash<std::string_view>;
+    using is_transparent = void;
+
+    std::size_t operator()(const char* str) const        { return hash_type{}(str); }
+    std::size_t operator()(std::string_view str) const   { return hash_type{}(str); }
+    std::size_t operator()(std::string const& str) const { return hash_type{}(str); }
+};
+
+
 static const char* level_strings[] = {
     "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "FATAL"
 };
@@ -28,19 +39,17 @@ static int log_trace_enabled = -1;
 
 static std::mutex log_mx;
 
-static std::unordered_map <std::string_view, std::unique_ptr <char, manapi::ev::chars_deleter>> log_names_enabled;
+static std::unordered_set<std::string, manapi_errors_string_hash, std::equal_to<>> log_names_enabled;
 
 void manapi::debug::set_log_name_enabled(const char *name, bool enabled) {
     if (enabled) {
-        auto const len = ::strlen(name);
-        std::unique_ptr<char, manapi::ev::chars_deleter> data( new char (len + 1));
-        ::strcpy(data.get(), name);
-        data.get()[len] = '\0';
-        std::string_view sv (data.get(), len);
-        log_names_enabled.insert({sv, std::move(data)});
+        log_names_enabled.insert(std::string(name));
+    }
+    else {
+        auto it = log_names_enabled.find(std::string_view(name));
+        if (it != log_names_enabled.end())
+            log_names_enabled.erase(it);
     }
-    else
-        log_names_enabled.erase(std::string_view(name));
 }
 
 void manapi::debug::set_log_trace_enabled (int value) MANAPIHTTP_NOEXCEPT {

src/ManapiHttp.cpp

@@ -38,6 +38,10 @@ struct manapi::net::http::server::data2_t : manapi::net::http::site::data_t {
     async::promise_sync<void>::resolve_t resolve_stop;
     std::shared_ptr<ev::async> init_watcher;
     uint8_t flags;
+
+    ~data2_t () {
+        std::cout << "OH NO\n";
+    }
 };
 
 manapi::net::http::server::server() : site() {
@@ -151,8 +155,6 @@ manapi::future<manapi::status> manapi::net::http::server::stop() {
 
         // короч. мне лень. это проблема не сегодняшнего меня
 
-        async::current()->eventloop()->unsubscribe_finish(std::exchange(data->event_id, 0));
-        async::current()->eventloop()->unsubscribe_clean_up(std::exchange(data->clean_up_id, 0));
 
         co_await stop_pool(data);
 
@@ -195,6 +197,9 @@ manapi::future<manapi::status> manapi::net::http::server::stop() {
         if (data->flags & MANAPI_HTTP_SERVER_FLAG_RUNNING)
             data->flags ^= MANAPI_HTTP_SERVER_FLAG_RUNNING;
 
+        async::current()->eventloop()->unsubscribe_finish(std::exchange(data->event_id, 0));
+        async::current()->eventloop()->unsubscribe_clean_up(std::exchange(data->clean_up_id, 0));
+
         co_return status_ok();
     }
     catch (std::exception const &e) {

src/http/ManapiSite.cpp

@@ -290,7 +290,7 @@ manapi::future<manapi::status> manapi::net::http::site::config(std::string path)
             co_return status_already_exists("http:config already exists");
 
 
-        this->data->event_id = async::current()->eventloop()->subscribe_finish(-1, [p, data = this->data] () mutable
+        this->data->event_id = async::current()->eventloop()->subscribe_finish(-1, [p] () mutable
             -> future<> {
             auto res = co_await p->stop();
             manapi_log_trace(manapi::debug::LOG_TRACE_HIGH, "http:Stop status=%.*s", res.msg().size(), res.msg().data());

src/worker/ManapiHttp3Cloudflare.cpp

@@ -41,7 +41,7 @@ enum http_v3_stream_flags {
 };
 
 struct manapi::net::worker::http_v3_cloudflare_quiche::connection_t {
-    std::string_view cid;
+    std::string cid;
     int flags;
     http_v3_cloudflare_quiche *worker;
     quiche_conn *conn;
@@ -734,7 +734,7 @@ void manapi::net::worker::http_v3_cloudflare_quiche::onrecv(const std::shared_pt
         try {
             std::string conn_id{dcid, dcid_len};
 
-            auto p = std::make_unique<connection_t>(std::string_view{conn_id}, 0, this, quiche_conn_, nullptr, std::map<int64_t, shared_conn>{});
+            auto p = std::make_unique<connection_t>(conn_id, 0, this, quiche_conn_, nullptr, std::map<int64_t, shared_conn>{});
             connection = std::shared_ptr<worker::connection> (new worker::connection{p.release()}, connection_interface_eraser);
 
             conn_data = connection->as<connection_t>();