Skip to content

Fix callbacks with just return value and single payload #416

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
johnhaley81 merged 11 commits into from
Feb 24, 2015
Merged

Fix callbacks with just return value and single payload #416

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2aff3c0
Fix callbacks with just return value
Feb 20, 2015
deeb885
Normalize returns for callbacks
Feb 20, 2015
0a7ac52
Force functions with callbacks to be async
Feb 20, 2015
530290d
Handle global payloads in functions
Feb 20, 2015
e954ae5
Fix promises not being returned in index test
Feb 23, 2015
67c6eb2
Fix git_strarray when an actual array is passed in
Feb 23, 2015
0744320
Cleanup memory from global payloads
Feb 23, 2015
d40d791
Promisify writeFile by hand in index tests
Feb 23, 2015
99f9fda
Fix linter errors
Feb 23, 2015
3b9b637
Clean up creation/deletion of global payloads
Feb 23, 2015
dece787
Clean up callbacks in structs
Feb 23, 2015
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
Prev Previous commit
Next Next commit
Handle global payloads in functions
  • Loading branch information
John Haley committed Feb 24, 2015
commit 530290dcc1b498f5dbb5f14e298619cad1bcace1
1 change: 1 addition & 0 deletions generate/scripts/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ var Helpers = {
processPayload: function(field, allFields) {
if (field.name === "payload") {
field.payloadFor = "*";
field.globalPayload = true;
field.isOptional = true;
}
else {
Expand Down
32 changes: 31 additions & 1 deletion generate/templates/partials/async_function.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,12 @@ NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {
baton->error_code = GIT_OK;
baton->error = NULL;

{%each args|argsInfo as arg %}
{%if arg.globalPayload %}
{{ cppFunctionName }}_globalPayload* globalPayload = new {{ cppFunctionName }}_globalPayload;
{%endif%}
{%endeach%}

{%each args|argsInfo as arg %}
{%if not arg.isReturn %}
{%if arg.isSelf %}
Expand All @@ -23,10 +29,16 @@ NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {
}
else {
baton->{{ arg.name}} = {{ cppFunctionName }}_{{ arg.name }}_cppCallback;
{%if arg.payload.globalPayload %}
globalPayload->{{ arg.name }} = new NanCallback(args[{{ arg.jsArg }}].As<Function>());
{%else%}
baton->{{ arg.payload.name }} = new NanCallback(args[{{ arg.jsArg }}].As<Function>());
{%endif%}
}
{%elsif arg.payloadFor %}
{%-- payloads are ignored --%}
{%if arg.globalPayload %}
baton->{{ arg.name }} = globalPayload;
{%endif%}
{%elsif arg.name %}
{%partial convertFromV8 arg%}
{%if not arg.payloadFor %}
Expand Down Expand Up @@ -134,7 +146,16 @@ void {{ cppClassName }}::{{ cppFunctionName }}Worker::HandleOKCallback() {
free((void*)baton->{{ arg.name }});
}
{%elsif arg.isCallbackFunction %}
{%if not arg.payload.globalPayload %}
delete baton->{{ arg.payload.name }};
{%endif%}
{%elsif arg.globalPayload %}
{%each args|argsInfo as cbArg %}
{%if cbArg.isCallbackFunction %}
delete (({{ cppFunctionName}}_globalPayload*)baton->{{ arg.name }})->{{ cbArg.name }};
{%endif%}
{%endeach%}
free((void *)baton->{{ arg.name }});
{%else%}
free((void*)baton->{{ arg.name }});
{%endif%}
Expand All @@ -159,7 +180,16 @@ void {{ cppClassName }}::{{ cppFunctionName }}Worker::HandleOKCallback() {
free((void *)baton->{{ arg.name }});
}
{%elsif arg.isCallbackFunction %}
{%if not arg.payload.globalPayload %}
delete (NanCallback *)baton->{{ arg.payload.name }};
{%endif%}
{%elsif arg.globalPayload %}
{%each args|argsInfo as cbArg %}
{%if cbArg.isCallbackFunction %}
delete (({{ cppFunctionName}}_globalPayload*)baton->{{ arg.name }})->{{ cbArg.name }};
{%endif%}
{%endeach%}
free((void *)baton->{{ arg.name }});
{%endif%}
{%endeach%}

Expand Down
4 changes: 4 additions & 0 deletions generate/templates/partials/callback_helpers.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,11 @@ void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbFunction.name }}_asyncAfter(

{% each cbFunction.args|argsInfo as arg %}
{% if arg | isPayload %}
{% if cbFunction.payload.globalPayload %}
NanCallback* callback = (({{ cppFunctionName }}_globalPayload*)baton->{{ arg.name }})->{{ cbFunction.name }};
{% else %}
NanCallback* callback = (NanCallback *)baton->{{ arg.name }};
{% endif %}
{% endif %}
{% endeach %}

Expand Down
24 changes: 2 additions & 22 deletions generate/templates/partials/sync_function.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,27 +15,20 @@ NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) {
{%each args|argsInfo as arg %}
{%if not arg.isSelf %}
{%if not arg.isReturn %}
{%if not arg.isCallbackFunction %}
{%if not arg.payloadFor %}
{%partial convertFromV8 arg %}
{%if arg.saveArg %}
{%partial convertFromV8 arg %}
{%if arg.saveArg %}
Handle<Object> {{ arg.name }}(args[{{ arg.jsArg }}]->ToObject());
{{ cppClassName }} *thisObj = ObjectWrap::Unwrap<{{ cppClassName }}>(args.This());

NanDisposePersistent(thisObj->{{ cppFunctionName }}_{{ arg.name }});

NanAssignPersistent(thisObj->{{ cppFunctionName }}_{{ arg.name }}, {{ arg.name }});
{%endif%}
{%endif%}
{%endif%}
{%endif%}
{%endif%}
{%endeach%}

{%each args|argsInfo as arg %}
{%if arg.isCallbackFunction %}
NanCallback* {{ arg.name }}_callback = new NanCallback(args[{{ arg.jsArg }}].As<Function>());
{%endif%}
{%endeach%}
{%if .|hasReturns %}
{{ return.cType }} result = {%endif%}{{ cFunctionName }}(
Expand All @@ -47,24 +40,13 @@ NanCallback* {{ arg.name }}_callback = new NanCallback(args[{{ arg.jsArg }}].As<
ObjectWrap::Unwrap<{{ arg.cppClassName }}>(args.This())->GetValue()
{%elsif arg.isReturn %}
{{ arg.name }}
{%elsif arg.isCallbackFunction %}
{{ cppFunctionName }}_{{ arg.name }}_cppCallback,
{{ arg.name }}_callback
{%elsif arg.payloadFor %}
{%-- payloads are handled inside of the callback condition --%}
{%else%}
from_{{ arg.name }}
{%endif%}
{%if not arg.lastArg %},{%endif%}
{%endeach%}
);

{%each args|argsInfo as arg %}
{%if arg.isCallbackFunction %}
delete {{ arg.name }}_callback;
{%endif%}
{%endeach%}

{%if return.isErrorCode %}
if (result != GIT_OK) {
{%each args|argsInfo as arg %}
Expand Down Expand Up @@ -120,5 +102,3 @@ delete {{ arg.name }}_callback;
{%endif%}
{%endif%}
}

{%partial callbackHelpers .%}
22 changes: 15 additions & 7 deletions generate/templates/templates/class_header.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,17 +135,25 @@ class {{ cppClassName }} : public ObjectWrap {
};
{%endif%}

{%each function.args as arg %}
{%if arg.payloadFor %}

Persistent<Value> {{ function.cppFunctionName }}_{{ arg.name }};
{%endif%}
{%endeach%}

static NAN_METHOD({{ function.cppFunctionName }});
{%endif%}
{%endeach%}

{%each functions as function%}
{%each function.args as arg %}
{% if arg.globalPayload %}

struct {{ function.cppFunctionName }}_globalPayload {
{%each function.args as arg %}
{%if arg.isCallbackFunction %}
NanCallback * {{ arg.name }};
{%endif%}
{%endeach%}
};
{%endif%}
{%endeach%}
{%endeach%}

{%if cType%}
{{ cType }} *raw;
{%endif%}
Expand Down