Merge pull request #33 from awslabs/FB-CallableExecutor

Fb callable executor

Author: bretambrose

aws-cpp-sdk-core/include/aws/core/utils/threading/Executor.h

@@ -20,6 +20,7 @@
 #include <aws/core/utils/memory/stl/AWSQueue.h>
 #include <aws/core/utils/memory/stl/AWSVector.h>
 #include <functional>
+#include <future>
 #include <mutex>
 #include <condition_variable>
 
@@ -49,7 +50,6 @@ namespace Aws
                     return SubmitToThread(AWS_BUILD_TYPED_FUNCTION(std::bind(std::forward<Fn>(fn), std::forward<Args>(args)...), void()));
                 }
 
-
             protected:
                 /**
                 * To implement your own executor implementation, then simply subclass Executor and implement this method.

aws-cpp-sdk-core/source/utils/threading/Executor.cpp

@@ -19,7 +19,7 @@
 
 static const char* POOLED_CLASS_TAG = "PooledThreadExecutor";
 
-using namespace Aws::Utils::Threading;
+using namespace Aws::Utils::Threading;
 
 bool DefaultExecutor::SubmitToThread(std::function<void()>&&  fx)
 {

code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/json/JsonServiceOperationsSource.vm

@@ -46,7 +46,10 @@ ${operation.name}Outcome ${className}::${operation.name}(const ${operation.reque
 
 ${operation.name}OutcomeCallable ${className}::${operation.name}Callable(const ${operation.request.shape.name}& request) const
 {
-  return std::async(std::launch::async, [this, request](){ return this->${operation.name}(request); } );
+  auto task = Aws::MakeShared< std::packaged_task< ${operation.name}Outcome() > >(ALLOCATION_TAG, [this, request](){ return this->${operation.name}(request); } );
+  auto packagedFunction = [task]() { (*task)(); };
+  m_executor->Submit(packagedFunction);
+  return task->get_future();
 }
 
 void ${className}::${operation.name}Async(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
@@ -90,7 +93,10 @@ ${operation.name}Outcome ${className}::${operation.name}() const
 
 ${operation.name}OutcomeCallable ${className}::${operation.name}Callable() const
 {
-  return std::async(std::launch::async, [this](){ return this->${operation.name}(); } );
+  auto task = Aws::MakeShared< std::packaged_task< ${operation.name}Outcome() > >(ALLOCATION_TAG, [this](){ return this->${operation.name}(); } );
+  auto packagedFunction = [task]() { (*task)(); };
+  m_executor->Submit(packagedFunction);
+  return task->get_future();
 }
 
 void ${className}::${operation.name}Async(const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const

code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/machinelearning/MachineLearningServiceClientSource.vm

@@ -67,7 +67,10 @@ ${operation.name}Outcome ${className}::${operation.name}(const ${operation.reque
 
 ${operation.name}OutcomeCallable ${className}::${operation.name}Callable(const ${operation.request.shape.name}& request) const
 {
-  return std::async(std::launch::async, [this, request](){ return this->${operation.name}( request ); } );
+  auto task = Aws::MakeShared< std::packaged_task< ${operation.name}Outcome() > >(ALLOCATION_TAG, [this, request](){ return this->${operation.name}(request); } );
+  auto packagedFunction = [task]() { (*task)(); };
+  m_executor->Submit(packagedFunction);
+  return task->get_future();
 }
 
 void ${className}::${operation.name}Async(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const

code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/sqs/SQSServiceClientSource.vm

@@ -68,7 +68,10 @@ ${operation.name}Outcome ${className}::${operation.name}(const ${operation.reque
 
 ${operation.name}OutcomeCallable ${className}::${operation.name}Callable(const ${operation.request.shape.name}& request) const
 {
-  return std::async(std::launch::async, [this, request](){ return this->${operation.name}(request); });
+  auto task = Aws::MakeShared< std::packaged_task< ${operation.name}Outcome() > >(ALLOCATION_TAG, [this, request](){ return this->${operation.name}(request); } );
+  auto packagedFunction = [task]() { (*task)(); };
+  m_executor->Submit(packagedFunction);
+  return task->get_future();
 }
 
 void ${className}::${operation.name}Async(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const

code-generation/generator/src/main/resources/com/amazonaws/util/awsclientgenerator/velocity/cpp/xml/rest/RestXmlServiceClientOperations.vm

@@ -45,7 +45,10 @@ ${operation.name}Outcome ${className}::${operation.name}(const ${operation.reque
 
 ${operation.name}OutcomeCallable ${className}::${operation.name}Callable(const ${operation.request.shape.name}& request) const
 {
-  return std::async(std::launch::async, [this, request](){ return this->${operation.name}( request ); } );
+  auto task = Aws::MakeShared< std::packaged_task< ${operation.name}Outcome() > >(ALLOCATION_TAG, [this, request](){ return this->${operation.name}(request); } );
+  auto packagedFunction = [task]() { (*task)(); };
+  m_executor->Submit(packagedFunction);
+  return task->get_future();
 }
 
 void ${className}::${operation.name}Async(const ${operation.request.shape.name}& request, const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const
@@ -88,7 +91,10 @@ ${operation.name}Outcome ${className}::${operation.name}() const
 
 ${operation.name}OutcomeCallable ${className}::${operation.name}Callable() const
 {
-  return std::async(std::launch::async, [this](){ return this->${operation.name}(); } );
+  auto task = Aws::MakeShared< std::packaged_task< ${operation.name}Outcome() > >(ALLOCATION_TAG, [this](){ return this->${operation.name}(); } );
+  auto packagedFunction = [task]() { (*task)(); };
+  m_executor->Submit(packagedFunction);
+  return task->get_future();
 }
 
 void ${className}::${operation.name}Async(const ${operation.name}ResponseReceivedHandler& handler, const std::shared_ptr<const Aws::Client::AsyncCallerContext>& context) const