This patch is to make sure at least VARIABLE_RECLAIM_THRESHOLD (1024) bytes of spaces...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1697 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index a9505d903c46de5ede33addf569d2e8ba7895216..d575417fe94515d3980559a1568c9df9622992e2 100644 (file)
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -1388,6 +1388,23 @@ Returns:
 \r
     mVariableModuleGlobal->NonVolatileLastVariableOffset = (UINTN) NextVariable - (UINTN) CurrPtr;\r
 \r
 \r
     mVariableModuleGlobal->NonVolatileLastVariableOffset = (UINTN) NextVariable - (UINTN) CurrPtr;\r
 \r

+    //\r
+    // Check if the free area is blow a threshold\r
+    //\r
+    if ((((VARIABLE_STORE_HEADER *)((UINTN) CurrPtr))->Size - mVariableModuleGlobal->NonVolatileLastVariableOffset) < VARIABLE_RECLAIM_THRESHOLD) {\r
+      Status = Reclaim (\r
+                mVariableModuleGlobal->VariableBase[Physical].NonVolatileVariableBase,\r
+                &mVariableModuleGlobal->NonVolatileLastVariableOffset,\r
+                FALSE\r
+                );\r
+    }\r
+\r
+    if (EFI_ERROR (Status)) {\r
+      gBS->FreePool (mVariableModuleGlobal);\r
+      gBS->FreePool (VolatileVariableStore);\r
+      return Status;\r
+    }\r
+\r

     //\r
     // Check if the free area is really free.\r
     //\r
     //\r
     // Check if the free area is really free.\r
     //\r

diff --git a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.h b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.h
index 55423a25b96c599b073612b32a5bd7c97d368118..014df50c3d0dfc6049056639cf1a30ba4d0571e8 100644 (file)
--- a/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.h
+++ b/EdkModulePkg/Universal/Variable/RuntimeDxe/Variable.h
@@ -35,6 +35,7 @@ Abstract:
 #define ALIGNMENT  1\r
 #endif\r
 \r
 #define ALIGNMENT  1\r
 #endif\r
 \r

+#define VARIABLE_RECLAIM_THRESHOLD (1024)\r

 \r
 #define VARIABLE_STORE_SIZE (64 * 1024)\r
 #define SCRATCH_SIZE        (4 * 1024)\r
 \r
 #define VARIABLE_STORE_SIZE (64 * 1024)\r
 #define SCRATCH_SIZE        (4 * 1024)\r