Mojo: introducing a thread safe interface pointer.

mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl

Index: mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl
index 5b06fd095a7f09e236ac2445f59adc72306a68f1..673234c045debb963702ab12e9507baa448092ce 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl
+++ b/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl
@@ -159,19 +159,21 @@ bool {{class_name}}_{{method.name}}_ForwardToCallback::Accept(
 {%-   if method.sync %}
 bool {{proxy_name}}::{{method.name}}(
     {{interface_macros.declare_sync_method_params("param_", method)}}) {
+   mojo::internal::SerializationContext serialization_context;
+   serialization_context.group_controller = group_controller_;

[yzshen1, 2016/11/15 18:53:46]

nit: please directly pass the group controller to the constructor of the
serialization context.

(here and elsewhere)

[Jay Civelli, 2016/11/15 19:36:38]

Done.

   {{struct_macros.get_serialized_size(params_struct, "param_%s",
-                                      "&serialization_context_")}}
+                                      "&serialization_context")}}
 
   mojo::internal::RequestMessageBuilder builder({{message_name}}, size,
                                                 mojo::Message::kFlagIsSync);
 
   {{build_message(params_struct, "param_%s", params_description,
-                  "&serialization_context_")}}
+                  "&serialization_context")}}
 
   bool result = false;
   mojo::MessageReceiver* responder =
       new {{class_name}}_{{method.name}}_HandleSyncResponse(
-          serialization_context_.group_controller, &result
+          group_controller_.get(), &result

[yzshen1, 2016/11/15 18:53:46]

I think .get() is not needed?

[Jay Civelli, 2016/11/15 19:36:38]

Removed.

 {%-     for param in method.response_parameters -%}
           , param_{{param.name}}
 {%-     endfor %});
@@ -183,8 +185,10 @@ bool {{proxy_name}}::{{method.name}}(
 
 void {{proxy_name}}::{{method.name}}(
     {{interface_macros.declare_request_params("in_", method)}}) {
+   mojo::internal::SerializationContext serialization_context;
+   serialization_context.group_controller = group_controller_;
   {{struct_macros.get_serialized_size(params_struct, "in_%s",
-                                      "&serialization_context_")}}
+                                      "&serialization_context")}}
 
 {%- if method.response_parameters != None %}
   mojo::internal::RequestMessageBuilder builder({{message_name}}, size);
@@ -193,12 +197,12 @@ void {{proxy_name}}::{{method.name}}(
 {%- endif %}
 
   {{build_message(params_struct, "in_%s", params_description,
-                  "&serialization_context_")}}
+                  "&serialization_context")}}
 
 {%- if method.response_parameters != None %}
   mojo::MessageReceiver* responder =
       new {{class_name}}_{{method.name}}_ForwardToCallback(
-          callback, serialization_context_.group_controller);
+          callback, group_controller_.get());
   if (!receiver_->AcceptWithResponder(builder.message(), responder))
     delete responder;
 {%- else %}