fiber executor

motis-project · Nov 29, 2024 · 6ec1ad7 · 6ec1ad7
1 parent 47404be
commit 6ec1ad7
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 27 deletions.
diff --git a/.pkg b/.pkg
@@ -45,7 +45,7 @@
 [boost]
   [email protected]:motis-project/boost.git
   branch=boost-1.86.0
-  commit=930f38eb0365ceb7853273e03da4d9e7787abfb9
+  commit=082a2d83c827e43f3b7eb8d6f0a1102cddb897ad
 [tg]
   [email protected]:triptix-tech/tg.git
   branch=main

diff --git a/.pkg.lock b/.pkg.lock
@@ -1,7 +1,7 @@
-6176226545254116619
+8748848983185993664
 cista 847b27100b7e730370b810ce62206a66b0bf2d79
 zlib-ng 68ab3e2d80253ec5dc3c83691d9ff70477b32cd3
-boost 930f38eb0365ceb7853273e03da4d9e7787abfb9
+boost 082a2d83c827e43f3b7eb8d6f0a1102cddb897ad
 googletest 7b64fca6ea0833628d6f86255a81424365f7cc0c
 mimalloc e2f4fe647e8aff4603a7d5119b8639fd1a47c8a6
 libressl 24acd9e710fbe842e863572da9d738715fbc74b8

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -113,6 +113,7 @@ target_link_libraries(motislib
     osr
     adr
     boost-json
+    Boost::fiber
     motis-api
     reflectcpp
     web-server

diff --git a/include/motis/journey_to_response.h b/include/motis/journey_to_response.h
@@ -41,6 +41,6 @@ api::Itinerary journey_to_response(osr::ways const*,
                                    place_t const& start,
                                    place_t const& dest,
                                    street_routing_cache_t&,
-                                   osr::bitvec<osr::node_idx_t>& blocked_mem);
+                                   osr::bitvec<osr::node_idx_t>* blocked_mem);
 
 }  // namespace motis
diff --git a/include/motis/street_routing.h b/include/motis/street_routing.h
@@ -37,7 +37,7 @@ api::Itinerary route(osr::ways const&,
                      std::optional<nigiri::unixtime_t> end_time,
                      gbfs_provider_idx_t,
                      street_routing_cache_t&,
-                     osr::bitvec<osr::node_idx_t>& blocked_mem,
+                     osr::bitvec<osr::node_idx_t>* blocked_mem,
                      std::chrono::seconds max = std::chrono::seconds{3600});
 
 }  // namespace motis
diff --git a/src/endpoints/routing.cc b/src/endpoints/routing.cc
@@ -245,7 +245,7 @@ std::pair<std::vector<api::Itinerary>, n::duration_t> routing::route_direct(
         (!omit_walk && m == api::ModeEnum::WALK)) {
       auto itinerary = route(
           *w_, *l_, gbfs, e, from, to, m, wheelchair, start_time, std::nullopt,
-          gbfs_provider_idx_t::invalid(), cache, *blocked, max);
+          gbfs_provider_idx_t::invalid(), cache, blocked.get(), max);
       if (itinerary.legs_.empty()) {
         continue;
       }
@@ -265,7 +265,7 @@ std::pair<std::vector<api::Itinerary>, n::duration_t> routing::route_direct(
       for (auto const& pi : providers) {
         auto itinerary =
             route(*w_, *l_, gbfs, e, from, to, m, wheelchair, start_time,
-                  std::nullopt, pi, cache, *blocked, max);
+                  std::nullopt, pi, cache, blocked.get(), max);
         if (itinerary.legs_.empty()) {
           continue;
         }
@@ -516,7 +516,7 @@ api::plan_response routing::operator()(boost::urls::url_view const& url) const {
               return journey_to_response(w_, l_, pl_, *tt_, *tags_, e, rtt,
                                          matches_, shapes_, gbfs.get(),
                                          query.wheelchair_, j, start, dest,
-                                         cache, *blocked);
+                                         cache, blocked.get());
             }),
         .previousPageCursor_ =
             fmt::format("EARLIER|{}", to_seconds(r.interval_.from_)),

