Security-59306.61.1.tar.gz

[apple/security.git] / OSX / libsecurity_utilities / lib / powerwatch.cpp

diff --git a/OSX/libsecurity_utilities/lib/powerwatch.cpp b/OSX/libsecurity_utilities/lib/powerwatch.cpp
index 239f1acb46405fc2b9a0571eb13e30cd4bb4538d..f23735db9e851640b1243a8705b5933b1b5ea7f8 100644 (file)
--- a/OSX/libsecurity_utilities/lib/powerwatch.cpp
+++ b/OSX/libsecurity_utilities/lib/powerwatch.cpp
@@ -28,6 +28,7 @@
 #include "powerwatch.h"
 #include <IOKit/IOMessage.h>
 
 #include "powerwatch.h"
 #include <IOKit/IOMessage.h>
 

+#if TARGET_OS_OSX

 
 namespace Security {
 namespace MachPlusPlus {
 
 namespace Security {
 namespace MachPlusPlus {


@@ -61,110 +62,19 @@ void PowerWatcher::systemWillPowerOn()
 // IOPowerWatchers
 //
 
 // IOPowerWatchers
 //
 

-void
-IOPowerWatcher::iopmcallback(void *                            param, 
-                            IOPMConnection                    connection,
-                            IOPMConnectionMessageToken        token, 
-                            IOPMSystemPowerStateCapabilities   capabilities)
-{
-    IOPowerWatcher *me = (IOPowerWatcher *)param;
-
-       secnotice("powerwatch", "powerstates");
-       if (capabilities & kIOPMSystemPowerStateCapabilityDisk)
-           secnotice("powerwatch", "disk");
-       if (capabilities & kIOPMSystemPowerStateCapabilityNetwork)
-           secnotice("powerwatch", "net");
-       if (capabilities & kIOPMSystemPowerStateCapabilityAudio) 
-           secnotice("powerwatch", "audio");
-       if (capabilities & kIOPMSystemPowerStateCapabilityVideo)
-           secnotice("powerwatch", "video");
-
-    /* if cpu and no display -> in DarkWake */
-    if ((capabilities & (kIOPMSystemPowerStateCapabilityCPU|kIOPMSystemPowerStateCapabilityVideo)) == kIOPMSystemPowerStateCapabilityCPU) {
-        secnotice("powerwatch", "enter DarkWake");
-       me->mInDarkWake = true;
-    } else if (me->mInDarkWake) {
-        secnotice("powerwatch", "exit DarkWake");
-       me->mInDarkWake = false;
-    }
-
-    (void)IOPMConnectionAcknowledgeEvent(connection, token);
-
-    return;
-}
-
-
-void
-IOPowerWatcher::setupDarkWake()
-{
-    IOReturn            ret;
-    
-    mInDarkWake = false;
-
-    ret = ::IOPMConnectionCreate(CFSTR("IOPowerWatcher"),
-                                kIOPMSystemPowerStateCapabilityDisk 
-                                | kIOPMSystemPowerStateCapabilityNetwork
-                                | kIOPMSystemPowerStateCapabilityAudio 
-                                | kIOPMSystemPowerStateCapabilityVideo,
-                                &mIOPMconn);
-    if (ret == kIOReturnSuccess) {
-        ret = ::IOPMConnectionSetNotification(mIOPMconn, this,
-                          (IOPMEventHandlerType)iopmcallback);
-        if (ret == kIOReturnSuccess) {
-            ::IOPMConnectionSetDispatchQueue(mIOPMconn, mIOPMqueue);
-        }
-    }
-
-    mUserActiveHandle = IOPMScheduleUserActiveChangedNotification(mIOPMqueue, ^(bool active) {
-        if (active) {
-            mInDarkWake = false;
-        }
-    });
-
-    dispatch_group_leave(mDarkWakeGroup);
-}
-

 IOPowerWatcher::IOPowerWatcher() :
 IOPowerWatcher::IOPowerWatcher() :

-    mKernelPort(0), mIOPMconn(NULL), mIOPMqueue(NULL), mDarkWakeGroup(NULL), mUserActiveHandle(NULL)
+    mKernelPort(0)

 {
        if (!(mKernelPort = ::IORegisterForSystemPower(this, &mPortRef, ioCallback, &mHandle)))
                UnixError::throwMe(EINVAL);     // no clue
 {
        if (!(mKernelPort = ::IORegisterForSystemPower(this, &mPortRef, ioCallback, &mHandle)))
                UnixError::throwMe(EINVAL);     // no clue

-
-       mIOPMqueue = dispatch_queue_create("com.apple.security.IOPowerWatcher", NULL);
-       if (mIOPMqueue == NULL)
-               return;
-
-       // Running in background since this will wait for the power
-       // management in configd and we are not willing to block on
-       // that, power events will come in when they do.
-       mDarkWakeGroup = dispatch_group_create();
-       dispatch_group_enter(mDarkWakeGroup);
-       dispatch_async(mIOPMqueue, ^ { setupDarkWake(); });

 }
 
 IOPowerWatcher::~IOPowerWatcher()
 {
 }
 
 IOPowerWatcher::~IOPowerWatcher()
 {

-       // Make sure to wait until the asynchronous method
-       // finishes, to avoid <rdar://problem/14355434>
-       if (mDarkWakeGroup) {
-               ::dispatch_group_wait(mDarkWakeGroup, DISPATCH_TIME_FOREVER);
-               ::dispatch_release(mDarkWakeGroup);
-       }

        if (mKernelPort)
                ::IODeregisterForSystemPower(&mHandle);
        if (mKernelPort)
                ::IODeregisterForSystemPower(&mHandle);

-
-       if (mIOPMconn) {
-               ::IOPMConnectionSetDispatchQueue(mIOPMconn, NULL);
-               ::IOPMConnectionRelease(mIOPMconn);
-       }
-       if (mUserActiveHandle)
-               ::IOPMUnregisterNotification(mUserActiveHandle);
-       if (mIOPMqueue)
-               ::dispatch_release(mIOPMqueue);
-

 }
 
 }
 

-

 //
 // The callback dispatcher
 //
 //
 // The callback dispatcher
 //


@@ -252,3 +162,5 @@ boolean_t PortPowerWatcher::handle(mach_msg_header_t *in)
 } // end namespace MachPlusPlus
 
 } // end namespace Security
 } // end namespace MachPlusPlus
 
 } // end namespace Security

+
+#endif //TARGET_OS_OSX