Skip to content

Fix bmp crash by putting rBMP in context for try..catch for client_thread.cpp #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fkong-cisco wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix bmp crash by putting rBMP in context for try..catch for client_thread.cpp #33

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7723ca1
Add PR body template and instructions for upstream sonic-net/sonic-bm…
fkong-cisco Mar 13, 2026
a0a49bf
Move BMPReader rBMP above try block for correct scope
fkong-cisco Mar 13, 2026
665c719
Update PR body and instructions for upstream PR
fkong-cisco Mar 13, 2026
c71ffeb
remove md
fkong-cisco Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions Server/src/client_thread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ void *ClientThread(void *arg) {
*/
pthread_cleanup_push(ClientThread_cancel, &cInfo);

/*
* moved rBMP here to keep it in context for the try ... catch
*/
BMPReader rBMP(logger, thr->cfg);

try {
#ifndef REDIS_ENABLED
// connect to message bus
Expand All @@ -108,7 +113,7 @@ void *ClientThread(void *arg) {
cInfo.redis = std::make_shared<MsgBusImpl_redis>(logger, thr->cfg, cInfo.client);
cInfo.redis->ResetAllTables();
#endif
BMPReader rBMP(logger, thr->cfg);
//BMPReader rBMP(logger, thr->cfg); --- moved up to keep rBMP in context
LOG_INFO("Thread started to monitor BMP from router %s using socket %d buffer in bytes = %u",
cInfo.client->c_ip, cInfo.client->c_sock, thr->cfg->bmp_buffer_size);

Expand All @@ -122,7 +127,7 @@ void *ClientThread(void *arg) {
*/
bool bmp_run = true;
#ifndef REDIS_ENABLED
//cInfo.bmp_reader_thread = new std::thread([&] {rBMP.readerThreadLoop(bmp_run,cInfo.client,
//cInfo.bmp_reader_thread = new std::thread([&] rBMP.readerThreadLoop(bmp_run,cInfo.client,
cInfo.bmp_reader_thread = new std::thread(&BMPReader::readerThreadLoop, &rBMP, std::ref(bmp_run), cInfo.client,
(MsgBusInterface *)cInfo.mbus );
#else
Expand Down