BaseTools: remove unnecessary calls of os.exist

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2101

This patch is going to remove unnecessary calls
of os.exist()

Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/AutoGenWorker.py b/BaseTools/Source/Python/AutoGen/AutoGenWorker.py
index 77fbd8b369f42590367f46ebcec7fa66389eb435..94ea61a4870b9c44300c7b7e444f43ee00a0f8bd 100755 (executable)
--- a/BaseTools/Source/Python/AutoGen/AutoGenWorker.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGenWorker.py
@@ -155,10 +155,11 @@ class AutoGenWorkerInProcess(mp.Process):
         try:\r
             taskname = "Init"\r
             with self.file_lock:\r
-                if not os.path.exists(self.data_pipe_file_path):\r
+                try:\r
+                    self.data_pipe = MemoryDataPipe()\r
+                    self.data_pipe.load(self.data_pipe_file_path)\r
+                except:\r
                     self.feedback_q.put(taskname + ":" + "load data pipe %s failed." % self.data_pipe_file_path)\r
-                self.data_pipe = MemoryDataPipe()\r
-                self.data_pipe.load(self.data_pipe_file_path)\r
             EdkLogger.LogClientInitialize(self.log_q)\r
             loglevel = self.data_pipe.Get("LogLevel")\r
             if not loglevel:\r

diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
index 910c8fe3706c1fe97231e87862e37bfad6ee3652..5e0d11e165a3a85b358e886cba381b3e7303482a 100755 (executable)
--- a/BaseTools/Source/Python/AutoGen/GenC.py
+++ b/BaseTools/Source/Python/AutoGen/GenC.py
@@ -1748,59 +1748,60 @@ def CreateIdfFileCode(Info, AutoGenC, StringH, IdfGenCFlag, IdfGenBinBuffer):
                     for FileObj in ImageFiles.ImageFilesDict[Idf]:\r
                         ID = FileObj.ImageID\r
                         File = FileObj.File\r
-                        if not os.path.exists(File.Path) or not os.path.isfile(File.Path):\r
-                            EdkLogger.error("build", FILE_NOT_FOUND, ExtraData=File.Path)\r
-                        SearchImageID (FileObj, FileList)\r
-                        if FileObj.Referenced:\r
-                            if (ValueStartPtr - len(DEFINE_STR + ID)) <= 0:\r
-                                Line = DEFINE_STR + ' ' + ID + ' ' + DecToHexStr(Index, 4) + '\n'\r
-                            else:\r
-                                Line = DEFINE_STR + ' ' + ID + ' ' * (ValueStartPtr - len(DEFINE_STR + ID)) + DecToHexStr(Index, 4) + '\n'\r
-\r
-                            if File not in FileDict:\r
-                                FileDict[File] = Index\r
-                            else:\r
-                                DuplicateBlock = pack('B', EFI_HII_IIBT_DUPLICATE)\r
-                                DuplicateBlock += pack('H', FileDict[File])\r
-                                ImageBuffer += DuplicateBlock\r
+                        try:\r
+                            SearchImageID (FileObj, FileList)\r
+                            if FileObj.Referenced:\r
+                                if (ValueStartPtr - len(DEFINE_STR + ID)) <= 0:\r
+                                    Line = DEFINE_STR + ' ' + ID + ' ' + DecToHexStr(Index, 4) + '\n'\r
+                                else:\r
+                                    Line = DEFINE_STR + ' ' + ID + ' ' * (ValueStartPtr - len(DEFINE_STR + ID)) + DecToHexStr(Index, 4) + '\n'\r
+\r
+                                if File not in FileDict:\r
+                                    FileDict[File] = Index\r
+                                else:\r
+                                    DuplicateBlock = pack('B', EFI_HII_IIBT_DUPLICATE)\r
+                                    DuplicateBlock += pack('H', FileDict[File])\r
+                                    ImageBuffer += DuplicateBlock\r
+                                    BufferStr = WriteLine(BufferStr, '// %s: %s: %s' % (DecToHexStr(Index, 4), ID, DecToHexStr(Index, 4)))\r
+                                    TempBufferList = AscToHexList(DuplicateBlock)\r
+                                    BufferStr = WriteLine(BufferStr, CreateArrayItem(TempBufferList, 16) + '\n')\r
+                                    StringH.Append(Line)\r
+                                    Index += 1\r
+                                    continue\r
+\r
+                                TmpFile = open(File.Path, 'rb')\r
+                                Buffer = TmpFile.read()\r
+                                TmpFile.close()\r
+                                if File.Ext.upper() == '.PNG':\r
+                                    TempBuffer = pack('B', EFI_HII_IIBT_IMAGE_PNG)\r
+                                    TempBuffer += pack('I', len(Buffer))\r
+                                    TempBuffer += Buffer\r
+                                elif File.Ext.upper() == '.JPG':\r
+                                    ImageType, = struct.unpack('4s', Buffer[6:10])\r
+                                    if ImageType != b'JFIF':\r
+                                        EdkLogger.error("build", FILE_TYPE_MISMATCH, "The file %s is not a standard JPG file." % File.Path)\r
+                                    TempBuffer = pack('B', EFI_HII_IIBT_IMAGE_JPEG)\r
+                                    TempBuffer += pack('I', len(Buffer))\r
+                                    TempBuffer += Buffer\r
+                                elif File.Ext.upper() == '.BMP':\r
+                                    TempBuffer, TempPalette = BmpImageDecoder(File, Buffer, PaletteIndex, FileObj.TransParent)\r
+                                    if len(TempPalette) > 1:\r
+                                        PaletteIndex += 1\r
+                                        NewPalette = pack('H', len(TempPalette))\r
+                                        NewPalette += TempPalette\r
+                                        PaletteBuffer += NewPalette\r
+                                        PaletteStr = WriteLine(PaletteStr, '// %s: %s: %s' % (DecToHexStr(PaletteIndex - 1, 4), ID, DecToHexStr(PaletteIndex - 1, 4)))\r
+                                        TempPaletteList = AscToHexList(NewPalette)\r
+                                        PaletteStr = WriteLine(PaletteStr, CreateArrayItem(TempPaletteList, 16) + '\n')\r
+                                ImageBuffer += TempBuffer\r
                                 BufferStr = WriteLine(BufferStr, '// %s: %s: %s' % (DecToHexStr(Index, 4), ID, DecToHexStr(Index, 4)))\r
