Commit fbcd00e
Clean up creation/deletion of global payloads
1 parent c60ed47 commit fbcd00e
2 files changed
Lines changed: 27 additions & 21 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -25,7 +25,11 @@ NAN_METHOD({{ cppClassName }}::{{ cppFunctionName }}) { | |||
| 25 | 25 | {%elsif arg.isCallbackFunction %} | |
| 26 | 26 | if (!args[{{ arg.jsArg }}]->IsFunction()) { | |
| 27 | 27 | baton->{{ arg.name }} = NULL; | |
| 28 | + {%if arg.payload.globalPayload %} | ||
| 29 | + globalPayload->{{ arg.name }} = NULL; | ||
| 30 | + {%else%} | ||
| 28 | 31 | baton->{{ arg.payload.name }} = NULL; | |
| 32 | + {%endif%} | ||
| 29 | 33 | } | |
| 30 | 34 | else { | |
| 31 | 35 | baton->{{ arg.name}} = {{ cppFunctionName }}_{{ arg.name }}_cppCallback; | |
@@ -150,12 +154,7 @@ void {{ cppClassName }}::{{ cppFunctionName }}Worker::HandleOKCallback() { | |||
| 150 | 154 | delete baton->{{ arg.payload.name }}; | |
| 151 | 155 | {%endif%} | |
| 152 | 156 | {%elsif arg.globalPayload %} | |
| 153 | - {%each args|argsInfo as cbArg %} | ||
| 154 | - {%if cbArg.isCallbackFunction %} | ||
| 155 | - delete (({{ cppFunctionName}}_globalPayload*)baton->{{ arg.name }})->{{ cbArg.name }}; | ||
| 156 | - {%endif%} | ||
| 157 | - {%endeach%} | ||
| 158 | - free((void *)baton->{{ arg.name }}); | ||
| 157 | + delete ({{ cppFunctionName}}_globalPayload*)baton->{{ arg.name }}; | ||
| 159 | 158 | {%else%} | |
| 160 | 159 | free((void*)baton->{{ arg.name }}); | |
| 161 | 160 | {%endif%} | |
@@ -180,22 +179,11 @@ void {{ cppClassName }}::{{ cppFunctionName }}Worker::HandleOKCallback() { | |||
| 180 | 179 | free((void *)baton->{{ arg.name }}); | |
| 181 | 180 | } | |
| 182 | 181 | {%elsif arg.isCallbackFunction %} | |
| 183 | - {%if arg.payload.globalPayload %} | ||
| 184 | - {%each args|argsInfo as cbArg %} | ||
| 185 | - {%if cbArg.isCallbackFunction %} | ||
| 186 | - delete (({{ cppFunctionName }}_globalPayload*)baton->{{ arg.name }})->{{ cbArg.name }}; | ||
| 187 | - {%endif%} | ||
| 188 | - {%endeach%} | ||
| 189 | - {%else%} | ||
| 190 | - delete (NanCallback *)baton->{{ arg.payload.name }}; | ||
| 182 | + {%if not arg.payload.globalPayload %} | ||
| 183 | + delete baton->{{ arg.payload.name }}; | ||
| 191 | 184 | {%endif%} | |
| 192 | 185 | {%elsif arg.globalPayload %} | |
| 193 | - {%each args|argsInfo as cbArg %} | ||
| 194 | - {%if cbArg.isCallbackFunction %} | ||
| 195 | - delete (({{ cppFunctionName}}_globalPayload*)baton->{{ arg.name }})->{{ cbArg.name }}; | ||
| 196 | - {%endif%} | ||
| 197 | - {%endeach%} | ||
| 198 | - free((void *)baton->{{ arg.name }}); | ||
| 186 | + delete ({{ cppFunctionName}}_globalPayload*)baton->{{ arg.name }}; | ||
| 199 | 187 | {%endif%} | |
| 200 | 188 | {%endeach%} | |
| 201 | 189 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -132,9 +132,27 @@ class {{ cppClassName }} : public ObjectWrap { | |||
| 132 | 132 | struct {{ function.cppFunctionName }}_globalPayload { | |
| 133 | 133 | {%each function.args as arg %} | |
| 134 | 134 | {%if arg.isCallbackFunction %} | |
| 135 | - NanCallback * {{ arg.name }}; | ||
| 135 | + NanCallback * {{ arg.name }}; | ||
| 136 | 136 | {%endif%} | |
| 137 | 137 | {%endeach%} | |
| 138 | + | ||
| 139 | + {{ function.cppFunctionName }}_globalPayload() { | ||
| 140 | + {%each function.args as arg %} | ||
| 141 | + {%if arg.isCallbackFunction %} | ||
| 142 | + {{ arg.name }} = NULL; | ||
| 143 | + {%endif%} | ||
| 144 | + {%endeach%} | ||
| 145 | + } | ||
| 146 | + | ||
| 147 | + ~{{ function.cppFunctionName }}_globalPayload() { | ||
| 148 | + {%each function.args as arg %} | ||
| 149 | + {%if arg.isCallbackFunction %} | ||
| 150 | + if ({{ arg.name }} != NULL) { | ||
| 151 | + delete {{ arg.name }}; | ||
| 152 | + } | ||
| 153 | + {%endif%} | ||
| 154 | + {%endeach%} | ||
| 155 | + } | ||
| 138 | 156 | }; | |
| 139 | 157 | {%endif%} | |
| 140 | 158 | {%endeach%} | |
0 commit comments