proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-04-29 15:51:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: grpc: use candiate ID to delete rather than pointer to candiate

Browse Source 
- also be consistent in candidate IDs being uint64_t

Signed-off-by: Christian Hopps <chopps@labn.net>
This commit is contained in:
Christian Hopps 2022-03-06 06:59:50 -05:00
parent 79c681952e
commit d3074a5207
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/northbound_grpc.cpp
View File

@ -78,7 +78,7 @@ class Candidates
{ {
// Delete candidates. // Delete candidates.
for (auto it = _cdb.begin(); it != _cdb.end(); it++) for (auto it = _cdb.begin(); it != _cdb.end(); it++)
delete_candidate(&it->second); delete_candidate(it->first);
} }
struct candidate *create_candidate(void) struct candidate *create_candidate(void)
@ -94,8 +94,14 @@ class Candidates
return c; return c;
} }
void delete_candidate(struct candidate *c) bool contains(uint64_t candidate_id)
{ {
return _cdb.count(candidate_id) > 0;
}
void delete_candidate(uint64_t candidate_id)
{
struct candidate *c = &_cdb[candidate_id];
char errmsg[BUFSIZ] = {0}; char errmsg[BUFSIZ] = {0};
nb_config_free(c->config); nb_config_free(c->config);
@ -105,14 +111,14 @@ class Candidates
_cdb.erase(c->id); _cdb.erase(c->id);
} }
struct candidate *get_candidate(uint32_t id) struct candidate *get_candidate(uint64_t id)
{ {
return _cdb.count(id) == 0 ? NULL : &_cdb[id]; return _cdb.count(id) == 0 ? NULL : &_cdb[id];
} }
private: private:
uint64_t _next_id = 0; uint64_t _next_id = 0;
std::map<uint32_t, struct candidate> _cdb; std::map<uint64_t, struct candidate> _cdb;
}; };
class RpcStateBase class RpcStateBase
@ -183,6 +189,9 @@ template <typename Q, typename S> class NewRpcState : RpcStateBase
pthread_cond_wait(&this->cond, &this->cmux); pthread_cond_wait(&this->cond, &this->cmux);
pthread_mutex_unlock(&this->cmux); pthread_mutex_unlock(&this->cmux);
if (enter_state == FINISH)
assert(this->state == DELETED);
if (this->state == DELETED) { if (this->state == DELETED) {
grpc_debug("%s RPC: -> [DELETED]", name); grpc_debug("%s RPC: -> [DELETED]", name);
delete this; delete this;
@ -617,15 +626,14 @@ void HandleUnaryDeleteCandidate(NewRpcState<frr::DeleteCandidateRequest,
grpc_debug("%s(candidate_id: %u)", __func__, candidate_id); grpc_debug("%s(candidate_id: %u)", __func__, candidate_id);
struct candidate *candidate = tag->cdb->get_candidate(candidate_id); if (!tag->cdb->contains(candidate_id)) {
if (!candidate) {
tag->responder.Finish( tag->responder.Finish(
tag->response, tag->response,
grpc::Status(grpc::StatusCode::NOT_FOUND, grpc::Status(grpc::StatusCode::NOT_FOUND,
"candidate configuration not found"), "candidate configuration not found"),
tag); tag);
} else { } else {
tag->cdb->delete_candidate(candidate); tag->cdb->delete_candidate(candidate_id);
tag->responder.Finish(tag->response, grpc::Status::OK, tag); tag->responder.Finish(tag->response, grpc::Status::OK, tag);
} }
tag->state = FINISH; tag->state = FINISH;