Skip to content
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

Improve memory management in Channel #368

Merged
merged 3 commits into from
Feb 14, 2019
Merged

Improve memory management in Channel #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
998e8e0
Improve memory management in Channel
kevints Feb 14, 2019
6565abe
Also use gpr_free to free cgrpc_calls
kevints Feb 14, 2019
b4fcf4c
Fix imports in call.c
kevints Feb 14, 2019
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
6 changes: 3 additions & 3 deletions Sources/CgRPC/shim/call.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
#include "internal.h"
#include "cgrpc.h"

#include <grpc/support/alloc.h>

#include <stdlib.h>
#include <string.h>
#include <assert.h>

void cgrpc_call_destroy(cgrpc_call *call) {
if (call->call) {
grpc_call_unref(call->call);
}
free(call);
gpr_free(call);
}

grpc_call_error cgrpc_call_perform(cgrpc_call *call, cgrpc_operations *operations, void *tag) {
Expand Down
14 changes: 5 additions & 9 deletions Sources/CgRPC/shim/channel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,12 @@
#include <grpc/support/string_util.h>
#include <grpc/support/alloc.h>

#include <assert.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

cgrpc_channel *cgrpc_channel_create(const char *address,
grpc_arg *args,
int num_args) {
cgrpc_channel *c = (cgrpc_channel *) malloc(sizeof (cgrpc_channel));
cgrpc_channel *c = (cgrpc_channel *) gpr_zalloc(sizeof (cgrpc_channel));

grpc_channel_args channel_args;
channel_args.args = args;
Expand All @@ -43,7 +40,7 @@ cgrpc_channel *cgrpc_channel_create_secure(const char *address,
const char *client_private_key,
grpc_arg *args,
int num_args) {
cgrpc_channel *c = (cgrpc_channel *) malloc(sizeof (cgrpc_channel));
cgrpc_channel *c = (cgrpc_channel *) gpr_zalloc(sizeof (cgrpc_channel));

grpc_channel_args channel_args;
channel_args.args = args;
Expand All @@ -66,7 +63,7 @@ cgrpc_channel *cgrpc_channel_create_secure(const char *address,
cgrpc_channel *cgrpc_channel_create_google(const char *address,
grpc_arg *args,
int num_args) {
cgrpc_channel *c = (cgrpc_channel *) malloc(sizeof (cgrpc_channel));
cgrpc_channel *c = (cgrpc_channel *) gpr_zalloc(sizeof (cgrpc_channel));

grpc_channel_args channel_args;
channel_args.args = args;
Expand All @@ -83,7 +80,7 @@ cgrpc_channel *cgrpc_channel_create_google(const char *address,
void cgrpc_channel_destroy(cgrpc_channel *c) {
grpc_channel_destroy(c->channel);
c->channel = NULL;
free(c);
gpr_free(c);
}

cgrpc_call *cgrpc_channel_create_call(cgrpc_channel *channel,
Expand All @@ -105,8 +102,7 @@ cgrpc_call *cgrpc_channel_create_call(cgrpc_channel *channel,
NULL);
grpc_slice_unref(host_slice);
grpc_slice_unref(method_slice);
cgrpc_call *call = (cgrpc_call *) malloc(sizeof(cgrpc_call));
memset(call, 0, sizeof(cgrpc_call));
cgrpc_call *call = (cgrpc_call *) gpr_zalloc(sizeof(cgrpc_call));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume gpr_zalloc is guaranteed to return zeroed memory?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, here are the docs: https://grpc.io/grpc/cpp/alloc_8h.html#ad9a7a782f4f00cad27d64d27ebbd1a72

call->call = channel_call;
return call;
}
Expand Down
26 changes: 16 additions & 10 deletions Sources/SwiftGRPC/Core/Channel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,14 @@ public class Channel {
gRPC.initialize()
host = address
let argumentWrappers = arguments.map { $0.toCArg() }
var argumentValues = argumentWrappers.map { $0.wrapped }

if secure {
underlyingChannel = cgrpc_channel_create_secure(address, roots_pem(), nil, nil, &argumentValues, Int32(arguments.count))
} else {
underlyingChannel = cgrpc_channel_create(address, &argumentValues, Int32(arguments.count))
underlyingChannel = withExtendedLifetime(argumentWrappers) {
var argumentValues = argumentWrappers.map { $0.wrapped }
if secure {
return cgrpc_channel_create_secure(address, roots_pem(), nil, nil, &argumentValues, Int32(arguments.count))
} else {
return cgrpc_channel_create(address, &argumentValues, Int32(arguments.count))
}
}
completionQueue = CompletionQueue(underlyingCompletionQueue: cgrpc_channel_completion_queue(underlyingChannel), name: "Client")
completionQueue.run() // start a loop that watches the channel's completion queue
Expand All @@ -64,9 +66,11 @@ public class Channel {
gRPC.initialize()
host = googleAddress
let argumentWrappers = arguments.map { $0.toCArg() }
var argumentValues = argumentWrappers.map { $0.wrapped }

underlyingChannel = cgrpc_channel_create_google(googleAddress, &argumentValues, Int32(arguments.count))

underlyingChannel = withExtendedLifetime(argumentWrappers) {
var argumentValues = argumentWrappers.map { $0.wrapped }
return cgrpc_channel_create_google(googleAddress, &argumentValues, Int32(arguments.count))
}

completionQueue = CompletionQueue(underlyingCompletionQueue: cgrpc_channel_completion_queue(underlyingChannel), name: "Client")
completionQueue.run() // start a loop that watches the channel's completion queue
Expand All @@ -83,9 +87,11 @@ public class Channel {
gRPC.initialize()
host = address
let argumentWrappers = arguments.map { $0.toCArg() }
var argumentValues = argumentWrappers.map { $0.wrapped }

underlyingChannel = cgrpc_channel_create_secure(address, certificates, clientCertificates, clientKey, &argumentValues, Int32(arguments.count))
underlyingChannel = withExtendedLifetime(argumentWrappers) {
var argumentValues = argumentWrappers.map { $0.wrapped }
return cgrpc_channel_create_secure(address, certificates, clientCertificates, clientKey, &argumentValues, Int32(arguments.count))
}
completionQueue = CompletionQueue(underlyingCompletionQueue: cgrpc_channel_completion_queue(underlyingChannel), name: "Client")
completionQueue.run() // start a loop that watches the channel's completion queue
}
Expand Down