diff --git a/src/endpoints/trip.cc b/src/endpoints/trip.cc
@@ -33,8 +33,6 @@ api::Itinerary trip::operator()(boost::urls::url_view const& url) const {
   auto const start_time = from_l.time(n::event_type::kDep);
   auto const dest_time = to_l.time(n::event_type::kArr);
   auto cache = street_routing_cache_t{};
-  auto blocked = osr::bitvec<osr::node_idx_t>{};
-
   return journey_to_response(
       w_, l_, pl_, tt_, tags_, nullptr, rtt, matches_, shapes_, nullptr, false,
       {.legs_ = {n::routing::journey::leg{
@@ -49,7 +47,7 @@ api::Itinerary trip::operator()(boost::urls::url_view const& url) const {
        .transfers_ = 0U},
       tt_location{from_l.get_location_idx(),
                   from_l.get_scheduled_location_idx()},
-      tt_location{to_l.get_location_idx()}, cache, blocked);
+      tt_location{to_l.get_location_idx()}, cache, nullptr);
 }
 
 }  // namespace motis::ep
diff --git a/src/journey_to_response.cc b/src/journey_to_response.cc
@@ -55,7 +55,7 @@ api::Itinerary journey_to_response(osr::ways const* w,
                                    place_t const& start,
                                    place_t const& dest,
                                    street_routing_cache_t& cache,
-                                   osr::bitvec<osr::node_idx_t>& blocked_mem) {
+                                   osr::bitvec<osr::node_idx_t>* blocked_mem) {
   utl::verify(!j.legs_.empty(), "journey without legs");
 
   auto itinerary = api::Itinerary{

diff --git a/src/server.cc b/src/server.cc
@@ -35,6 +35,7 @@
 
 namespace fs = std::filesystem;
 namespace asio = boost::asio;
+namespace bf = boost::fibers;
 
 namespace motis {
 
@@ -54,9 +55,9 @@ void POST(auto&& r, std::string target, From& from) {
 
 int server(data d, config const& c) {
   auto ioc = asio::io_context{};
-  auto workers = asio::io_context{};
   auto s = net::web_server{ioc};
-  auto qr = net::query_router{net::asio_exec(ioc, workers)};
+  auto ch = net::fiber_exec::channel_t{2048U};
+  auto qr = net::query_router{net::fiber_exec(ioc, ch)};
 
   POST<ep::matches>(qr, "/api/matches", d);
   POST<ep::elevators>(qr, "/api/elevators", d);
@@ -101,7 +102,7 @@ int server(data d, config const& c) {
   if (c.requires_rt_timetable_updates()) {
     rt_update_ioc = std::make_unique<asio::io_context>();
     rt_update_thread = std::make_unique<std::thread>([&]() {
-      utl::set_current_thread_name("rt update");
+      utl::set_current_thread_name("motis rt update");
       run_rt_update(*rt_update_ioc, c, *d.tt_, *d.tags_, d.rt_);
       rt_update_ioc->run();
     });
@@ -112,18 +113,17 @@ int server(data d, config const& c) {
   if (d.w_ && d.l_ && c.has_gbfs_feeds()) {
     gbfs_update_ioc = std::make_unique<asio::io_context>();
     gbfs_update_thread = std::make_unique<std::thread>([&]() {
-      utl::set_current_thread_name("gbfs update");
+      utl::set_current_thread_name("motis gbfs update");
       gbfs::run_gbfs_update(*gbfs_update_ioc, c, *d.w_, *d.l_, d.gbfs_);
       gbfs_update_ioc->run();
     });
   }
 
-  auto const work_guard = asio::make_work_guard(workers);
   auto threads = std::vector<std::thread>(
       static_cast<unsigned>(std::max(1U, server_config.n_threads_)));
   for (auto [i, t] : utl::enumerate(threads)) {
-    t = std::thread(net::run(workers));
-    utl::set_thread_name(t, fmt::format("worker {}", i));
+    t = std::thread(net::fiber_exec::run(ch, server_config.n_threads_));
+    utl::set_thread_name(t, fmt::format("motis worker {}", i));
   }
 
   auto const stop = net::stop_handler(ioc, [&]() {
@@ -143,7 +143,7 @@ int server(data d, config const& c) {
                server_config.host_, server_config.port_, server_config.port_);
   net::run(ioc)();
 
-  workers.stop();
+  ch.close();
   for (auto& t : threads) {
     t.join();
   }

diff --git a/src/street_routing.cc b/src/street_routing.cc
@@ -28,7 +28,7 @@ std::optional<osr::path> get_path(osr::ways const& w,
                                   nigiri::unixtime_t const start_time,
                                   osr::cost_t const max,
                                   street_routing_cache_t& cache,
-                                  osr::bitvec<osr::node_idx_t>& blocked_mem) {
+                                  osr::bitvec<osr::node_idx_t>* blocked_mem) {
   auto const s = e ? get_states_at(w, l, *e, start_time, from.pos_)
                    : std::optional{std::pair<nodes_t, states_t>{}};
   auto const& [e_nodes, e_states] = *s;
@@ -38,11 +38,12 @@ std::optional<osr::path> get_path(osr::ways const& w,
   auto const path =
       it != end(cache)
           ? it->second
-          : osr::route(
-                w, l, profile, from, to, max, osr::direction::kForward,
-                kMaxMatchingDistance,
-                s ? &set_blocked(e_nodes, e_states, blocked_mem) : nullptr,
-                sharing);
+          : osr::route(w, l, profile, from, to, max, osr::direction::kForward,
+                       kMaxMatchingDistance,
+                       s && blocked_mem
+                           ? &set_blocked(e_nodes, e_states, *blocked_mem)
+                           : nullptr,
+                       sharing);
   if (it == end(cache)) {
     cache.emplace(std::pair{key, path});
   }
@@ -213,7 +214,7 @@ api::Itinerary route(osr::ways const& w,
                      std::optional<n::unixtime_t> const end_time,
                      gbfs_provider_idx_t const provider_idx,
                      street_routing_cache_t& cache,
-                     osr::bitvec<osr::node_idx_t>& blocked_mem,
+                     osr::bitvec<osr::node_idx_t>* blocked_mem,
                      std::chrono::seconds const max) {
   auto const profile = to_profile(mode, wheelchair);
   utl::verify(profile != osr::search_profile::kBikeSharing || gbfs != nullptr,