Bug 184520 – [iOS] Add a mechanism for holding Wi-Fi assertions

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Andy Estes]

[iOS] Add a mechanism for holding Wi-Fi assertions

[Andy Estes]

Created attachment 337756 [details]
Patch

[Sam Weinig]

Can this be tested?

[Wenson Hsieh]

(In reply to Sam Weinig from comment #2)
> Can this be tested?

Not with any existing mechanism in WebKit, unfortunately. This is blocked on <rdar://problem/37710976>.

[Sam Weinig]

Comment on attachment 337756 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=337756&action=review

> Source/WebKit/NetworkProcess/cocoa/WiFiAssertionHolder.cpp:61
> +#include <MobileWiFi/WiFiManagerClient.h>
> +
> +namespace WebKit {
> +
> +static WiFiManagerClientRef ensureWiFiManagerClient()
> +{
> +    static WiFiManagerClientRef wiFiManagerClient = WiFiManagerClientCreate(kCFAllocatorDefault, kWiFiClientTypeNormal);
> +    return wiFiManagerClient;
> +}
> +
> +static uint64_t wiFiAssertionCount;
> +
> +WiFiAssertionHolder::WiFiAssertionHolder()
> +{
> +    if (wiFiAssertionCount++)
> +        return;
> +
> +    RELEASE_LOG(WiFiAssertions, "Acquiring Wi-Fi assertion.");
> +    WiFiManagerClientSetType(ensureWiFiManagerClient(), kWiFiClientTypeBackground);
> +}
> +
> +WiFiAssertionHolder::~WiFiAssertionHolder()
> +{
> +    ASSERT(wiFiAssertionCount);
> +    if (--wiFiAssertionCount)
> +        return;
> +
> +    RELEASE_LOG(WiFiAssertions, "Releasing Wi-Fi assertion.");
> +    WiFiManagerClientSetType(ensureWiFiManagerClient(), kWiFiClientTypeNormal);
> +}

This should probably be in a HAVE(MOBILE_WIFI) #ifdef.

Also, it's a bit confusing that taking the assertion puts things in "background' type, and releasing it makes it normal.

[Andy Estes]

(In reply to Sam Weinig from comment #4)
> Comment on attachment 337756 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=337756&action=review
> 
> > Source/WebKit/NetworkProcess/cocoa/WiFiAssertionHolder.cpp:61
> > +#include <MobileWiFi/WiFiManagerClient.h>
> > +
> > +namespace WebKit {
> > +
> > +static WiFiManagerClientRef ensureWiFiManagerClient()
> > +{
> > +    static WiFiManagerClientRef wiFiManagerClient = WiFiManagerClientCreate(kCFAllocatorDefault, kWiFiClientTypeNormal);
> > +    return wiFiManagerClient;
> > +}
> > +
> > +static uint64_t wiFiAssertionCount;
> > +
> > +WiFiAssertionHolder::WiFiAssertionHolder()
> > +{
> > +    if (wiFiAssertionCount++)
> > +        return;
> > +
> > +    RELEASE_LOG(WiFiAssertions, "Acquiring Wi-Fi assertion.");
> > +    WiFiManagerClientSetType(ensureWiFiManagerClient(), kWiFiClientTypeBackground);
> > +}
> > +
> > +WiFiAssertionHolder::~WiFiAssertionHolder()
> > +{
> > +    ASSERT(wiFiAssertionCount);
> > +    if (--wiFiAssertionCount)
> > +        return;
> > +
> > +    RELEASE_LOG(WiFiAssertions, "Releasing Wi-Fi assertion.");
> > +    WiFiManagerClientSetType(ensureWiFiManagerClient(), kWiFiClientTypeNormal);
> > +}
> 
> This should probably be in a HAVE(MOBILE_WIFI) #ifdef.

Ok.

> 
> Also, it's a bit confusing that taking the assertion puts things in
> "background' type, and releasing it makes it normal.

Agreed. I had to double-check that those are the right types to use. Strangely enough they are.

[Andy Estes]

Created attachment 337773 [details]
Patch

[Andy Estes]

rdar://problem/39025726

[Andy Estes]

Created attachment 337774 [details]
Patch

[Andy Estes]

Created attachment 337778 [details]
Patch

[Andy Estes]

Committed r230560: <https://trac.webkit.org/changeset/230560>

[Chris Dumez]

Comment on attachment 337778 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=337778&action=review

> Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:48
> +#import <WebKitAdditions/NetworkDataTaskCocoaAdditions.mm>

Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:48:9: fatal error: 'WebKitAdditions/NetworkDataTaskCocoaAdditions.mm' file not found
#import <WebKitAdditions/NetworkDataTaskCocoaAdditions.mm>

[Wenson Hsieh]

Comment on attachment 337778 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=337778&action=review

>> Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:48
>> +#import <WebKitAdditions/NetworkDataTaskCocoaAdditions.mm>
> 
> Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:48:9: fatal error: 'WebKitAdditions/NetworkDataTaskCocoaAdditions.mm' file not found
> #import <WebKitAdditions/NetworkDataTaskCocoaAdditions.mm>

Internal bots seems happy. Did you pull trunk on both repositories?

[Chris Dumez]

(In reply to Wenson Hsieh from comment #12)
> Comment on attachment 337778 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=337778&action=review
> 
> >> Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:48
> >> +#import <WebKitAdditions/NetworkDataTaskCocoaAdditions.mm>
> > 
> > Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:48:9: fatal error: 'WebKitAdditions/NetworkDataTaskCocoaAdditions.mm' file not found
> > #import <WebKitAdditions/NetworkDataTaskCocoaAdditions.mm>
> 
> Internal bots seems happy. Did you pull trunk on both repositories?

Yes I did.

[Chris Dumez]

(In reply to Chris Dumez from comment #13)
> (In reply to Wenson Hsieh from comment #12)
> > Comment on attachment 337778 [details]
> > Patch
> > 
> > View in context:
> > https://bugs.webkit.org/attachment.cgi?id=337778&action=review
> > 
> > >> Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:48
> > >> +#import <WebKitAdditions/NetworkDataTaskCocoaAdditions.mm>
> > > 
> > > Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:48:9: fatal error: 'WebKitAdditions/NetworkDataTaskCocoaAdditions.mm' file not found
> > > #import <WebKitAdditions/NetworkDataTaskCocoaAdditions.mm>
> > 
> > Internal bots seems happy. Did you pull trunk on both repositories?
> 
> Yes I did.

Never mind, I was on a branch...