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

microsoft · Dec 10, 2023 · 4acb348 · 4acb348
2 parents 528da4b + 573651f
commit 4acb348
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/DPDPU/Common/Include/DPU/FileService.h b/DPDPU/Common/Include/DPU/FileService.h
@@ -6,7 +6,7 @@
 
 #define WORKER_THREAD_COUNT 1
 
-extern int ForceQuitFileBackEnd;
+extern volatile int ForceQuitFileBackEnd;
 
 //
 // File service running on the DPU
@@ -109,4 +109,4 @@ SubmitDataPlaneRequest(
     DataPlaneRequestContext* Context,
     bool IsRead,
     RequestIdT Index
-);
+);
diff --git a/DPDPU/Common/Source/DPU/FileService.c b/DPDPU/Common/Source/DPU/FileService.c
@@ -16,7 +16,7 @@ struct DPUStorage *Sto;
 char *G_BDEV_NAME = "malloc_delay";
 FileService* FS;
 extern bool G_INITIALIZATION_DONE;
-extern int ForceQuitFileBackEnd;
+extern volatile int ForceQuitFileBackEnd;
 int WorkerId = 0;
 
 //

diff --git a/DPDPU/Main/Source/Main.c b/DPDPU/Main/Source/Main.c
@@ -50,6 +50,7 @@ main(
     sEngPara.Argc = 3;
     sEngPara.Argv = argv;
 
+    fprintf(stdout, "Starting storage engine...\n");
     ret = pthread_create(&sEng, NULL, StorageEngine, (void*)&sEngPara);
     if (ret) {
         fprintf(stderr, "Failed to run storage engine\n");
@@ -78,7 +79,6 @@ main(
     // Wait for storage engine
     //
     //
-    fprintf(stdout, "Waiting for storage engine to exit\n");
     pthread_join(sEng, NULL);
     fprintf(stdout, "Storage engine exited\n");