-                                TempBufferList = AscToHexList(DuplicateBlock)\r
+                                TempBufferList = AscToHexList(TempBuffer)\r
                                 BufferStr = WriteLine(BufferStr, CreateArrayItem(TempBufferList, 16) + '\n')\r
+\r
                                 StringH.Append(Line)\r
                                 Index += 1\r
-                                continue\r
-\r
-                            TmpFile = open(File.Path, 'rb')\r
-                            Buffer = TmpFile.read()\r
-                            TmpFile.close()\r
-                            if File.Ext.upper() == '.PNG':\r
-                                TempBuffer = pack('B', EFI_HII_IIBT_IMAGE_PNG)\r
-                                TempBuffer += pack('I', len(Buffer))\r
-                                TempBuffer += Buffer\r
-                            elif File.Ext.upper() == '.JPG':\r
-                                ImageType, = struct.unpack('4s', Buffer[6:10])\r
-                                if ImageType != b'JFIF':\r
-                                    EdkLogger.error("build", FILE_TYPE_MISMATCH, "The file %s is not a standard JPG file." % File.Path)\r
-                                TempBuffer = pack('B', EFI_HII_IIBT_IMAGE_JPEG)\r
-                                TempBuffer += pack('I', len(Buffer))\r
-                                TempBuffer += Buffer\r
-                            elif File.Ext.upper() == '.BMP':\r
-                                TempBuffer, TempPalette = BmpImageDecoder(File, Buffer, PaletteIndex, FileObj.TransParent)\r
-                                if len(TempPalette) > 1:\r
-                                    PaletteIndex += 1\r
-                                    NewPalette = pack('H', len(TempPalette))\r
-                                    NewPalette += TempPalette\r
-                                    PaletteBuffer += NewPalette\r
-                                    PaletteStr = WriteLine(PaletteStr, '// %s: %s: %s' % (DecToHexStr(PaletteIndex - 1, 4), ID, DecToHexStr(PaletteIndex - 1, 4)))\r
-                                    TempPaletteList = AscToHexList(NewPalette)\r
-                                    PaletteStr = WriteLine(PaletteStr, CreateArrayItem(TempPaletteList, 16) + '\n')\r
-                            ImageBuffer += TempBuffer\r
-                            BufferStr = WriteLine(BufferStr, '// %s: %s: %s' % (DecToHexStr(Index, 4), ID, DecToHexStr(Index, 4)))\r
-                            TempBufferList = AscToHexList(TempBuffer)\r
-                            BufferStr = WriteLine(BufferStr, CreateArrayItem(TempBufferList, 16) + '\n')\r
-\r
-                            StringH.Append(Line)\r
-                            Index += 1\r
+                        except IOError:\r
+                            EdkLogger.error("build", FILE_NOT_FOUND, ExtraData=File.Path)\r
 \r
             BufferStr = WriteLine(BufferStr, '// End of the Image Info')\r
             BufferStr = WriteLine(BufferStr, CreateArrayItem(DecToHexList(EFI_HII_IIBT_END, 2)) + '\n')\r

diff --git a/BaseTools/Source/Python/AutoGen/GenMake.py b/BaseTools/Source/Python/AutoGen/GenMake.py
index cda1fbe610e50edf1281aac2eecfa9dff64b89a4..940136248f5b84c6d937ec2ffc95a7018b2fc0f7 100755 (executable)
--- a/BaseTools/Source/Python/AutoGen/GenMake.py
+++ b/BaseTools/Source/Python/AutoGen/GenMake.py
@@ -636,11 +636,13 @@ cleanlib:
         while not found and os.sep in package_rel_dir:\r
             index = package_rel_dir.index(os.sep)\r
             current_dir = mws.join(current_dir, package_rel_dir[:index])\r
-            if os.path.exists(current_dir):\r
+            try:\r
                 for fl in os.listdir(current_dir):\r
                     if fl.endswith('.dec'):\r
                         found = True\r
                         break\r
+            except:\r
+                EdkLogger.error('build', FILE_NOT_FOUND, "WORKSPACE does not exist.")\r
             package_rel_dir = package_rel_dir[index + 1:]\r
 \r
         MakefileTemplateDict = {\r

diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
index 0e424ee40fb9a235c746339774e9213e7123e918..debeb46f58587a582cffab907154b78ee39a67ab 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
@@ -275,11 +275,11 @@ class PlatformAutoGen(AutoGen):
             PcdNvStoreDfBuffer = [item for item in self._DynamicPcdList if item.TokenCName == "PcdNvStoreDefaultValueBuffer" and item.TokenSpaceGuidCName == "gEfiMdeModulePkgTokenSpaceGuid"]\r
 \r
             if PcdNvStoreDfBuffer:\r
-                if os.path.exists(VpdMapFilePath):\r
+                try:\r
                     OrgVpdFile.Read(VpdMapFilePath)\r
                     PcdItems = OrgVpdFile.GetOffset(PcdNvStoreDfBuffer[0])\r
                     NvStoreOffset = list(PcdItems.values())[0].strip() if PcdItems else '0'\r
-                else:\r
+                except:\r
                     EdkLogger.error("build", FILE_READ_FAILURE, "Can not find VPD map file %s to fix up VPD offset." % VpdMapFilePath)\r
 \r
                 NvStoreOffset = int(NvStoreOffset, 16) if NvStoreOffset.upper().startswith("0X") else int(NvStoreOffset)\r
@@ -665,7 +665,7 @@ class PlatformAutoGen(AutoGen):
                 # Process VPD map file generated by third party BPDG tool\r
                 if NeedProcessVpdMapFile:\r
                     VpdMapFilePath = os.path.join(self.BuildDir, TAB_FV_DIRECTORY, "%s.map" % self.Platform.VpdToolGuid)\r
-                    if os.path.exists(VpdMapFilePath):\r
+                    try:\r
                         VpdFile.Read(VpdMapFilePath)\r
 \r
                         # Fixup TAB_STAR offset\r
@@ -679,7 +679,7 @@ class PlatformAutoGen(AutoGen):
                                     for item in vpdinfo:\r
                                         if item[2] == pcdvalue:\r
                                             sku.VpdOffset = item[1]\r
-                    else:\r
+                    except:\r
                         EdkLogger.error("build", FILE_READ_FAILURE, "Can not find VPD map file %s to fix up VPD offset." % VpdMapFilePath)\r
 \r
             # Delete the DynamicPcdList At the last time enter into this function\r

diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py
index 9f6a2715668c0d590e5cd36211aac14aa6721f23..b2895f7e5c63d238180b93830b7630499ffa202c 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
+++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
@@ -371,13 +371,12 @@ class UniFileClassObject(object):
     # Pre-process before parse .uni file\r
     #\r
     def PreProcess(self, File):\r
-        if not os.path.exists(File.Path) or not os.path.isfile(File.Path):\r
-            EdkLogger.error("Unicode File Parser", FILE_NOT_FOUND, ExtraData=File.Path)\r
-\r
         try:\r
             FileIn = UniFileClassObject.OpenUniFile(LongFilePath(File.Path))\r
         except UnicodeError as X:\r
             EdkLogger.error("build", FILE_READ_FAILURE, "File read failure: %s" % str(X), ExtraData=File.Path);\r
+        except OSError:\r
+            EdkLogger.error("Unicode File Parser", FILE_NOT_FOUND, ExtraData=File.Path)\r
         except:\r
             EdkLogger.error("build", FILE_OPEN_FAILURE, ExtraData=File.Path);\r
 \r