Fixed one dead loop issue in the autogenlib.

[mirror_edk2.git] / Tools / Java / Source / GenBuild / org / tianocore / build / autogen / AutogenLibOrder.java

diff --git a/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java b/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
index 11469a6c49c13194e13e57c64d932f054a5457dd..37c54f50af2862a6948c7ae48faf3ed14a52bc9f 100644 (file)
--- a/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
+++ b/Tools/Java/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
@@ -1,15 +1,15 @@
 /**@file\r
  AutogenLibOrder class.\r
 \r
- This class is to reorder library instance sequence according to library \r
+ This class is to reorder library instance sequence according to library\r
  dependence.\r
- \r
+\r
  Copyright (c) 2006, Intel Corporation\r
  All rights reserved. This program and the accompanying materials\r
  are licensed and made available under the terms and conditions of the BSD License\r
  which accompanies this distribution.  The full text of the license may be found at\r
  http://opensource.org/licenses/bsd-license.php\r
- \r
+\r
  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
@@ -62,12 +62,12 @@ public class AutogenLibOrder {
     /// String[1] is libraryConstructor name, String[2] is libDestructor name.\r
     ///\r
     private ModuleIdentification[] libInstanceList = null;\r
-    \r
+\r
     /**\r
       Constructor function\r
-    \r
+\r
       This function mainly initialize some member variable.\r
-     \r
+\r
       @param  libraryList   List of the library instance.\r
       @throws Exception\r
     **/\r
@@ -81,12 +81,12 @@ public class AutogenLibOrder {
             libInstance = libraryList[i];\r
             //\r
             // Fetch the constructor & destructor.\r
-            // \r
+            //\r
             Map<String, XmlObject> libDoc = GlobalData.getDoc(libInstance, arch);\r
             SurfaceAreaQuery saq = new SurfaceAreaQuery(libDoc);\r
             libInstance.setConstructor(saq.getLibConstructorName());\r
             libInstance.setDestructor(saq.getLibDestructorName());\r
-            \r
+\r
             //\r
             // Create library class consume database.\r
             //\r
@@ -122,8 +122,8 @@ public class AutogenLibOrder {
         }\r
 \r
         //\r
-        // Create a consumed-by database \r
-        // \r
+        // Create a consumed-by database\r
+        //\r
         for (Iterator it = libClassProducer.keySet().iterator(); it.hasNext();) {\r
             String className = (String)it.next();\r
             libInstance = libClassProducer.get(className);\r
@@ -145,7 +145,7 @@ public class AutogenLibOrder {
     /**\r
       orderLibInstance\r
 \r
-      This function reorder the library instance according the library class \r
+      This function reorder the library instance according the library class\r
       dependency, using DAG anaylysis algothim\r
 \r
       @return     List which content the ordered library instance.\r
@@ -156,7 +156,7 @@ public class AutogenLibOrder {
 \r
         //\r
         // First, add the library instance without consumers to the Q\r
-        // \r
+        //\r
         for (int i = 0; i < libInstanceList.length; ++i) {\r
             if (libInstanceConsumedBy.get(libInstanceList[i]).size() == 0) {\r
                 noConsumerList.add(libInstanceList[i]);\r
@@ -174,6 +174,10 @@ public class AutogenLibOrder {
                     continue;\r
                 }\r
                 HashSet<ModuleIdentification> consumedBy = libInstanceConsumedBy.get(m);\r
+                if (consumedBy.size() == 0) {\r
+                  continue;\r
+                }\r
+\r
                 consumedBy.remove(n);\r
                 if (consumedBy.size() == 0) {\r
                     noConsumerList.addLast(m);\r
@@ -200,10 +204,11 @@ public class AutogenLibOrder {
                         if (consumer.hasConstructor()) {\r
                             continue;\r
                         }\r
+\r
                         //\r
-                        // if there's no constructor in the library instance's consumer, \r
+                        // if there's no constructor in the library instance's consumer,\r
                         // remove it from the consumer list\r
-                        // \r
+                        //\r
                         consumedBy.remove(consumer);\r
                         circularlyConsumed = false;\r
                         if (consumedBy.size() == 0) {\r
@@ -216,13 +221,23 @@ public class AutogenLibOrder {
                         break;\r
                     }\r
                 }\r
+\r
+                if (noConsumerList.size() == 0 && !circularlyConsumed) {\r
+                  break;\r
+                }\r
             }\r
         }\r
 \r
         //\r
         // Append the remaining library instance to the end of sorted list\r
-        // \r
+        //\r
         for (int i = 0; i < libInstanceList.length; ++i) {\r
+            if (libInstanceConsumedBy.get(libInstanceList[i]).size() > 0 && libInstanceList[i].hasConstructor()) {\r
+                EdkLog.log(EdkLog.EDK_ERROR, libInstanceList[i].getName()\r
+                           + " with constructor has a circular dependency!");\r
+                throw new AutoGenException("Circular dependency in library instances is found!");\r
+            }\r
+\r
             if (!orderList.contains(libInstanceList[i])) {\r
                 orderList.add(libInstanceList[i]);\r
             }\r