Merge and namespace edit

.gitignore

@@ -1 +1,2 @@
-test/test
+test/test
+test/*.txt

.vscode/settings.json

@@ -25,6 +25,50 @@
         "future": "cpp",
         "*.ipp": "cpp",
         "bitset": "cpp",
-        "algorithm": "cpp"
+        "algorithm": "cpp",
+        "string": "cpp",
+        "string_view": "cpp",
+        "fstream": "cpp",
+        "cctype": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "csignal": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwctype": "cpp",
+        "any": "cpp",
+        "bit": "cpp",
+        "*.tcc": "cpp",
+        "codecvt": "cpp",
+        "compare": "cpp",
+        "complex": "cpp",
+        "concepts": "cpp",
+        "cstdint": "cpp",
+        "list": "cpp",
+        "map": "cpp",
+        "set": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "random": "cpp",
+        "system_error": "cpp",
+        "iomanip": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "numbers": "cpp",
+        "semaphore": "cpp",
+        "sstream": "cpp",
+        "stop_token": "cpp",
+        "streambuf": "cpp",
+        "cinttypes": "cpp",
+        "typeindex": "cpp",
+        "typeinfo": "cpp",
+        "variant": "cpp"
     }
 }

README.md

@@ -11,24 +11,27 @@ A C++ library for event-driven asynchronous multi-threaded programming.
 - Asynchronous programming
 - Multithread
 - Asynchronous timer functions: interval, timeout
-- Typed events (on, emit)
+- Typed events (on, emit, off)
 - Event loops
-- Parallel execution loops
+- Multiple parallel execution loops
+- Asynchronous file IO
 ## Installation
 
 Just download the latest release and unzip it into your project. 
 
 ```c++
-#include "asynco/lib/asynco.hpp"    // asynco(), wait()
-#include "asynco/lib/event.hpp"     // event
-#include "asynco/lib/rotor.hpp"     // interval, timeout
-#include "asynco/lib/runner.hpp"    // on_async
-using namespace marcelb;
+#define NUM_OF_RUNNERS 8                // To change the number of threads used by atask, without this it runs according to the number of cores
+
+#include "asynco/lib/asynco.hpp"          // atask(), wait()
+#include "asynco/lib/event.hpp"          // event
+#include "asynco/lib/rotor.hpp"          // interval, timeout
+#include "asynco/lib/runner.hpp"         // for own loop
+#include "asynco/lib/filesystem.hpp"     // for async read and write files
+
+using namespace marcelb;
+using namespace asynco;
+using namespace events;
 
-#ifndef ON_RUNNER
-#define ON_RUNNER
-runner on_async;
-#endif
 ```
 
 ## Usage
@@ -56,27 +59,12 @@ Make functions asynchronous
 
 ```c++
 /**
-* Put task directly and get returned value - it is not recommended to use it
+* Run an lambda function asynchronously
 */
 
