BaseTool: Fixed the incorrect cache key.

[edk2] [PATCH] BaseTool: Fixed the incorrect cache key.

Posted by BobCF 5 years, 9 months ago

From: "bob.c.feng@intel.com" <bob.c.feng@intel.com>

This patch is to fix the incorrect cache key of
skip ModuleAutoGen cache.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
---
 BaseTools/Source/Python/AutoGen/AutoGen.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index b27290989e..54c6b7330f 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -4320,7 +4320,7 @@ class ModuleAutoGen(AutoGen):
     #  If any source file is newer than the module than we cannot skip
     #
     def CanSkip(self):
-        if self.MetaFile in GlobalData.gSikpAutoGenCache:
+        if self.MakeFileDir in GlobalData.gSikpAutoGenCache:
             return True
         if not os.path.exists(self.GetTimeStampPath()):
             return False
@@ -4340,7 +4340,7 @@ class ModuleAutoGen(AutoGen):
                     ModuleAutoGen.TimeDict[source] = os.stat(source)[8]
                 if ModuleAutoGen.TimeDict[source] > DstTimeStamp:
                     return False
-        GlobalData.gSikpAutoGenCache.add(self.MetaFile)
+        GlobalData.gSikpAutoGenCache.add(self.MakeFileDir)
         return True
 
     def GetTimeStampPath(self):
-- 
2.18.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH] BaseTool: Fixed the incorrect cache key.

Posted by Gao, Liming 5 years, 9 months ago

Reviewed-by: Liming Gao <liming.gao@intel.com>

> -----Original Message-----
> From: Feng, Bob C
> Sent: Wednesday, July 11, 2018 12:19 AM
> To: edk2-devel@lists.01.org
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>
> Subject: [PATCH] BaseTool: Fixed the incorrect cache key.
> 
> From: "bob.c.feng@intel.com" <bob.c.feng@intel.com>
> 
> This patch is to fix the incorrect cache key of
> skip ModuleAutoGen cache.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> ---
>  BaseTools/Source/Python/AutoGen/AutoGen.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
> index b27290989e..54c6b7330f 100644
> --- a/BaseTools/Source/Python/AutoGen/AutoGen.py
> +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
> @@ -4320,7 +4320,7 @@ class ModuleAutoGen(AutoGen):
>      #  If any source file is newer than the module than we cannot skip
>      #
>      def CanSkip(self):
> -        if self.MetaFile in GlobalData.gSikpAutoGenCache:
> +        if self.MakeFileDir in GlobalData.gSikpAutoGenCache:
>              return True
>          if not os.path.exists(self.GetTimeStampPath()):
>              return False
> @@ -4340,7 +4340,7 @@ class ModuleAutoGen(AutoGen):
>                      ModuleAutoGen.TimeDict[source] = os.stat(source)[8]
>                  if ModuleAutoGen.TimeDict[source] > DstTimeStamp:
>                      return False
> -        GlobalData.gSikpAutoGenCache.add(self.MetaFile)
> +        GlobalData.gSikpAutoGenCache.add(self.MakeFileDir)
>          return True
> 
>      def GetTimeStampPath(self):
> --
> 2.18.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel