sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: refactor to remove functions

Browse Source 
refactoring almost identical functions to delete and use the other.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Jaben Carsey 2018-05-18 08:06:51 +08:00 committed by Yonghong Zhu
parent 46e4b3940e
commit c14b58614f
2 changed files with 45 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

165
BaseTools/Source/Python/AutoGen/AutoGen.py
View File

@ -42,6 +42,7 @@ from GenPatchPcdTable.GenPatchPcdTable import parsePcdInfoFromMapFile
import Common.VpdInfoFile as VpdInfoFile import Common.VpdInfoFile as VpdInfoFile
from GenPcdDb import CreatePcdDatabaseCode from GenPcdDb import CreatePcdDatabaseCode
from Workspace.MetaFileCommentParser import UsageList from Workspace.MetaFileCommentParser import UsageList
from Workspace.WorkspaceCommon import GetModuleLibInstances
from Common.MultipleWorkspace import MultipleWorkspace as mws from Common.MultipleWorkspace import MultipleWorkspace as mws
import InfSectionParser import InfSectionParser
import datetime import datetime
@ -2174,162 +2175,14 @@ class PlatformAutoGen(AutoGen):
if str(Module) not in self.Platform.Modules: if str(Module) not in self.Platform.Modules:
return [] return []
ModuleType = Module.ModuleType return GetModuleLibInstances(Module,
self.Platform,
# for overridding library instances with module specific setting self.BuildDatabase,
PlatformModule = self.Platform.Modules[str(Module)] self.Arch,
self.BuildTarget,
# add forced library instances (specified under LibraryClasses sections) self.ToolChain,
# self.MetaFile,
# If a module has a MODULE_TYPE of USER_DEFINED, EdkLogger)
# do not link in NULL library class instances from the global [LibraryClasses.*] sections.
#
if Module.ModuleType != SUP_MODULE_USER_DEFINED:
for LibraryClass in self.Platform.LibraryClasses.GetKeys():
if LibraryClass.startswith("NULL") and self.Platform.LibraryClasses[LibraryClass, Module.ModuleType]:
Module.LibraryClasses[LibraryClass] = self.Platform.LibraryClasses[LibraryClass, Module.ModuleType]
# add forced library instances (specified in module overrides)
for LibraryClass in PlatformModule.LibraryClasses:
if LibraryClass.startswith("NULL"):
Module.LibraryClasses[LibraryClass] = PlatformModule.LibraryClasses[LibraryClass]
# EdkII module
LibraryConsumerList = [Module]
Constructor = []
ConsumedByList = OrderedDict()
LibraryInstance = OrderedDict()
EdkLogger.verbose("")
EdkLogger.verbose("Library instances of module [%s] [%s]:" % (str(Module), self.Arch))
while len(LibraryConsumerList) > 0:
M = LibraryConsumerList.pop()
for LibraryClassName in M.LibraryClasses:
if LibraryClassName not in LibraryInstance:
# override library instance for this module
if LibraryClassName in PlatformModule.LibraryClasses:
LibraryPath = PlatformModule.LibraryClasses[LibraryClassName]
else:
LibraryPath = self.Platform.LibraryClasses[LibraryClassName, ModuleType]
if LibraryPath is None or LibraryPath == "":
LibraryPath = M.LibraryClasses[LibraryClassName]
if LibraryPath is None or LibraryPath == "":
EdkLogger.error("build", RESOURCE_NOT_AVAILABLE,
"Instance of library class [%s] is not found" % LibraryClassName,
File=self.MetaFile,
ExtraData="in [%s] [%s]\n\tconsumed by module [%s]" % (str(M), self.Arch, str(Module)))
LibraryModule = self.BuildDatabase[LibraryPath, self.Arch, self.BuildTarget, self.ToolChain]
# for those forced library instance (NULL library), add a fake library class
if LibraryClassName.startswith("NULL"):
LibraryModule.LibraryClass.append(LibraryClassObject(LibraryClassName, [ModuleType]))
elif LibraryModule.LibraryClass is None \
or len(LibraryModule.LibraryClass) == 0 \
or (ModuleType != SUP_MODULE_USER_DEFINED
and ModuleType not in LibraryModule.LibraryClass[0].SupModList):
# only USER_DEFINED can link against any library instance despite of its SupModList
EdkLogger.error("build", OPTION_MISSING,
"Module type [%s] is not supported by library instance [%s]" \
% (ModuleType, LibraryPath), File=self.MetaFile,
ExtraData="consumed by [%s]" % str(Module))
LibraryInstance[LibraryClassName] = LibraryModule
LibraryConsumerList.append(LibraryModule)
EdkLogger.verbose("\t" + str(LibraryClassName) + " : " + str(LibraryModule))
else:
LibraryModule = LibraryInstance[LibraryClassName]
if LibraryModule is None:
continue
if LibraryModule.ConstructorList != [] and LibraryModule not in Constructor:
Constructor.append(LibraryModule)
if LibraryModule not in ConsumedByList:
ConsumedByList[LibraryModule] = []
# don't add current module itself to consumer list
if M != Module:
if M in ConsumedByList[LibraryModule]:
continue
ConsumedByList[LibraryModule].append(M)
#
# Initialize the sorted output list to the empty set
#
SortedLibraryList = []
#
# Q <- Set of all nodes with no incoming edges
#
LibraryList = [] #LibraryInstance.values()
Q = []
for LibraryClassName in LibraryInstance:
M = LibraryInstance[LibraryClassName]
LibraryList.append(M)
if ConsumedByList[M] == []:
Q.append(M)
#
# start the DAG algorithm
#
while True:
EdgeRemoved = True
while Q == [] and EdgeRemoved:
EdgeRemoved = False
# for each node Item with a Constructor
for Item in LibraryList:
if Item not in Constructor:
continue
# for each Node without a constructor with an edge e from Item to Node
for Node in ConsumedByList[Item]:
if Node in Constructor:
continue
# remove edge e from the graph if Node has no constructor
ConsumedByList[Item].remove(Node)
EdgeRemoved = True
if ConsumedByList[Item] == []:
# insert Item into Q
Q.insert(0, Item)
break
if Q != []:
break
# DAG is done if there's no more incoming edge for all nodes
if Q == []:
break
# remove node from Q
Node = Q.pop()
# output Node
SortedLibraryList.append(Node)
# for each node Item with an edge e from Node to Item do
for Item in LibraryList:
if Node not in ConsumedByList[Item]:
continue
# remove edge e from the graph
ConsumedByList[Item].remove(Node)
if ConsumedByList[Item] != []:
continue
# insert Item into Q, if Item has no other incoming edges
Q.insert(0, Item)
#
# if any remaining node Item in the graph has a constructor and an incoming edge, then the graph has a cycle
#
for Item in LibraryList:
if ConsumedByList[Item] != [] and Item in Constructor and len(Constructor) > 1:
ErrorMessage = "\tconsumed by " + "\n\tconsumed by ".join(str(L) for L in ConsumedByList[Item])
EdkLogger.error("build", BUILD_ERROR, 'Library [%s] with constructors has a cycle' % str(Item),
ExtraData=ErrorMessage, File=self.MetaFile)
if Item not in SortedLibraryList:
SortedLibraryList.append(Item)
#
# Build the list of constructor and destructir names
# The DAG Topo sort produces the destructor order, so the list of constructors must generated in the reverse order
#
SortedLibraryList.reverse()
return SortedLibraryList
## Override PCD setting (type, value, ...) ## Override PCD setting (type, value, ...)
# #

52
BaseTools/Source/Python/Workspace/WorkspaceCommon.py
View File

@ -83,16 +83,13 @@ def GetDeclaredPcd(Platform, BuildDatabase, Arch, Target, Toolchain,additionalPk
# #
def GetLiabraryInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain): def GetLiabraryInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain):
if Module.AutoGenVersion >= 0x00010005: if Module.AutoGenVersion >= 0x00010005:
return _GetModuleLibraryInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain) return GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain)
else: else:
return _ResolveLibraryReference(Module, Platform) return _ResolveLibraryReference(Module, Platform)
def _GetModuleLibraryInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain): def GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain, FileName = '', EdkLogger = None):
ModuleType = Module.ModuleType ModuleType = Module.ModuleType
# for overriding library instances with module specific setting
PlatformModule = Platform.Modules[str(Module)]
# add forced library instances (specified under LibraryClasses sections) # add forced library instances (specified under LibraryClasses sections)
# #
# If a module has a MODULE_TYPE of USER_DEFINED, # If a module has a MODULE_TYPE of USER_DEFINED,
@ -104,9 +101,9 @@ def _GetModuleLibraryInstances(Module, Platform, BuildDatabase, Arch, Target, To
Module.LibraryClasses[LibraryClass] = Platform.LibraryClasses[LibraryClass, Module.ModuleType] Module.LibraryClasses[LibraryClass] = Platform.LibraryClasses[LibraryClass, Module.ModuleType]
# add forced library instances (specified in module overrides) # add forced library instances (specified in module overrides)
for LibraryClass in PlatformModule.LibraryClasses: for LibraryClass in Platform.Modules[str(Module)].LibraryClasses:
if LibraryClass.startswith("NULL"): if LibraryClass.startswith("NULL"):
Module.LibraryClasses[LibraryClass] = PlatformModule.LibraryClasses[LibraryClass] Module.LibraryClasses[LibraryClass] = Platform.Modules[str(Module)].LibraryClasses[LibraryClass]
# EdkII module # EdkII module
LibraryConsumerList = [Module] LibraryConsumerList = [Module]
@ -114,19 +111,29 @@ def _GetModuleLibraryInstances(Module, Platform, BuildDatabase, Arch, Target, To
ConsumedByList = OrderedListDict() ConsumedByList = OrderedListDict()
LibraryInstance = OrderedDict() LibraryInstance = OrderedDict()
if FileName:
EdkLogger.verbose("")
EdkLogger.verbose("Library instances of module [%s] [%s]:" % (str(Module), Arch))
while len(LibraryConsumerList) > 0: while len(LibraryConsumerList) > 0:
M = LibraryConsumerList.pop() M = LibraryConsumerList.pop()
for LibraryClassName in M.LibraryClasses: for LibraryClassName in M.LibraryClasses:
if LibraryClassName not in LibraryInstance: if LibraryClassName not in LibraryInstance:
# override library instance for this module # override library instance for this module
if LibraryClassName in PlatformModule.LibraryClasses: if LibraryClassName in Platform.Modules[str(Module)].LibraryClasses:
LibraryPath = PlatformModule.LibraryClasses[LibraryClassName] LibraryPath = Platform.Modules[str(Module)].LibraryClasses[LibraryClassName]
else: else:
LibraryPath = Platform.LibraryClasses[LibraryClassName, ModuleType] LibraryPath = Platform.LibraryClasses[LibraryClassName, ModuleType]
if LibraryPath is None or LibraryPath == "": if LibraryPath is None or LibraryPath == "":
LibraryPath = M.LibraryClasses[LibraryClassName] LibraryPath = M.LibraryClasses[LibraryClassName]
if LibraryPath is None or LibraryPath == "": if LibraryPath is None or LibraryPath == "":
return [] if FileName:
EdkLogger.error("build", RESOURCE_NOT_AVAILABLE,
"Instance of library class [%s] is not found" % LibraryClassName,
File=FileName,
ExtraData="in [%s] [%s]\n\tconsumed by module [%s]" % (str(M), Arch, str(Module)))
else:
return []
LibraryModule = BuildDatabase[LibraryPath, Arch, Target, Toolchain] LibraryModule = BuildDatabase[LibraryPath, Arch, Target, Toolchain]
# for those forced library instance (NULL library), add a fake library class # for those forced library instance (NULL library), add a fake library class
@ -137,10 +144,18 @@ def _GetModuleLibraryInstances(Module, Platform, BuildDatabase, Arch, Target, To
or (ModuleType != SUP_MODULE_USER_DEFINED or (ModuleType != SUP_MODULE_USER_DEFINED
and ModuleType not in LibraryModule.LibraryClass[0].SupModList): and ModuleType not in LibraryModule.LibraryClass[0].SupModList):
# only USER_DEFINED can link against any library instance despite of its SupModList # only USER_DEFINED can link against any library instance despite of its SupModList
return [] if FileName:
EdkLogger.error("build", OPTION_MISSING,
"Module type [%s] is not supported by library instance [%s]" \
% (ModuleType, LibraryPath), File=FileName,
ExtraData="consumed by [%s]" % str(Module))
else:
return []
LibraryInstance[LibraryClassName] = LibraryModule LibraryInstance[LibraryClassName] = LibraryModule
LibraryConsumerList.append(LibraryModule) LibraryConsumerList.append(LibraryModule)
if FileName:
EdkLogger.verbose("\t" + str(LibraryClassName) + " : " + str(LibraryModule))
else: else:
LibraryModule = LibraryInstance[LibraryClassName] LibraryModule = LibraryInstance[LibraryClassName]
@ -167,7 +182,7 @@ def _GetModuleLibraryInstances(Module, Platform, BuildDatabase, Arch, Target, To
for LibraryClassName in LibraryInstance: for LibraryClassName in LibraryInstance:
M = LibraryInstance[LibraryClassName] M = LibraryInstance[LibraryClassName]
LibraryList.append(M) LibraryList.append(M)
if len(ConsumedByList[M]) == 0: if not ConsumedByList[M]:
Q.append(M) Q.append(M)
# #
@ -188,7 +203,7 @@ def _GetModuleLibraryInstances(Module, Platform, BuildDatabase, Arch, Target, To
# remove edge e from the graph if Node has no constructor # remove edge e from the graph if Node has no constructor
ConsumedByList[Item].remove(Node) ConsumedByList[Item].remove(Node)
EdgeRemoved = True EdgeRemoved = True
if len(ConsumedByList[Item]) == 0: if not ConsumedByList[Item]:
# insert Item into Q # insert Item into Q
Q.insert(0, Item) Q.insert(0, Item)
break break
@ -210,7 +225,7 @@ def _GetModuleLibraryInstances(Module, Platform, BuildDatabase, Arch, Target, To
# remove edge e from the graph # remove edge e from the graph
ConsumedByList[Item].remove(Node) ConsumedByList[Item].remove(Node)
if len(ConsumedByList[Item]) != 0: if ConsumedByList[Item]:
continue continue
# insert Item into Q, if Item has no other incoming edges # insert Item into Q, if Item has no other incoming edges
Q.insert(0, Item) Q.insert(0, Item)
@ -219,8 +234,13 @@ def _GetModuleLibraryInstances(Module, Platform, BuildDatabase, Arch, Target, To
# if any remaining node Item in the graph has a constructor and an incoming edge, then the graph has a cycle # if any remaining node Item in the graph has a constructor and an incoming edge, then the graph has a cycle
# #
for Item in LibraryList: for Item in LibraryList:
if len(ConsumedByList[Item]) != 0 and Item in Constructor and len(Constructor) > 1: if ConsumedByList[Item] and Item in Constructor and len(Constructor) > 1:
return [] if FileName:
ErrorMessage = "\tconsumed by " + "\n\tconsumed by ".join(str(L) for L in ConsumedByList[Item])
EdkLogger.error("build", BUILD_ERROR, 'Library [%s] with constructors has a cycle' % str(Item),
ExtraData=ErrorMessage, File=FileName)
else:
return []
if Item not in SortedLibraryList: if Item not in SortedLibraryList:
SortedLibraryList.append(Item) SortedLibraryList.append(Item)