thebestvibedev/tromcho.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not use unordered_map for list_ops/list_results

Browse Source
This commit is contained in:
Vitaliy Filippov
2020-10-17 23:30:16 +00:00
parent c696a82083
commit 5335c8de8e
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osd_peering.cpp
+2 -4
View File
@@ -220,8 +220,7 @@ void osd_t::start_pg_peering(pg_t & pg)
{ {
// Discard the result after completion, which, chances are, will be unsuccessful // Discard the result after completion, which, chances are, will be unsuccessful
discard_list_subop(it->second); discard_list_subop(it->second);
pg.peering_state->list_ops.erase(it); pg.peering_state->list_ops.erase(it++);
it = pg.peering_state->list_ops.begin();
} }
else else
it++; it++;
@@ -234,8 +233,7 @@ void osd_t::start_pg_peering(pg_t & pg)
{ {
free(it->second.buf); free(it->second.buf);
} }
pg.peering_state->list_results.erase(it); pg.peering_state->list_results.erase(it++);
it = pg.peering_state->list_results.begin();
} }
else else
it++; it++;
osd_peering_pg.cpp
+1
View File
@@ -1,6 +1,7 @@
// Copyright (c) Vitaliy Filippov, 2019+ // Copyright (c) Vitaliy Filippov, 2019+
// License: VNPL-1.0 (see README.md for details) // License: VNPL-1.0 (see README.md for details)
#include <unordered_map>
#include "osd_peering_pg.h" #include "osd_peering_pg.h"
struct obj_ver_role struct obj_ver_role
osd_peering_pg.h
+2 -3
View File
@@ -2,7 +2,6 @@
// License: VNPL-1.0 (see README.md for details) // License: VNPL-1.0 (see README.md for details)
#include <map> #include <map>
#include <unordered_map>
#include <vector> #include <vector>
#include <algorithm> #include <algorithm>
@@ -45,8 +44,8 @@ struct osd_op_t;
struct pg_peering_state_t struct pg_peering_state_t
{ {
// osd_num -> list result // osd_num -> list result
std::unordered_map<osd_num_t, osd_op_t*> list_ops; std::map<osd_num_t, osd_op_t*> list_ops;
std::unordered_map<osd_num_t, pg_list_result_t> list_results; std::map<osd_num_t, pg_list_result_t> list_results;
pool_id_t pool_id = 0; pool_id_t pool_id = 0;
pg_num_t pg_num = 0; pg_num_t pg_num = 0;
}; };