Merge branch 'main' of github.com:microsoft/dpdpu

microsoft · Dec 14, 2023 · 8d53994 · 8d53994
2 parents 85cbadb + 3da61bc
commit 8d53994
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 28 deletions.
diff --git a/DPDPU/Common/Source/DPU/FileService.c b/DPDPU/Common/Source/DPU/FileService.c
@@ -248,6 +248,7 @@ StartFileServiceWrapper(
 
     printf("starting FS, StartSPDKFileService()...\n");
     spdk_app_start(&opts, StartSPDKFileService, StartCtx);
+    printf("spdk_app_start returns\n");
     return NULL;
 }
 

diff --git a/DPDPU/NetworkEngine/Source/PEPOTLDKTCP.c b/DPDPU/NetworkEngine/Source/PEPOTLDKTCP.c
@@ -3659,26 +3659,6 @@ PEPOLcoreMain(
     return result;
 }
 
-//
-// Storage engine execution
-//
-//
-typedef struct {
-    void (*StorageEngine)(void*);
-    void* StorageEngineArg;
-} StorageEngineT;
-
-static int
-StorageEngineThread(
-    void *Arg
-) {
-    StorageEngineT* sEng = (StorageEngineT*)Arg;
-
-    sEng->StorageEngine(sEng->StorageEngineArg);
-
-    return 0;
-}
-
 //
 // Run the PEPO
 //
@@ -3721,14 +3701,7 @@ PEPOTLDKTCPRun(
     printf("Master lcore = %d\n", i);
 #endif
 
-    StorageEngineT sEng;
-    sEng.StorageEngine = StorageEngine;
-    sEng.StorageEngineArg = StorageEngineArg;
-
-    result = rte_eal_remote_launch(StorageEngineThread, &sEng, CORE_ALLOCATION_STORAGE_ENGINE_SPDK_CORE);
-    if (result != 0) {
-        RTE_LOG(ERR, USER1, "rte_eal_remote_launch failed for storage engine: err = %d, lcore = %u\n", result, CORE_ALLOCATION_STORAGE_ENGINE_SPDK_CORE);
-    }
+    StorageEngine(StorageEngineArg);
 
     //
     // Wait for exit signal and sleep to avoid burning CPUs