修正io线程死锁检测不工作的问题。v4.6.50-20230905

1 files changed, 2 insertions, 19 deletions

diff --git a/app/src/marsio.c b/app/src/marsio.c
index 0ea11fe..72b48cf 100644
--- a/app/src/marsio.c
+++ b/app/src/marsio.c
@@ -564,10 +564,9 @@ static void mp_cache_init_for_each_mp(struct rte_mempool * mp, void * arg)
     }
 }
 
-static int mpapp_mp_cache_init(struct mr_instance * instance)
+static void mpapp_mp_cache_init(struct mr_instance * instance)
 {
     rte_mempool_walk(mp_cache_init_for_each_mp, (void *)instance);
-    return 0;
 }
 
 /* 注册应用 */
@@ -685,17 +684,6 @@ static int __ctrlplane_conn_close_handler(struct ctrlmsg_handler * ct_hand, stru
     exit(EXIT_FAILURE);
 }
 
-static void __open_device_unposion(struct vdev_instance * vdi)
-{
-    MR_ASAN_UNPOISON_MEMORY_REGION(vdi, sizeof(struct vdev_instance));
-    MR_ASAN_UNPOISON_MEMORY_REGION(vdi->vdev, sizeof(struct vdev));
-
-    vnode_mirror_unpoison_cons(vdi->vnode_rx_cons);
-    vnode_mirror_unpoison_prod(vdi->vnode_tx_prod);
-    vnode_mirror_unpoison_prod(vdi->vnode_ftx_prod);
-    vnode_mirror_unpoison_prod(vdi->vnode_ltx_prod);
-}
-
 #if 0
 static int __open_device_response_handler(struct ctrlmsg_handler * ct_hand,
     struct ctrlmsg_conn * ct_conn, struct ctrl_msg_header * msg, void * arg)
@@ -1038,12 +1026,7 @@ int marsio_init(struct mr_instance * instance, const char * appsym)
     }
 
     /* local mp cache */
-    if (mpapp_mp_cache_init(instance) != RT_SUCCESS)
-    {
-        MR_ERROR("Local mempool cache initialization failed.");
-        goto err;
-    }
-
+    mpapp_mp_cache_init(instance);
     pthread_t pid_ctrlplane_thread;
     int ret = pthread_create(&pid_ctrlplane_thread, NULL, mrapp_ctrlplane_thread, instance);
     if (ret < 0)