Changeset 2845 for trunk/kLdr/kLdrDyld.c

Timestamp:

Nov 1, 2006, 2:39:03 AM (19 years ago)

Author:

bird

Message:

kldrDyldMod* in progress.

File:

• trunk/kLdr/kLdrDyld.c (modified) (11 diffs)

trunk/kLdr/kLdrDyld.c

@@ -168 +168 @@
 static int          kldrDyldStackAddModule(PKLDRDYLDMOD pMod);
 static int          kldrDyldStackFrameCompleted(void);
+static void         kldrDyldStackCleanupOne(PKLDRDYLDMOD pMod, int rc);
 static void         kldrDyldStackDropFrame(uint32_t iLoad1st, uint32_t iLoadEnd, int rc);
 /** @} */
@@ -627 +628 @@
         rc = kldrDyldDoLoad2(*ppMod, pszPrefix, pszSuffix, enmSearch, fFlags);
     else
-    {
-        /** @todo this is probably not quite right. */
-        /* If the reference count is 0 do a quick ref/deref to trigger destruction. */
-        kldrDyldModAddRef(*ppMod);
-        kldrDyldModDeref(*ppMod);
-    }
+        kldrDyldStackCleanupOne(*ppMod, rc);
 
     /*
@@ -656 +652 @@
     int rc = kldrDyldDoLoadPrerequisites(pLoadedMod, pszPrefix, pszSuffix, enmSearch, fFlags);
     uint32_t iLoadEnd = kldrDyldStackFrameCompleted();
+    if (rc)
+        kldrDyldStackCleanupOne(pLoadedMod, rc); /* in case it didn't get pushed onto the stack. */
 
     /*
@@ -954 +952 @@
     if (!rc)
     {
-        rc = kldrDyldModAddDep(pMod, pDep);
-        if (!rc)
-            *ppMod = pMod;
+        kldrDyldModAddDep(pMod, pDep);
+        *ppMod = pMod;
     }
     return rc;
@@ -1023 +1020 @@
 static int kldrDyldStackAddModule(PKLDRDYLDMOD pMod)
 {
-    int rc;
-
     /*
      * Grow the stack if necessary.
@@ -1043 +1038 @@
      * Add a reference and push the module onto the stack.
      */
-    rc = kldrDyldModAddRef(pMod);
-    if (!rc)
-        g_papStackMods[g_cStackMods++] = pMod;
-    return rc;
+    kldrDyldModAddRef(pMod);
+    g_papStackMods[g_cStackMods++] = pMod;
+    return 0;
 }
 
@@ -1058 +1052 @@
 {
     return g_cStackMods;
+}
+
+
+/**
+ * Worker routine for kldrDyldStackDropFrame() and kldrDyldDoLoad().
+ *
+ * @param   pMod            The module to perform cleanups on.
+ * @param   rc              Used for state verification.
+ */
+static void kldrDyldStackCleanupOne(PKLDRDYLDMOD pMod, int rc)
+{
+    switch (pMod->enmState)
+    {
+        /*
+         * Just push it along to the PENDING_DESTROY state.
+         */
+        case KLDRSTATE_MAPPED:
+            KLDRDYLD_ASSERT(rc);
+            kldrDyldModUnmap(pMod);
+            KLDRDYLD_ASSERT(pMod->enmState == KLDRSTATE_PENDING_DESTROY);
+            break;
+
+        /*
+         * Move back to PENDING_GC.
+         */
+        case KLDRSTATE_RELOADED:
+            KLDRDYLD_ASSERT(rc);
+            pMod->enmState = KLDRSTATE_PENDING_GC;
+            break;
+
+        /*
+         * Unload prerequisites and unmap the modules.
+         */
+        case KLDRSTATE_LOADED_PREREQUISITES:
+        case KLDRSTATE_FIXED_UP:
+            KLDRDYLD_ASSERT(rc);
+            kldrDyldModUnloadPrerequisites(pMod);
+            KLDRDYLD_ASSERT(pMod->enmState == KLDRSTATE_PENDING_DESTROY);
+            kldrDyldModUnmap(pMod);
+            KLDRDYLD_ASSERT(pMod->enmState == KLDRSTATE_PENDING_DESTROY);
+            break;
+
+        /*
+         * Unload prerequisites and push it back to PENDING_GC.
+         */
+        case KLDRSTATE_RELOADED_LOADED_PREREQUISITES:
+        case KLDRSTATE_RELOADED_FIXED_UP:
+            kldrDyldModUnloadPrerequisites(pMod);
+            KLDRDYLD_ASSERT(pMod->enmState == KLDRSTATE_PENDING_GC);
+            break;
+
+        /*
+         * Nothing to do, just asserting sanity.
+         */
+        case KLDRSTATE_INITIALIZING:
+            /* Implies there is another load going on. */
+            KLDRDYLD_ASSERT(g_cActiveLoadCalls > 1);
+            break;
+        case KLDRSTATE_TERMINATING:
+            /* GC in progress. */
+            KLDRDYLD_ASSERT(g_fActiveGC);
+            break;
+        case KLDRSTATE_PENDING_TERMINATION:
+        case KLDRSTATE_PENDING_INITIALIZATION:
+        case KLDRSTATE_PENDING_GC:
+        case KLDRSTATE_PENDING_DESTROY:
+            KLDRDYLD_ASSERT(rc);
+            break;
+        case KLDRSTATE_GOOD:
+            break;
+
+        /*
+         * Bad states.
+         */
+        default:
+            KLDRDYLD_ASSERT(!"drop frame bad state (a)");
+            break;
+    }
 }
 
