optimize performance.

Author: xhawk18

CMakeLists.txt

@@ -19,6 +19,7 @@ option(PROMISE_BUILD_SHARED "Build shared library" OFF)
 
 set(my_headers
     include/promise-cpp/promise.hpp
+    include/promise-cpp/promise_inl.hpp
     include/promise-cpp/any.hpp
     include/promise-cpp/add_ons.hpp
     include/promise-cpp/call_traits.hpp

example/mfc_timer/CMakeLists.txt

@@ -23,6 +23,7 @@ set(PROJECT_SOURCES
     res/mfctimer.rc2
 
     ../../include/promise-cpp/promise.hpp
+    ../../include/promise-cpp/promise_inl.hpp
     ../../include/promise-cpp/any.hpp
     ../../include/promise-cpp/add_ons.hpp
     ../../include/promise-cpp/call_traits.hpp

example/qt_timer/CMakeLists.txt

@@ -33,6 +33,7 @@ set(PROJECT_SOURCES
     mainwindow.h
     mainwindow.ui
     ../../include/promise-cpp/promise.hpp
+    ../../include/promise-cpp/promise_inl.hpp
     ../../include/promise-cpp/any.hpp
     ../../include/promise-cpp/add_ons.hpp
     ../../include/promise-cpp/call_traits.hpp

example/test0.cpp

@@ -26,6 +26,7 @@
  */
 #include <stdio.h>
 #include <string>
+#include <vector>
 #include "promise-cpp/promise.hpp"
 
 using namespace promise;
@@ -121,10 +122,11 @@ void test_promise_all() {
 
 int main(int argc, char **argv) {
     handleUncaughtException([](Promise &d) {
-        printf("UncaughtException\n");
-        
+       
         d.fail([](long n, int m) {
             printf("UncaughtException parameters = %d %d\n", (int)n, m);
+        }).fail([]() {
+            printf("UncaughtException\n");
         });
     });
 
@@ -136,7 +138,9 @@ int main(int argc, char **argv) {
     printf("======  after call run ======\n");
 
     //next.reject(123, 'a');
-    next.reject((long)123, (int)345);   //it will go to handleUncaughtException(...)
+    if(next) {
+        next.reject((long)123, (int)345);   //it will go to handleUncaughtException(...)
+    }
     //next.resolve('b');
     //next.reject(std::string("xhchen"));
     //next.reject(45);

include/promise-cpp/any.hpp

@@ -29,6 +29,7 @@
  * THE SOFTWARE.
  */
 #include <typeindex>
+#include <vector>
 #include "add_ons.hpp"
 #include "call_traits.hpp"
 
@@ -55,7 +56,7 @@ class any {
 
     template<typename ValueType>
     any(const ValueType &value)
-        : content(new holder<ValueType>(value)) {
+        : content(new holder<typename std::remove_cvref<ValueType>::type>(value)) {
     }
 
     template<typename RET, typename ...ARG>
@@ -67,6 +68,20 @@ class any {
         : content(other.content ? other.content->clone() : 0) {
     }
 
+    // Move constructor
+    any(any &&other)
+        : content(other.content) {
+        other.content = 0;
+    }
+
+    // Perfect forwarding of ValueType
+    template<typename ValueType>
+    any(ValueType &&value
+        , typename std::enable_if<!std::is_same<any &, ValueType>::value>::type* = nullptr // disable if value has type `any&`
+        , typename std::enable_if<!std::is_const<ValueType>::value>::type* = nullptr) // disable if value has type `const ValueType&&`
+        : content(new holder<typename std::remove_cvref<ValueType>::type>(static_cast<ValueType &&>(value))) {
+    }
+
     ~any() {
         if (content != nullptr) {
             delete(content);
@@ -262,8 +277,8 @@ struct any_call_t<RET, std::tuple<NOCVR_ARG>, FUNC> {
             : any_cast<any_arguemnt_type &>(arg));
         if(args.size() < 1)
             throw bad_any_cast(arg.type(), typeid(nocvr_argument_type));
-        //printf("[%s] [%s]\n", args[0].type().name(), typeid(NOCVR_ARG).name());
-        return func(any_cast<NOCVR_ARG &>(args[0]));
+        //printf("[%s] [%s]\n", args.front().type().name(), typeid(NOCVR_ARG).name());
+        return func(any_cast<NOCVR_ARG &>(args.front()));
     }
 };
 
@@ -281,7 +296,7 @@ struct any_call_t<RET, std::tuple<any>, FUNC> {
             return (func(empty));
         }
         else if(args.size() == 1)
-            return (func(args[0]));
+            return (func(args.front()));
         else
             return (func(const_cast<any &>(arg)));
     }

include/promise-cpp/promise_inl.hpp

@@ -95,7 +95,6 @@ static inline void join(const std::shared_ptr<PromiseHolder> &left, const std::s
 
     std::list<std::weak_ptr<SharedPromise>> owners;
     owners.splice(owners.end(), right->owners_);
-    right->state_ = TaskState::kResolved;
 
     if(owners.size() > 100) {
         fprintf(stderr, "Maybe memory leak, too many promise owners: %d", (int)owners.size());
@@ -389,10 +388,8 @@ Promise newPromise(const std::function<void(Defer &defer)> &run) {
     promise.sharedPromise_->promiseHolder_ = std::make_shared<PromiseHolder>();
     promise.sharedPromise_->promiseHolder_->owners_.push_back(promise.sharedPromise_);
 
-    auto returnAsIs = [](const any &arg) -> any {
-        return arg;
-    };
-    promise.then(returnAsIs);
+    // return as is
+    promise.then(any(), any());
     std::shared_ptr<Task> &task = promise.sharedPromise_->promiseHolder_->pendingTasks_.front();
 
     Defer defer(task);
@@ -412,10 +409,8 @@ Promise newPromise() {
     promise.sharedPromise_->promiseHolder_ = std::make_shared<PromiseHolder>();
     promise.sharedPromise_->promiseHolder_->owners_.push_back(promise.sharedPromise_);
 
-    auto returnAsIs = [](const any &arg) -> any {
-        return arg;
-    };
-    promise.then(returnAsIs);
+    // return as is
+    promise.then(any(), any());
     return promise;
 }
 
@@ -435,10 +430,10 @@ Promise doWhile(const std::function<void(DeferLoop &loop)> &run) {
             if (arg.type() == typeid(std::vector<any>)) {
                 std::vector<any> &args = any_cast<std::vector<any> &>(arg);
                 if (args.size() == 2
-                    && args[0].type() == typeid(DoBreakTag)
-                    && args[1].type() == typeid(std::vector<any>)) {
+                    && args.front().type() == typeid(DoBreakTag)
+                    && args.back().type() == typeid(std::vector<any>)) {
                     isBreak = true;
-                    defer.resolve(args[1]);
+                    defer.resolve(args.back());
                 }
             }