Changes in doc/papers/concurrency/examples/ProdCons.cpp [ae6b6cf:709e0e0]

File:

• doc/papers/concurrency/examples/ProdCons.cpp (modified) (10 diffs)

doc/papers/concurrency/examples/ProdCons.cpp

@@ -12 +12 @@
 struct Cons;
 
-struct resumable {
-        virtual resumable * resume() = 0;
-};
-
-struct Prod : public resumable {
+struct Prod {
         struct local {
                 Cons * c;
@@ -24 +20 @@
         struct promise_type {
                 local _l;
-                resumable * next;
 
                 Prod get_return_object() {
@@ -74 +69 @@
         static Prod main();
 
-        struct payment_return;
-
-        payment_return payment(int money);
+        auto payment(int money) {
+                _coroutine.promise()._l.money = money;
+                struct ret {
+                        int _receipt;
+                        bool await_ready() { return false; }
+                        void await_suspend(std::experimental::coroutine_handle<>) {}
+                        int await_resume() { return _receipt; }
+                };
+                return ret{ _coroutine.promise()._l.receipt };
+        }
 
         auto start(int N, Cons & c) {
@@ -82 +84 @@
                 _coroutine.promise()._l.N = N;
                 _coroutine.promise()._l.receipt = 0;
-        }
-
-        virtual resumable * resume() override final {
                 _coroutine.resume();
-                return _coroutine.promise().next;
         }
 };
 
-struct Cons : public resumable {
+struct Cons {
         struct local {
                 Prod * p;
@@ -99 +97 @@
         struct promise_type {
                 local _l;
-                resumable * next;
 
                 Cons get_return_object() {
@@ -157 +154 @@
                 struct ret {
                         int _status;
-                        Cons * c;
                         bool await_ready() { return false; }
-                        void await_suspend(std::experimental::coroutine_handle<Prod::promise_type> _coroutine) {
-                                _coroutine.promise().next = c;
-                        }
+                        void await_suspend(std::experimental::coroutine_handle<>) {}
                         int await_resume() { return _status; }
                 };
-                return ret{ _coroutine.promise()._l.status, this };
+                return ret{ _coroutine.promise()._l.status };
         }
 
@@ -170 +164 @@
                 _coroutine.promise()._l.done = true;
                 struct ret {
-                        Cons * c;
-                        Prod::promise_type * _promise;
                         bool await_ready() { return false; }
-                        void await_suspend(std::experimental::coroutine_handle<Prod::promise_type> _coroutine) {
-                                _promise = &_coroutine.promise();
-                                _promise->next = c;
-                        }
-                        void await_resume() {
-                                _promise->next = nullptr;
-                        }
+                        void await_suspend(std::experimental::coroutine_handle<>) {}
+                        void await_resume() {}
                 };
-                return ret{this, nullptr};
-        }
-
-        virtual resumable * resume() override final {
-                _coroutine.resume();
-                return _coroutine.promise().next;
+                return ret{};
         }
 };
-
-struct Prod::payment_return {
-        int _receipt;
-        Prod * p;
-        bool await_ready() { return false; }
-        void await_suspend(std::experimental::coroutine_handle<Cons::promise_type> _coroutine) {
-                _coroutine.promise().next = p;
-        }
-        int await_resume() { return _receipt; }
-};
-
-Prod::payment_return Prod::payment(int money)  {
-        _coroutine.promise()._l.money = money;
-        return payment_return{ _coroutine.promise()._l.receipt, this };
-}
 
 Prod Prod::main() {
@@ -209 +176 @@
         for(int i = 0; i < p.N; i++) {
                 int p1 = random(100), p2 = random(100);
-                std::cout << p1 << " " << p2 << std::endl;
+                std::cout << p1 << " " << p2;
                 int status = co_await p.c->deliver(p1, p2);
-                std::cout << " $" << p.money << std::endl << status << std::endl;
+                std::cout << " $" << p.money << std::endl << status;
                 p.receipt += 1;
         }
         co_await p.c->stop();
-        std::cout << "prod stops" << std::endl;
+        std::cout << "prod stops";
 }
 
@@ -222 +189 @@
         int money = 1, receipt;
         for(;!c.done ;) {
-                std::cout << c.p1 << " " << c.p2 << std::endl;
-                std::cout << " $ " << money << std::endl;
+                std::cout << c.p1 << " " << c.p2 << std::endl << " $" << money;
                 c.status += 1;
                 receipt = co_await c.p->payment( money );
-                std::cout << " # " << receipt << std::endl;
+                std::cout << " #" << receipt;
                 money += 1;
         }
-        std::cout << "cons stops" << std::endl;
-}
-
-void dispatch(resumable * r) {
-        while((r = r->resume()));
+        std::cout << "const stops";
 }
 
@@ -241 +203 @@
         srandom( getpid() );
         prod.start(5, cons);
-        dispatch(&prod);
-}
+}