@@ -1080 +1152 @@
     {
         PKLDRDYLDMOD pMod = g_papStackMods[--iLoad1st];
-        switch (pMod->enmState)
-        {
-            /*
-             * Just push it along to the PENDING_DESTROY state.
-             */
-            case KLDRSTATE_MAPPED:
-                KLDRDYLD_ASSERT(rc);
-                kldrDyldModUnmap(pMod);
-                KLDRDYLD_ASSERT(pMod->enmState == KLDRSTATE_PENDING_DESTROY);
-                break;
-
-            /*
-             * Move back to PENDING_GC.
-             */
-            case KLDRSTATE_RELOADED:
-                KLDRDYLD_ASSERT(rc);
-                pMod->enmState = KLDRSTATE_PENDING_GC;
-                break;
-
-            /*
-             * Unload prerequisites and unmap the modules.
-             */
-            case KLDRSTATE_LOADED_PREREQUISITES:
-            case KLDRSTATE_FIXED_UP:
-                KLDRDYLD_ASSERT(rc);
-                kldrDyldModUnloadPrerequisites(pMod);
-                KLDRDYLD_ASSERT(pMod->enmState == KLDRSTATE_PENDING_DESTROY);
-                kldrDyldModUnmap(pMod);
-                KLDRDYLD_ASSERT(pMod->enmState == KLDRSTATE_PENDING_DESTROY);
-                break;
-
-            /*
-             * Unload prerequisites and push it back to PENDING_GC.
-             */
-            case KLDRSTATE_RELOADED_LOADED_PREREQUISITES:
-            case KLDRSTATE_RELOADED_FIXED_UP:
-                kldrDyldModUnloadPrerequisites(pMod);
-                KLDRDYLD_ASSERT(pMod->enmState == KLDRSTATE_PENDING_GC);
-                break;
-
-            /*
-             * Nothing to do, just asserting sanity.
-             */
-            case KLDRSTATE_INITIALIZING:
-                /* Implies there is another load going on. */
-                KLDRDYLD_ASSERT(g_cActiveLoadCalls > 1);
-                break;
-            case KLDRSTATE_TERMINATING:
-                /* GC in progress. */
-                KLDRDYLD_ASSERT(g_fActiveGC);
-                break;
-            case KLDRSTATE_PENDING_TERMINATION:
-            case KLDRSTATE_PENDING_INITIALIZATION:
-            case KLDRSTATE_PENDING_GC:
-            case KLDRSTATE_PENDING_DESTROY:
-                KLDRDYLD_ASSERT(rc);
-                break;
-            case KLDRSTATE_GOOD:
-                break;
-
-            /*
-             * Bad states.
-             */
-            default:
-                KLDRDYLD_ASSERT(!"drop frame bad state (a)");
-                break;
-        }
+        kldrDyldStackCleanupOne(pMod, rc);
     }
 
@@ -1277 +1283 @@
     {
         PKLDRDYLDMOD pNext = pMod->Load.pNext;
+        kldrDyldModAddRef(pMod);
+
         switch (pMod->enmState)
         {
@@ -1284 +1292 @@
                 pMod->enmState = KLDRSTATE_GC;
                 kldrDyldModUnmap(pMod);
+                KLDRDYLD_ASSERT(pMod->enmState == KLDRSTATE_PENDING_DESTROY);
                 kldrDyldModDestroy(pMod);
+                KLDRDYLD_ASSERT(pMod->enmState == KLDRSTATE_DESTROYED);
                 break;
 
@@ -1293 +1303 @@
                 break;
         }
+
+        kldrDyldModDeref(pMod);
 
         /* next */