Store defaultResult in baton

srajko · srajko · commit 266aa3fa2f7b · 2016-03-03T12:13:32.000-07:00
I originally tried doing the throttling in the baton but that ended up being a mistake. This moved the default result to the baton so the baton could use it. I don't think the change is necessary for the final version of this PR, but I still like moving things out of combyne-templated files so I kept it.
diff --git a/generate/templates/manual/include/async_baton.h b/generate/templates/manual/include/async_baton.h
@@ -19,6 +19,11 @@ struct AsyncBaton {
 template<typename ResultT>
 struct AsyncBatonWithResult : public AsyncBaton {
   ResultT result;
+  ResultT defaultResult; // result returned if the callback doesn't return anything valid
+
+  AsyncBatonWithResult(const ResultT &defaultResult)
+    : defaultResult(defaultResult) {
+  }
 
   ResultT ExecuteAsync(uv_async_cb asyncCallback) {
     result = 0;
diff --git a/generate/templates/partials/callback_helpers.cc b/generate/templates/partials/callback_helpers.cc
@@ -6,7 +6,8 @@
     {{ arg.cType }} {{ arg.name}}{% if not arg.lastArg %},{% endif %}
   {% endeach %}
 ) {
-  {{ cppFunctionName }}_{{ cbFunction.name|titleCase }}Baton* baton = new {{ cppFunctionName }}_{{ cbFunction.name|titleCase }}Baton();
+  {{ cppFunctionName }}_{{ cbFunction.name|titleCase }}Baton* baton =
+    new {{ cppFunctionName }}_{{ cbFunction.name|titleCase }}Baton({{ cbFunction.return.noResults }});
 
   {% each cbFunction.args|argsInfo as arg %}
     baton->{{ arg.name }} = {{ arg.name }};
@@ -78,12 +79,12 @@ void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbFunction.name }}_async(uv_as
         baton->result = (int)result->ToNumber()->Value();
       }
       else {
-        baton->result = {{ cbFunction.return.noResults }};
+        baton->result = baton->defaultResult;
       }
       {% endif %}
     }
     else {
-      baton->result = {{ cbFunction.return.noResults }};
+      baton->result = baton->defaultResult;
     }
   {% endeach %}
 
@@ -112,12 +113,12 @@ void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbFunction.name }}_promiseComp
           baton->result = (int)result->ToNumber()->Value();
         }
         else {
-          baton->result = {{ cbFunction.return.noResults }};
+          baton->result = baton->defaultResult;
         }
         {% endif %}
       }
       else {
-        baton->result = {{ cbFunction.return.noResults }};
+        baton->result = baton->defaultResult;
       }
     {% endeach %}
   }
diff --git a/generate/templates/partials/field_accessors.cc b/generate/templates/partials/field_accessors.cc
@@ -87,7 +87,8 @@
           {{ arg.cType }} {{ arg.name}}{% if not arg.lastArg %},{% endif %}
         {% endeach %}
       ) {
-        {{ field.name|titleCase }}Baton* baton = new {{ field.name|titleCase }}Baton();
+        {{ field.name|titleCase }}Baton* baton =
+          new {{ field.name|titleCase }}Baton({{ field.return.noResults }});
 
         {% each field.args|argsInfo as arg %}
           baton->{{ arg.name }} = {{ arg.name }};
@@ -106,7 +107,7 @@
 
         if (instance->{{ field.name }}->IsEmpty()) {
           {% if field.return.type == "int" %}
-            baton->result = {{ field.return.noResults }}; // no results acquired
+            baton->result = baton->defaultResult; // no results acquired
           {% endif %}
 
           baton->done = true;
@@ -172,12 +173,12 @@
               baton->result = (int)result->ToNumber()->Value();
             }
             else {
-              baton->result = {{ field.return.noResults }};
+              baton->result = baton->defaultResult;
             }
             {% endif %}
           }
           else {
-            baton->result = {{ field.return.noResults }};
+            baton->result = baton->defaultResult;
           }
         {% endeach %}
         baton->done = true;
@@ -205,12 +206,12 @@
                 baton->result = (int)result->ToNumber()->Value();
               }
               else{
-                baton->result = {{ field.return.noResults }};
+                baton->result = baton->defaultResult;
               }
               {% endif %}
             }
             else {
-              baton->result = {{ field.return.noResults }};
+              baton->result = baton->defaultResult;
             }
           {% endeach %}
         }
diff --git a/generate/templates/templates/class_header.h b/generate/templates/templates/class_header.h
@@ -68,6 +68,10 @@ class {{ cppClassName }} : public Nan::ObjectWrap {
       {% each arg.args|argsInfo as cbArg %}
       {{ cbArg.cType }} {{ cbArg.name }};
       {% endeach %}
+
+      {{ function.cppFunctionName }}_{{ arg.name|titleCase }}Baton(const {{ arg.return.type }} &defaultResult)
+        : AsyncBatonWithResult<{{ arg.return.type }}>(defaultResult) {
+        }
     };
           {% endif %}
         {% endeach %}
