Use mutex to protect the sessions context list

Signed-off-by: Kasiewicz, Marek <marek.kasiewicz@intel.com>
OpenVisualCloud · Nov 19, 2024 · d3824ee · d3824ee
1 parent 9a5c536
commit d3824ee
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/media-proxy/include/proxy_context.h b/media-proxy/include/proxy_context.h
@@ -17,6 +17,7 @@
 
 #include "session-mtl.h"
 #include "session-rdma.h"
+#include <mutex>
 
 #pragma once
 
@@ -34,6 +35,7 @@ class ProxyContext {
     std::vector<Session *> mDpCtx;
     mtl_handle mDevHandle = NULL;
     libfabric_ctx *mDevHandle_rdma = NULL;
+    std::mutex ctx_mtx;
 
     bool imtl_init_preparing;
     pthread_mutex_t mutex_lock;

diff --git a/media-proxy/src/api_server_tcp.cc b/media-proxy/src/api_server_tcp.cc
@@ -126,11 +126,13 @@ void* msg_loop(void* ptr)
             /* TODO: return memdif ID */
             break;
         case MCM_QUERY_MEMIF_PARAM:
+        {
             DEBUG("MCM_QUERY_MEMIF_PARAM: Case entry.");
             if (buffer == NULL || msg.command.data_len < 4) {
                 INFO("Invalid parameters.");
                 break;
             }
+            std::lock_guard<std::mutex> lock(proxy_ctx->ctx_mtx);
             session_id = *(uint32_t*)buffer;
             for (auto it : proxy_ctx->mDpCtx) {
                 if (it->get_id() == session_id) {
@@ -152,7 +154,8 @@ void* msg_loop(void* ptr)
                     break;
                 }
             }
-            break;
+        break;
+        }
         case MCM_DESTROY_SESSION:
             DEBUG("MCM_DESTROY_SESSION: Case entry.");
             if (buffer == NULL || msg.command.data_len < 4) {

diff --git a/media-proxy/src/proxy_context.cc b/media-proxy/src/proxy_context.cc
@@ -186,6 +186,7 @@ int ProxyContext::RxStart_rdma(const mcm_conn_param *request)
     }
 
     INFO("%s, session id: %d", __func__, session_ptr->get_id());
+    std::lock_guard<std::mutex> lock(ctx_mtx);
     mDpCtx.push_back(session_ptr);
     return session_ptr->get_id();
 }
@@ -251,6 +252,7 @@ int ProxyContext::RxStart_mtl(const mcm_conn_param *request)
     }
 
     INFO("%s, session id: %d", __func__, session_ptr->get_id());
+    std::lock_guard<std::mutex> lock(ctx_mtx);
     mDpCtx.push_back(session_ptr);
     return session_ptr->get_id();
 }
@@ -287,6 +289,7 @@ int ProxyContext::TxStart_rdma(const mcm_conn_param *request)
     }
 
     INFO("%s, session id: %d", __func__, session_ptr->get_id());
+    std::lock_guard<std::mutex> lock(ctx_mtx);
     mDpCtx.push_back(session_ptr);
     return session_ptr->get_id();
 }
@@ -351,6 +354,7 @@ int ProxyContext::TxStart_mtl(const mcm_conn_param *request)
     }
 
     INFO("%s, session id: %d", __func__, session_ptr->get_id());
+    std::lock_guard<std::mutex> lock(ctx_mtx);
     mDpCtx.push_back(session_ptr);
     return session_ptr->get_id();
 }
@@ -366,6 +370,7 @@ int ProxyContext::TxStart(const mcm_conn_param *request)
 int ProxyContext::Stop(const int32_t session_id)
 {
     int ret = 0;
+    std::lock_guard<std::mutex> lock(ctx_mtx);
     auto ctx = std::find_if(mDpCtx.begin(), mDpCtx.end(),
                             [session_id](auto it) { return it->get_id() == session_id; });
     if (ctx != mDpCtx.end()) {