Skip to content

Fix memory Leaks on iOS #1057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 25, 2022
Merged

Fix memory Leaks on iOS #1057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
51f2afd
fix leaks
samirnen Sep 14, 2022
55e6313
initialising session in constructor
samirnen Sep 15, 2022
9d75370
using dispatch once
samirnen Sep 19, 2022
37b5660
Merge branch 'main' of https://github.com/microsoft/cpp_client_teleme…
samirnen Oct 10, 2022
aeea76b
address comments
samirnen Oct 11, 2022
893dbab
fix pipeline failures
samirnen Oct 11, 2022
f964684
remove unneccesary headers
samirnen Oct 11, 2022
fca02e0
rename variables
Oct 19, 2022
eb860e3
revert changes
Oct 21, 2022
7374472
nit
Oct 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions lib/http/HttpClient_Apple.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,3 @@ namespace MAT_NS_BEGIN {
} MAT_NS_END

#endif // HTTPCLIENT_APPLE_HPP


18 changes: 10 additions & 8 deletions lib/http/HttpClient_Apple.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
return std::string("RESP-") + std::to_string(seq.fetch_add(1));
}

static dispatch_once_t once;
static NSURLSession* session;

class HttpRequestApple : public SimpleHttpRequest
{
public:
Expand All @@ -37,6 +40,10 @@
m_parent(parent)
{
m_parent->Add(static_cast<IHttpRequest*>(this));
dispatch_once(&once, ^{
NSURLSessionConfiguration* sessionConfig = [NSURLSessionConfiguration defaultSessionConfiguration];
session = [NSURLSession sessionWithConfiguration:sessionConfig];
});
}

~HttpRequestApple() noexcept
Expand All @@ -50,10 +57,7 @@ void SendAsync(IHttpResponseCallback* callback)
{
m_callback = callback;
NSString* url = [[NSString alloc] initWithUTF8String:m_url.c_str()];
NSURLSessionConfiguration* sessionConfig = [NSURLSessionConfiguration defaultSessionConfiguration];
m_urlRequest = [[NSMutableURLRequest alloc] initWithURL:[NSURL URLWithString:url]];
m_session = [NSURLSession sessionWithConfiguration:sessionConfig];
m_session.sessionDescription = url;

for(const auto& header : m_headers)
{
Expand All @@ -71,13 +75,13 @@ void SendAsync(IHttpResponseCallback* callback)
if(equalsIgnoreCase(m_method, "get"))
{
[m_urlRequest setHTTPMethod:@"GET"];
m_dataTask = [m_session dataTaskWithRequest:m_urlRequest completionHandler:m_completionMethod];
m_dataTask = [session dataTaskWithRequest:m_urlRequest completionHandler:m_completionMethod];
}
else
{
[m_urlRequest setHTTPMethod:@"POST"];
NSData* postData = [NSData dataWithBytes:m_body.data() length:m_body.size()];
m_dataTask = [m_session uploadTaskWithRequest:m_urlRequest fromData:postData completionHandler:m_completionMethod];
m_dataTask = [session uploadTaskWithRequest:m_urlRequest fromData:postData completionHandler:m_completionMethod];
}

[m_dataTask resume];
Expand Down Expand Up @@ -128,7 +132,7 @@ void HandleResponse(NSData* data, NSURLResponse* response, NSError* error)
void Cancel()
{
[m_dataTask cancel];
[m_session getTasksWithCompletionHandler:^(NSArray* dataTasks, NSArray* uploadTasks, NSArray* downloadTasks)
[session getTasksWithCompletionHandler:^(NSArray* dataTasks, NSArray* uploadTasks, NSArray* downloadTasks)
{
for (NSURLSessionTask* _task in dataTasks)
{
Expand All @@ -150,7 +154,6 @@ void Cancel()
private:
HttpClient_Apple* m_parent = nullptr;
IHttpResponseCallback* m_callback = nullptr;
NSURLSession* m_session = nullptr;
NSURLSessionDataTask* m_dataTask = nullptr;
NSMutableURLRequest* m_urlRequest = nullptr;
void (^m_completionMethod)(NSData* data, NSURLResponse* response, NSError* error);
Expand Down Expand Up @@ -233,4 +236,3 @@ void Cancel()
} MAT_NS_END

#endif