Merge branch '2.3' into 2.4

This commit is contained in:
Markus Mäkelä
2020-06-05 08:36:07 +03:00

View File

@ -1096,7 +1096,7 @@ std::unique_ptr<json_t> RoutingWorker::get_qc_stats_as_json(const char* zHost)
// static // static
RoutingWorker* RoutingWorker::pick_worker() RoutingWorker* RoutingWorker::pick_worker()
{ {
static int id_generator = 0; static uint32_t id_generator = 0;
int id = this_unit.id_min_worker int id = this_unit.id_min_worker
+ (mxb::atomic::add(&id_generator, 1, mxb::atomic::RELAXED) % this_unit.nWorkers); + (mxb::atomic::add(&id_generator, 1, mxb::atomic::RELAXED) % this_unit.nWorkers);
return get(id); return get(id);