xnu-1504.7.4.tar.gz

[apple/xnu.git] / iokit / Kernel / IOPMrootDomain.cpp

diff --git a/iokit/Kernel/IOPMrootDomain.cpp b/iokit/Kernel/IOPMrootDomain.cpp
index c98da3b9f7dd3c76d49494e8543b6e5a22dc5d7c..848f67200d5bf6baa39be9c06e50e43dc8b62b78 100644 (file)
--- a/iokit/Kernel/IOPMrootDomain.cpp
+++ b/iokit/Kernel/IOPMrootDomain.cpp
@@ -1770,8 +1770,6 @@ IOReturn IOPMrootDomain::privateSleepSystem( const char *sleepReason )
         setProperty(kRootDomainSleepReasonKey, sleepReason);
     }
 
-    tracePoint(kIOPMTracePointSleepStarted);
-
     patriarch->sleepSystem();
     return kIOReturnSuccess;
 }
@@ -1985,6 +1983,7 @@ void IOPMrootDomain::wakeFromDoze( void )
 {
     if ( getPowerState() == DOZE_STATE )
     {
+        tracePoint(kIOPMTracePointSystemWakeDriversPhase);
         changePowerStateToPriv(ON_STATE);
         patriarch->wakeSystem();
     }
@@ -3708,6 +3707,11 @@ void IOPMrootDomain::handlePowerChangeStartForService(
                 gMessageClientType);
             tellClients(kIOMessageSystemWillPowerOn, clientMessageFilter);
         }
+        
+        if (SLEEP_STATE == newPowerState)
+        {
+            tracePoint(kIOPMTracePointSleepStarted);
+        }
     }
     
     if (*rdFlags & kServiceFlagTopLevelPCI)
@@ -4174,8 +4178,6 @@ void IOPMrootDomain::adjustPowerState( void )
              */
             setProperty(kRootDomainSleepReasonKey, kIOPMIdleSleepKey);
 
-            tracePoint(kIOPMTracePointSleepStarted);
-    
             sleepASAP = false;
             changePowerStateToPriv(SLEEP_STATE);
         }