diff --git a/generate/templates/templates/struct_header.h b/generate/templates/templates/struct_header.h
@@ -52,6 +52,10 @@ class {{ cppClassName }} : public Nan::ObjectWrap {
             {% each field.args|argsInfo as arg %}
               {{ arg.cType }} {{ arg.name}};
             {% endeach %}
+
+            {{ field.name|titleCase }}Baton(const {{ field.return.type }} &defaultResult)
+              : AsyncBatonWithResult<{{ field.return.type }}>(defaultResult) {
+              }
           };
         {% endif %}
       {% endif %}

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,8 @@`
`6`	`6`	`{{ arg.cType }} {{ arg.name}}{% if not arg.lastArg %},{% endif %}`
`7`	`7`	`{% endeach %}`
`8`	`8`	`) {`
`9`		`- {{ cppFunctionName }}_{{ cbFunction.name\|titleCase }}Baton* baton = new {{ cppFunctionName }}_{{ cbFunction.name\|titleCase }}Baton();`
	`9`	`+ {{ cppFunctionName }}_{{ cbFunction.name\|titleCase }}Baton* baton =`
	`10`	`+ new {{ cppFunctionName }}_{{ cbFunction.name\|titleCase }}Baton({{ cbFunction.return.noResults }});`
`10`	`11`
`11`	`12`	`{% each cbFunction.args\|argsInfo as arg %}`
`12`	`13`	`baton->{{ arg.name }} = {{ arg.name }};`
`@@ -78,12 +79,12 @@ void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbFunction.name }}_async(uv_as`
`78`	`79`	`baton->result = (int)result->ToNumber()->Value();`
`79`	`80`	`}`
`80`	`81`	`else {`
`81`		`- baton->result = {{ cbFunction.return.noResults }};`
	`82`	`+ baton->result = baton->defaultResult;`
`82`	`83`	`}`
`83`	`84`	`{% endif %}`
`84`	`85`	`}`
`85`	`86`	`else {`
`86`		`- baton->result = {{ cbFunction.return.noResults }};`
	`87`	`+ baton->result = baton->defaultResult;`
`87`	`88`	`}`
`88`	`89`	`{% endeach %}`
`89`	`90`
`@@ -112,12 +113,12 @@ void {{ cppClassName }}::{{ cppFunctionName }}_{{ cbFunction.name }}_promiseComp`
`112`	`113`	`baton->result = (int)result->ToNumber()->Value();`
`113`	`114`	`}`
`114`	`115`	`else {`
`115`		`- baton->result = {{ cbFunction.return.noResults }};`
	`116`	`+ baton->result = baton->defaultResult;`
`116`	`117`	`}`
`117`	`118`	`{% endif %}`
`118`	`119`	`}`
`119`	`120`	`else {`
`120`		`- baton->result = {{ cbFunction.return.noResults }};`
	`121`	`+ baton->result = baton->defaultResult;`
`121`	`122`	`}`
`122`	`123`	`{% endeach %}`
`123`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,8 @@`
`87`	`87`	`{{ arg.cType }} {{ arg.name}}{% if not arg.lastArg %},{% endif %}`
`88`	`88`	`{% endeach %}`
`89`	`89`	`) {`
`90`		`- {{ field.name\|titleCase }}Baton* baton = new {{ field.name\|titleCase }}Baton();`
	`90`	`+ {{ field.name\|titleCase }}Baton* baton =`
	`91`	`+ new {{ field.name\|titleCase }}Baton({{ field.return.noResults }});`
`91`	`92`
`92`	`93`	`{% each field.args\|argsInfo as arg %}`
`93`	`94`	`baton->{{ arg.name }} = {{ arg.name }};`
`@@ -106,7 +107,7 @@`
`106`	`107`
`107`	`108`	`if (instance->{{ field.name }}->IsEmpty()) {`
`108`	`109`	`{% if field.return.type == "int" %}`
`109`		`- baton->result = {{ field.return.noResults }}; // no results acquired`
	`110`	`+ baton->result = baton->defaultResult; // no results acquired`
`110`	`111`	`{% endif %}`
`111`	`112`
`112`	`113`	`baton->done = true;`
`@@ -172,12 +173,12 @@`
`172`	`173`	`baton->result = (int)result->ToNumber()->Value();`
`173`	`174`	`}`
`174`	`175`	`else {`
`175`		`- baton->result = {{ field.return.noResults }};`
	`176`	`+ baton->result = baton->defaultResult;`
`176`	`177`	`}`
`177`	`178`	`{% endif %}`
`178`	`179`	`}`
`179`	`180`	`else {`
`180`		`- baton->result = {{ field.return.noResults }};`
	`181`	`+ baton->result = baton->defaultResult;`
`181`	`182`	`}`
`182`	`183`	`{% endeach %}`
`183`	`184`	`baton->done = true;`
`@@ -205,12 +206,12 @@`
`205`	`206`	`baton->result = (int)result->ToNumber()->Value();`
`206`	`207`	`}`
`207`	`208`	`else{`
`208`		`- baton->result = {{ field.return.noResults }};`
	`209`	`+ baton->result = baton->defaultResult;`
`209`	`210`	`}`
`210`	`211`	`{% endif %}`
`211`	`212`	`}`
`212`	`213`	`else {`
`213`		`- baton->result = {{ field.return.noResults }};`
	`214`	`+ baton->result = baton->defaultResult;`
`214`	`215`	`}`
`215`	`216`	`{% endeach %}`
`216`	`217`	`}`