OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#9563 Reorganize how and when objects are deleted when shutting down GRPC

Browse Source
This commit is contained in:
Magne Sjaastad 2022-12-11 09:52:55 +01:00
parent 7cb6c587c1
commit cfa9d07d8e
1 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
GrpcInterface/RiaGrpcServer.cpp
View File

@ -208,13 +208,9 @@ void RiaGrpcServerImpl::quit()
if ( m_server )
{
RiaLogging::info( "Shutting down gRPC server" );
// Clear unhandled requests
while ( !m_unprocessedRequests.empty() )
{
RiaGrpcCallbackInterface* method = m_unprocessedRequests.front();
m_unprocessedRequests.pop_front();
delete method;
}
// See the following link for details on how to shut down a GRPC server
// https://github.com/grpc/grpc/blob/master/include/grpcpp/server_builder.h#L147
// Shutdown server and queue
m_server->Shutdown();
@ -223,16 +219,41 @@ void RiaGrpcServerImpl::quit()
// Wait for thread to join after handling the shutdown call
m_thread.join();
// Drain the completion queue
void* ignored_tag;
bool ignored_ok;
while ( m_completionQueue->Next( &ignored_tag, &ignored_ok ) )
{
}
{
// Create a set of callbacks to be deleted. The same object may be present in both unprocessed and
// allocated. Delete the callbacks before deleting the server and completion queue to avoid crash.
std::set<RiaGrpcCallbackInterface*> toBeDeleted;
for ( auto r : m_unprocessedRequests )
{
toBeDeleted.insert( r );
}
for ( auto r : m_allocatedCallbakcs )
{
toBeDeleted.insert( r );
}
m_unprocessedRequests.clear();
m_allocatedCallbakcs.clear();
for ( auto r : toBeDeleted )
{
delete r;
}
}
// Must destroy server before services
m_server.reset();
m_completionQueue.reset();
for ( auto c : m_allocatedCallbakcs )
{
delete c;
}
m_allocatedCallbakcs.clear();
// Finally clear services
m_services.clear();
}