-auto res1 = on_async.put_task( [] () {
-    cout << "Not except " <<endl;
-    throw string ("Is except!");
-});
-
-try {
-    res1.get();
-} catch (const string except) {
-    cout << except << endl;
-}
-
-/**
-* Run an lambda function asyncronic
-*/
-
-asynco( []() {
+atask( []() {
     sleep_for(2s);   // only for simulating long duration function
-    cout << "asynco" << endl;
+    cout << "atask" << endl;
     return 5;
 });
 
@@ -89,7 +77,7 @@ void notLambdaFunction() {
     cout << "Call to not lambda function" << endl;
 }
 
-asynco (notLambdaFunction);
+atask (notLambdaFunction);
 
 /**
  * Run class method
@@ -103,7 +91,7 @@ class clm {
 };
 
 clm classes;
-asynco( [&classes] () {
+atask( [&classes] () {
     classes.classMethode();
 });
 
@@ -113,19 +101,19 @@ asynco( [&classes] () {
 * Wait after runned as async
 */
 
-auto a = asynco( []() {
+auto a = atask( []() {
     sleep_for(2s);   // only for simulating long duration function
-    cout << "asynco" << endl;
+    cout << "atask" << endl;
     return 5;
 });
 
-cout << wait(move(a)) << endl;
+cout << wait(a) << endl;
 
 /**
 * Wait async function call and use i cout
 */
 
-cout << wait(asynco( [] () {
+cout << wait(atask( [] () {
     sleep_for(chrono::seconds(1)); // only for simulating long duration function
     cout << "wait end" << endl;
     return 4;
@@ -194,6 +182,14 @@ evoid.on("void", []() {
     cout << "Void emited" << endl;
 });
 
+// multiple listeners
+
+string emited2 = "2";
+
+evoid.on("void", [&]() {
+    cout << "Void emited " << emited2 << endl;
+});
+
 sleep(1);
 
 /**
@@ -207,6 +203,12 @@ evintString.emit("substract", 3, to_string(2));
 
 sleep(1);
 evoid.emit("void");
+
+// Turn off the event listener
+
+evoid.off("void");
+evoid.emit("void"); // nothing is happening
+
 ```
 Extend own class whit events
 
@@ -227,6 +229,48 @@ myclass.on("constructed", [] (int i) {
 });
 
 ```
+
+Asynchronous file IO
+
+```c++
+string data_;
+
+fs::read("test.txt", [&data_] (string data, exception* error) {
+    if (error) {
+        cout << "Error " << error->what() << endl;
+    } else {
+        cout << "Data " << endl << data << endl;
+        data_ = data;
+        cout << "Data_" << data_ << endl;
+    }
+});
+
+fs::write("test1.txt", "Hello world", [] (exception* error) {
+    if (error) {
+        cout << "Error " << error->what() << endl;
+    } else {
+        cout << "Write successfuly" << endl;
+    }
+});
+
+auto future_data = fs::read("test.txt");
+
+try {
+    string data = wait(future_data);
+} catch (exception& err) {
+    cout << err.what() << endl;
+}
+
+auto future_status = fs::write("test.txt", "Hello world");
+
+try {
+    wait(future_status);
+} catch (exception& err) {
+    cout << err.what() << endl;
+}
+
+```
+
 ## License
 
 [APACHE 2.0](http://www.apache.org/licenses/LICENSE-2.0/)

lib/asynco.hpp

@@ -6,20 +6,16 @@
 using namespace std;
 
 namespace marcelb {
-
-#ifndef ON_RUNNER
-#define ON_RUNNER
-runner on_async;
-#endif
+namespace asynco {
 
 /**
  * Run the function asynchronously
 */
 template<class F, class... Args>
-auto asynco(F&& f, Args&&... args) -> future<typename result_of<F(Args...)>::type> {
+auto atask(F&& f, Args&&... args) -> future<typename result_of<F(Args...)>::type> {
     using return_type = typename result_of<F(Args...)>::type;
 
-    future<return_type> res = on_async.put_task(bind(forward<F>(f), forward<Args>(args)...));
+    future<return_type> res = _asyncon.put_task(bind(forward<F>(f), forward<Args>(args)...));
     return res;
 }
 
@@ -27,10 +23,19 @@ auto asynco(F&& f, Args&&... args) -> future<typename result_of<F(Args...)>::typ
  * Block until the asynchronous call completes
 */
 template<typename T>
-T wait(future<T> r) {
+T wait(future<T>& r) {
     return r.get();
 }
 
+/**
+ * Block until the asynchronous call completes
+*/
+template<typename T>
+T wait(future<T>&& r) {
+    return move(r).get();
+}
+
+}
 }
 
 #endif

lib/event.hpp

@@ -3,6 +3,7 @@
 
 #include <iostream>
 #include <map>
+#include <vector>
 #include <string>
 #include <functional>
 #include "runner.hpp"
@@ -10,11 +11,8 @@
 using namespace std;
 
 namespace marcelb {
-
-#ifndef ON_RUNNER
-#define ON_RUNNER
-runner on_async;
-#endif
+namespace asynco {
+namespace events {
 
 /**
  * Event class, for event-driven programming.
@@ -23,7 +21,8 @@ runner on_async;
 template<typename... T>
 class event {
     private:
-    unordered_map<string, function<void(T...)>> events;
+    mutex m_eve;
+    unordered_map<string, vector<function<void(T...)>>> events;
 
     public:
 
@@ -31,7 +30,8 @@ class event {
      * Defines event by key, and callback function
     */
     void on(const string& key, function<void(T...)> callback) {
-        events[key] = callback;
+        lock_guard _off(m_eve);
+        events[key].push_back(callback);
     }
 
     /**
@@ -39,16 +39,28 @@ class event {
     */
     template<typename... Args>
     void emit(const string& key, Args... args) {
-        auto it = events.find(key);
-        if (it != events.end()) {
-            auto callback = bind(it->second, forward<Args>(args)...);
-            on_async.put_task(callback);
+        auto it_eve = events.find(key);
+        if (it_eve != events.end()) {
+            for (uint i =0; i<it_eve->second.size(); i++) {
+                auto callback = bind(it_eve->second[i], forward<Args>(args)...); 
+                _asyncon.put_task(callback);
+            }
         }
     }
 
+    /**
+     * Remove an event listener from an event
+    */
+    void off(const string& key) {
+        lock_guard _off(m_eve);
+        events.erase(key);
+    }
+
 
 };
 
+}
+}
 }
 
 #endif

lib/filesystem.hpp

@@ -0,0 +1,116 @@
+#ifndef _ASYNCO_FS_
+#define _ASYNCO_FS_
+
+#include "asynco.hpp"
+
+
+#include <fstream>
+#include <iostream>
+
+using namespace std;
+using namespace marcelb;
+using namespace asynco;
+
+namespace marcelb {
+namespace asynco {
+namespace fs {
+
+/**
+ * Asynchronous file reading with callback after read complete
+*/
+template<typename Callback>
+void read(string path, Callback&& callback) {
+    async( [&path, callback] () {
+        string content;
+        try {
+            string line;
+            ifstream file (path);
+            if (file.is_open()) {
+                line.clear();
+                while ( getline (file,line) ) {
+                    content += line + "\n";
+                }
+                file.close();
+            }
+
+            else {
+                throw runtime_error("Unable to open file"); 
+            }
+
+            callback(content, nullptr);
+        } catch(exception& error) {
+            callback(content, &error);
+        }
+    });
+}
+
+
+/**
+ * Asynchronous file reading
+*/
+future<string> read(string path) {
+    return async( [&path] () {
+        string content;
+        string line;
+        ifstream file (path);
+        if (file.is_open()) {
+            line.clear();
+            while ( getline (file,line) ) {
+                content += line + "\n";
+            }
+            file.close();
+            return content;
+        }
+
+        else {
+            throw runtime_error("Unable to open file"); 
+        }
+    });
+}
+
+/**
+ * Asynchronous file writing with callback after write complete
+*/
+template<typename Callback>
+void write(string path, string content, Callback&& callback) {
+    async( [&path, &content, callback] () {
+        try {
+            ofstream file (path);
+            if (file.is_open()) {
+                file << content;
+                file.close();
+            }
+            else {
+                throw runtime_error("Unable to open file"); 
+            }
+
+            callback(nullptr);
+        } catch(exception& error) {
+            callback(&error);
+        }
+    });
+}
+
+
+/**
+ * Asynchronous file writing with callback after write complete
+*/
+future<void> write(string path, string content) {
+    return async( [&path, &content] () {
+        ofstream file (path);
+        if (file.is_open()) {
+            file << content;
+            file.close();
+            return;
+        }
+        else {
+            throw runtime_error("Unable to open file"); 
+        }
+    });
+}
+
+}
+}
+}
+
+#endif

lib/rotor.hpp

@@ -3,18 +3,16 @@
 
 #include "runner.hpp"
 #include "chrono"
+#include <memory>
 
 #include "iostream"
 
 using namespace std;
 using namespace marcelb;
-
-#ifndef ON_RUNNER
-#define ON_RUNNER
-runner on_async;
-#endif
+using namespace asynco;
 
 namespace marcelb {
+namespace asynco {
 
 /**
  * Get the time in ms from the epoch
@@ -26,152 +24,39 @@ int64_t rtime_ms() {
         .count();
 }
 
-/**
- * Structure for time events
-*/
+int64_t rtime_us() {
+    return chrono::duration_cast<chrono::microseconds>(chrono::system_clock::now()
+        .time_since_epoch())
+        .count();
+}
 
-struct time_event {
+namespace {
+
+/**
+ * Intern class for timer async loop
+*/
+class timer_core {
+    public:
+    mutex hangon;
     function<void()> callback;
     int64_t init;
     int64_t time;
     bool repeat;
     bool stop;
-};
-
-/**
- * Event loop for time events
-*/
-
-class rotor {
-    vector<struct time_event *> tevents;
-    mutex te_m;
-    bool rotating = true;
-    int64_t sampling;
-
-    /**
-     * Loop method, started by the constructor in a separate runner
-     * It checks the events on the stack and sends the expired ones to the runner
-    */
-    void loop() {
-        while (rotating) {
-            for (int i=0; i<tevents.size(); i++) {
-
-                if (tevents[i]->stop) {
-                    remove(i);
-                    i--;
-                }
-
-                else if (expired(tevents[i])) {
-                    on_async.put_task(tevents[i]->callback);
-                    if (tevents[i]->repeat) {
-                        tevents[i]->init = rtime_ms();
-                    }
-                    else {
-                        remove(i);
-                        i--;
-                    }
-                }
-            }
-            this_thread::sleep_for(chrono::milliseconds(sampling));
-        } 
-    }
-
-    /**
-     * The method checks whether the time event has expired
-    */
-    bool expired(struct time_event *tevent) {
-        return rtime_ms() - tevent->init >= tevent->time;
-    }
-
-    /**
-     * The method deletes a non-repeating or stopped event from the stack
-    */
-    void remove(const int& position) {
-        lock_guard<mutex> lock(te_m);
-        tevents.erase(tevents.begin()+position);
-        update_sampling();
-    }
-
-    /**
-     * Updates the idle time of the loop, according to twice the frequency of available events
-    */
-    void update_sampling() {
-        if (tevents.empty()) {
-            sampling = 100;
-            return;
-        }
-        sampling = tevents[0]->time;
-        for (int i=0; i<tevents.size(); i++) {
-            if (sampling > tevents[i]->time) {
-                sampling = tevents[i]->time;
-            }
-        }
-        sampling /= tevents.size()*2;
-    }
-
-    public:
-
-    /**
-     * Constructor for the rotor, starts the given loop by occupying one runner
-    */
-    rotor() {
-        on_async.put_task( [&] () {
-            loop();
-        });
-    };
-
-    /**
-     * Adds a time event to the stack
-    */
-    void insert(struct time_event *tevent) {
-        lock_guard<mutex> lock(te_m);
-        tevents.push_back(tevent);
-        update_sampling();
-    };
-
-    /**
-     * Returns the number of active events
-    */
-    int active() {
-        return tevents.size();
-    }
-
-    /**
-     * Stops all active events and stops the rotor
-    */
-    ~rotor() {
-        for (int i=0; i<tevents.size(); i++) {
-            tevents[i]->stop = true;
-        }
-        rotating = false;
-    }
-
-};
-
-/**
- * It is intended that there is only one global declaration
-*/
-rotor _rotor;
-
-/**
- * A class for all timer functions
-*/
-class timer_core {
-    public:
-    struct time_event t_event;
 
     /**
      * Timer constructor, receives a callback function and time
     */
-    timer_core( function<void()> _callback, int64_t _time):
-        t_event({ _callback, rtime_ms(), _time, false, false }) {
-
+    timer_core( function<void()> _callback, int64_t _time, bool _repeat):
+        callback(_callback), init(rtime_us()), time(_time*1000), repeat(_repeat), stop(false) {
     }
+
     /**
      * Stop timer
     */
     void clear() {
-        t_event.stop = true;
+        lock_guard<mutex> hang(hangon);
+        stop = true;
     }
 
     /**
@@ -182,36 +67,173 @@ class timer_core {
     }
 };
 
+/**
+ * Event loop for time events
+*/
+
+class rotor {
+    vector<shared_ptr<timer_core>> tcores;
+    mutex te_m;
+    bool rotating = true;
+    int64_t sampling;
+
+    /**
+     * Loop method, started by the constructor in a separate runner
+     * It checks the events on the stack and sends the expired ones to the runner
+    */
+    void loop() {
+        while (rotating) {
+            for (int i=0; i<tcores.size(); i++) {
+
+                if (tcores[i]->stop) {
+                    remove(i);
+                    i--;
+                }
+
+                else if (expired(tcores[i])) {
+                    _asyncon.put_task(tcores[i]->callback);
+                    if (tcores[i]->repeat) {
+                        tcores[i]->init = rtime_us();
+                    }
+                    else {
+                        remove(i);
+                        i--;
+                    }
+                }
+            }
+            this_thread::sleep_for(chrono::microseconds(sampling));
+        } 
+    }
+
+    /**
+     * The method checks whether the time event has expired
+    */
+    bool expired(shared_ptr<timer_core> tcore) {
+        return rtime_us() - tcore->init >= tcore->time;
+    }
+
+    /**
+     * The method deletes a non-repeating or stopped event from the stack
+    */
+    void remove(const int& position) {
+        lock_guard<mutex> lock(te_m);
+        tcores.erase(tcores.begin()+position);
+        update_sampling();
+    }
+
+    /**
+     * Updates the idle time of the loop, according to twice the frequency of available events
+    */
+    void update_sampling() {
+        if (tcores.empty()) {
+            sampling = 100;
+            return;
+        }
+        sampling = tcores[0]->time;
+        for (int i=0; i<tcores.size(); i++) {
+            if (sampling > tcores[i]->time) {
+                sampling = tcores[i]->time;
+            }
+        }
+        sampling /= tcores.size()*2;
+    }
+
+    public:
+
+    /**
+     * Constructor for the rotor, starts the given loop by occupying one runner
+    */
+    rotor() {
+        _asyncon.put_task( [&] () {
+            loop();
+        });
+    };
+
+    /**
+     * Adds a time event to the stack
+    */
+    void insert(shared_ptr<timer_core> tcore) {
+        lock_guard<mutex> lock(te_m);
+        tcores.push_back(tcore);
+        update_sampling();
+    };
+
+    /**
+     * Returns the number of active events
+    */
+    int active() {
+        return tcores.size();
+    }
+
+    /**
+     * Stops all active events and stops the rotor
+    */
+    ~rotor() {
+        for (int i=0; i<tcores.size(); i++) {
+            tcores[i]->clear();
+        }
+        rotating = false;
+    }
+
+};
+
+/**
+ * It is intended that there is only one global declaration
+*/
+static rotor _rotor;
+}
+
+/**
+ * Core class for pure async timer functions
+*/
+
+class _timer_intern {
+    shared_ptr<timer_core> tcore;
+    public:
+
+    _timer_intern(function<void()> _callback, int64_t _time, bool repeat) {
+        tcore = make_shared<timer_core>(_callback, _time, repeat);
+        _rotor.insert(tcore);
+    }
+    
+    /**
+     * Stop interval
+    */
+    void clear() {
+        tcore->clear();
+    }
+};
+
 /**
  * Class interval for periodic execution of the callback in time in ms
 */
-class interval : public timer_core {
+class interval : public _timer_intern {
     public:
-    
+
     /**
      * The constructor receives a callback function and an interval time
     */
-    interval( function<void()> _callback, int64_t _time): timer_core(_callback, _time) {
-        t_event.repeat = true;
-        _rotor.insert(&t_event);
+    interval( function<void()> _callback, int64_t _time):
+        _timer_intern(_callback, _time, true) {
     }
 };
 
 /**
  * Class interval for delayed callback execution in ms
 */
-class timeout : public timer_core {
+class timeout : public _timer_intern {
     public:
 
     /**
      * The constructor receives a callback function and a delay time
     */
-    timeout( function<void()> _callback, int64_t delay): timer_core(_callback, delay) {
-        t_event.repeat = false;
-        _rotor.insert(&t_event);
+    timeout( function<void()> _callback, int64_t delay):
+        _timer_intern(_callback, delay, false) {
     }
+
 };
 
+}
 }
 
 #endif

lib/runner.hpp

@@ -12,10 +12,9 @@
 using namespace std;
 
 namespace marcelb {
+namespace asynco {
 
-#ifdef ON_RUNNER
-extern runner on_async;
-#endif
+#define HW_CONCURRENCY_MINIMAL 4
 
 /**
  * The runner class implements multithread, task stack and event loop for asynchronous execution of tasks
@@ -27,12 +26,29 @@ class runner {
     mutex q_io;
     condition_variable cv;
     bool stop;
-   
+
+    public:
+
     /**
-     * Increase number of runners
+     * The constructor starts as many threads as the system has cores, 
+     * and runs an event loop inside each one. 
+     * Each event loop waits for tasks from the stack and executes them.
     */
-    void increase_runners(unsigned int increase) {
-        for (size_t i = 0; i < increase; ++i) {
+    runner(unsigned int _num_of_runners = 0) : stop(false) {
+        unsigned int num_of_runners = _num_of_runners;
+
+        if (num_of_runners == 0) {
+            #ifdef NUM_OF_RUNNERS
+                num_of_runners = NUM_OF_RUNNERS;
+            #else
+                num_of_runners = thread::hardware_concurrency();
+                if (num_of_runners < HW_CONCURRENCY_MINIMAL) {
+                    num_of_runners = HW_CONCURRENCY_MINIMAL;
+                }
+            #endif
+        }
+
+        for (size_t i = 0; i < num_of_runners; ++i) {
             runners.emplace_back( thread([&] {
                 while (!stop) {
                     function<void()> task;
@@ -51,21 +67,6 @@ class runner {
         }
     }
 
-    public:
-
-    /**
-     * The constructor starts as many threads as the system has cores, 
-     * and runs an event loop inside each one. 
-     * Each event loop waits for tasks from the stack and executes them.
-    */
-    runner(size_t pool_size = thread::hardware_concurrency()) : stop(false) {
-        if (pool_size < 4) {
-            pool_size = 4;
-        }
-        increase_runners(pool_size);
-        // start_all_runners(pool_size);
-    }
-
     
 
     /**
@@ -92,22 +93,6 @@ class runner {
         return res;
     }
 
-    /**
-     * Change the number of runners
-    */
-    void change_runners (unsigned int num_of_runners) {
-        if (num_of_runners == 0 || num_of_runners > 64) {
-            throw runtime_error("Not allowed runners size");
-        }
-
-        int difference = num_of_runners - count_threads();
-        if (difference < 0) { // reduce
-            throw runtime_error("Is not allowed to reduce runners");
-        } else if (difference > 0) { // increase
-            increase_runners(difference);
-        }
-    }
-
     /**
      * Returns the number of tasks the runner has to perform
     */
@@ -139,6 +124,13 @@ class runner {
 
 };
 
+
+/**
+ * Internal global library variable
+*/
+static runner _asyncon;
+
+}
 }
 
 #endif

test/test.cpp

@@ -1,22 +1,19 @@
+#define NUM_OF_RUNNERS 2
 
-#include "../lib/runner.hpp"
 #include "../lib/asynco.hpp"
 #include "../lib/event.hpp"
 #include "../lib/rotor.hpp"
+// #include "../lib/filesystem.hpp"
 
 #include <iostream>
 #include <unistd.h>
 
 using namespace std;
-using namespace marcelb;
+using namespace marcelb::asynco;
+using namespace events;
+// using namespace asynco;
 using namespace this_thread;
 
-#ifndef ON_RUNNER
-#define ON_RUNNER
-runner on_async;
-#endif
-
-
 void sleep_to (int _time) {
     promise<void> _promise;
     timeout t( [&]() {
@@ -61,35 +58,35 @@ class myOwnClass : public event<int> {
 
 
 int main () {
-    on_async.change_runners(64);
 
     auto start = rtime_ms();
 
-    // --------------- TIME ASYNCHRONOUS FUNCTIONS --------------
+    // // --------------- TIME ASYNCHRONOUS FUNCTIONS --------------
 
-    /**
-     * Init interval and timeout; clear interval and timeout
-    */
+    // /**
+    //  * Init interval and timeout; clear interval and timeout
+    // */
 
-    // ovo ne radi
+    // interval( [&] () {
+    //     cout << "interval 1: "  << rtime_ms() - start << endl;
+    // }, 50);
 
-    // vector<interval> interv;
-    // vector<timeout> tmout;
+    // interval( [&] () {
+    //     cout << "interval 1: "  << rtime_ms() - start << endl;
+    // }, 100);
 
-    // for (int i=0; i< 20; i++) {
-    //     interv.push_back( interval( [i] () {
-    //         cout << "interval " << i << endl;
-    //     }, 1000));
-    //     tmout.push_back( timeout( [i] () {
-    //         cout << "timeout " << i << endl;
-    //     }, 1000*i));
-    // }
+    // interval( [&] () {
+    //     cout << "interval 2: " << rtime_ms() - start << endl;
+    // }, 200);
 
-    // ovo valja popravit
+    // interval( [&] () {
+    //     cout << "interval 3: " << rtime_ms() - start << endl;
+    // }, 300);
 
-    // interval( [] () {
-    //     cout << "interval " << endl;
-    // }, 1000);
+
+    // interval( [&] () {
+    //     cout << "interval 4: "  << rtime_ms() - start << endl;
+    // }, 400);
 
     // interval inter1 ([&]() {
     //     cout << "interval prvi " << rtime_ms() - start << endl;
@@ -103,42 +100,42 @@ int main () {
     //     cout << "interval treći " << rtime_ms() - start << endl;
     // }, 3000);
 
+    // interval inter4 ([&]() {
+    //     cout << "interval cetvrti " << rtime_ms() - start << endl;
+    // }, 1000);
+
+    // interval inter5 ([&]() {
+    //     cout << "interval peti " << rtime_ms() - start << endl;
+    // }, 2000);
+
+    // interval inter6 ([&]() {
+    //     cout << "interval sesti " << rtime_ms() - start << endl;
+    // }, 3000);
+
     // timeout time1 ( [&] () {
     //     cout << "Close interval 1 i 2 " << rtime_ms() - start << endl;
-    //     inter1.clear();
-    //     inter2.clear();
-    // }, 10000);
+    //     // inter1.clear();
+    //     // cout << "inter1.stop " << inter1.stop << endl;
+    //     // inter2.clear();
+    //     // cout << "inter2.stop " << inter2.stop << endl;
+
+    // }, 5000);
 
     // timeout time2 ([&] () {
     //     cout << "Close interval 3 " << rtime_ms() - start << endl;
-    //     inter3.clear();
-    //     time1.clear();
+    //     // inter3.clear();
+    //     // time1.clear();
     // }, 2000);
 
     // // ------------------------ MAKE FUNCTIONS ASYNCHRONOUS -------------------------
 
-    // /**
-    //  * Put task directly and get returned value - it is not recommended to use it
-    // */
+    /**
+     * Run an function asyncronic
+    */
 
-    // auto res1 = on_async.put_task( [] () {
-    //     cout << "Jebiga " <<endl;
-    //     throw string ("jebiga!!");
-    // });
-
-    // try {
-    //     res1.get();
-    // } catch (const string except) {
-    //     cout << except << endl;
-    // }
-
-    // /**
-    //  * Run an function asyncronic
-    // */
-
-    // asynco( []() {
+    // atask( []() {
     //     sleep_for(2s);   // only for simulate log duration function
-    //     cout << "asynco" << endl;
+    //     cout << "atask 1" << endl;
     //     return 5;
     // });
 
@@ -146,39 +143,44 @@ int main () {
     //  * Call not lambda function
     // */
 
-    // asynco (notLambdaFunction);
+    // atask (notLambdaFunction);
+
+
+    // wait (
+    //     atask (
+    //         notLambdaFunction
+    //     )
+    // );
 
     // /**
     //  * Call class method
     // */
 
     // clm classes;
-    // asynco( [&classes] () {
+    // atask( [&classes] () {
     //     classes.classMethode();
     // });
 
-    // // sleep(5);
-
-
-
+    // sleep(5);
 
     // /**
     //  * Wait after runned as async
     //  */
 
-    // auto a = asynco( []() {
+    // auto a = atask( []() {
     //     sleep_for(2s);   // only for simulate log duration function
-    //     cout << "asynco" << endl;
+    //     cout << "atask 2" << endl;
     //     return 5;
     // });
 
-    // cout << wait(move(a)) << endl;
+    // cout << wait(a) << endl;
+    // cout << "print after atask 2" << endl;
 
     // /**
     //  * Wait async function call and use i cout
     // */
 
-    // cout << wait(asynco( [] () {
+    // cout << wait(atask( [] () {
     //     sleep_for(chrono::seconds(1)); // only for simulate log duration function
     //     cout << "wait end" << endl;
     //     return 4;
@@ -209,63 +211,89 @@ int main () {
     // */
 
 
-    // asynco( [] {
+    // atask( [] {
     //     cout << "idemo ..." << endl;
-    //     asynco( [] {
+    //     atask( [] {
     //         cout << "ugdnježdena async funkcija " << endl;
     //     });
     // });
 
-    // // --------------- EVENTS -------------------
+    // --------------- EVENTS -------------------
 
-    // /**
-    //  * initialization of typed events
-    // */
+    /**
+     * initialization of typed events
+    */
 
-    // event<int, int> ev2int;
-    // event<int, string> evintString;
-    // event<> evoid;
+    event<int, int> ev2int;
+    event<int, string> evintString;
+    event<> evoid;
 
-    // ev2int.on("sum", [](int a, int b) {
-    //     cout << "Sum " << a+b << endl;
-    // });
+    ev2int.on("sum", [](int a, int b) {
+        cout << "Sum " << a+b << endl;
+    });
 
-    // evintString.on("substract", [](int a, string b) {
-    //     cout << "Substract " << a-stoi(b) << endl;
-    // });
+    ev2int.on("sum", [](int a, int b) {
+        cout << "Sum done" << endl;
+    });
 
-    // evoid.on("void", []() {
-    //     cout << "Void emited" << endl;
-    // });
+    evintString.on("substract", [](int a, string b) {
+        cout << "Substract " << a-stoi(b) << endl;
+    });
 
-    // // sleep(1);
+    evoid.on("void", []() {
+        cout << "Void emited" << endl;
+    });
 
-    // /**
-    //  * Emit
-    // */
+    string emited2 = "2";
 
-    // ev2int.emit("sum", 5, 8);
+    evoid.on("void", [&]() {
+        cout << "Void emited " << emited2 << endl;
+    });
 
-    // sleep(1);
-    // evintString.emit("substract", 3, to_string(2));
+    evoid.emit("void");
+    sleep(1);
 
-    // sleep(1);
-    // evoid.emit("void");
+    /**
+     * Emit
+    */
 
-    // /**
-    //  * Own class 
-    // */
+    ev2int.emit("sum", 5, 8);
+    
 
-    // myOwnClass myclass;
+    sleep(1);
+    evintString.emit("substract", 3, to_string(2));
 
-    // timeout t( [&] {
-    //     myclass.emit("constructed", 1);
-    // }, 200);
+    sleep(1);
+    evoid.off("void");
+    evoid.emit("void");
 
-    // myclass.on("constructed", [] (int i) {
-    //     cout << "Constructed " << i  << endl;
-    // });
+    /**
+     * Own class 
+    */
 
+    myOwnClass myclass;
+
+    timeout t( [&] {
+        myclass.emit("constructed", 1);
+    }, 200);
+
+    myclass.on("constructed", [] (int i) {
+        cout << "Constructed " << i  << endl;
+    });
+
+
+
+    // auto status = fs::read("test1.txt");
+
+
+    // try {
+    //     auto data = wait(status);
+    //     cout << data;
+    // } catch (exception& err) {
+    //     cout << err.what() << endl;
+    // }
+
+    cout << "Sleep" << endl;
     sleep(100000); // only for testing
 
     return 0;