Merge branch 'dev' of https://phabricator.tomicevic.com/diffusion/MG/memgraph into snapshot

include/communication/bolt/v1/packing/codes.hpp

@@ -15,6 +15,8 @@ enum Code : uint8_t
     TinyMap      = 0xA0,
 
     TinyStruct   = 0xB0,
+    StructOne    = 0xB1,
+    StructTwo    = 0xB2,
 
     Null         = 0xC0,
 

include/communication/bolt/v1/serialization/record_stream.hpp

@@ -57,6 +57,7 @@ public:
         }
 
         chunk();
+        send();
     }
 
     void write_field(const std::string &field)
@@ -67,6 +68,7 @@ public:
         write_list_header(1);
         bolt_encoder.write_string(field);
         chunk();
+        send();
     }
 
     void write_list_header(size_t size)

include/communication/bolt/v1/server/server.hpp

@@ -8,6 +8,7 @@
 
 #include "io/network/server.hpp"
 #include "communication/bolt/v1/bolt.hpp"
+#include "logging/default.hpp"
 
 namespace bolt
 {
@@ -17,7 +18,8 @@ class Server : public io::Server<Server<Worker>>
 {
 public:
     Server(io::Socket&& socket)
-        : io::Server<Server<Worker>>(std::forward<io::Socket>(socket)) {}
+        : io::Server<Server<Worker>>(std::forward<io::Socket>(socket)),
+          logger(logging::log->logger("bolt::Server")) {}
 
     void start(size_t n)
     {
@@ -47,6 +49,8 @@ public:
     {
         assert(idx < workers.size());
 
+        logger.trace("on connect");
+
         if(UNLIKELY(!workers[idx]->accept(this->socket)))
             return;
 
@@ -62,6 +66,7 @@ private:
     std::atomic<bool> alive {true};
 
     int idx {0};
+    Logger logger;
 };
 
 }

include/communication/bolt/v1/server/worker.hpp

@@ -27,7 +27,7 @@ public:
 
     Worker(Bolt &bolt) : bolt(bolt)
     {
-        logger = logging::log->logger("Network");
+        logger = logging::log->logger("bolt::Worker");
     }
 
     Session &on_connect(io::Socket &&socket)

include/communication/bolt/v1/states/handshake.hpp

@@ -8,6 +8,7 @@ namespace bolt
 class Handshake : public State
 {
 public:
+    Handshake();
     State* run(Session& session) override;
 };
 

include/io/network/epoll.hpp

@@ -5,6 +5,7 @@
 
 #include "io/network/socket.hpp"
 #include "utils/likely.hpp"
+#include "logging/default.hpp"
 
 namespace io
 {
@@ -20,7 +21,8 @@ class Epoll
 public:
     using Event = struct epoll_event;
 
-    Epoll(int flags)
+    Epoll(int flags) :
+        logger(logging::log->logger("io::Epoll"))
     {
         epoll_fd = epoll_create1(flags);
 
@@ -49,6 +51,7 @@ public:
 
 private:
     int epoll_fd;
+    Logger logger;
 };
 
 }

include/io/network/event_listener.hpp

@@ -2,6 +2,7 @@
 
 #include "io/network/epoll.hpp"
 #include "utils/crtp.hpp"
+#include "logging/default.hpp"
 
 namespace io
 {
@@ -12,7 +13,11 @@ class EventListener : public Crtp<Derived>
 public:
     using Crtp<Derived>::derived;
 
-    EventListener(uint32_t flags = 0) : listener(flags) {}
+    EventListener(uint32_t flags = 0) :
+        listener(flags),
+        logger(logging::log->logger("io::EventListener"))
+    {
+    }
 
     void wait_and_process_events()
     {
@@ -25,8 +30,16 @@ public:
         // waits for an event/multiple events and returns a maximum of
         // max_events and stores them in the events array. it waits for
         // wait_timeout milliseconds. if wait_timeout is achieved, returns 0
+       
         auto n = listener.wait(events, max_events, 200);
 
+#ifndef NDEBUG
+#ifndef LOG_NO_TRACE
+        if (n > 0)
+            logger.trace("number of events: {}", n);
+#endif
+#endif
+
         // go through all events and process them in order
         for (int i = 0; i < n; ++i) {
             auto &event = events[i];
@@ -70,5 +83,8 @@ public:
 protected:
     Epoll listener;
     Epoll::Event events[max_events];
+
+private:
+    Logger logger;
 };
 }

include/io/network/server.hpp

@@ -9,10 +9,14 @@ template <class Derived>
 class Server : public EventListener<Derived>
 {
 public:
-    Server(Socket &&socket) : socket(std::forward<Socket>(socket))
+    Server(Socket &&socket) : socket(std::forward<Socket>(socket)),
+        logger(logging::log->logger("io::Server"))
     {
         event.data.fd = this->socket;
-        event.events = EPOLLIN | EPOLLET;
+
+        // TODO: EPOLLET is hard to use -> figure out how should EPOLLET be used
+        // event.events = EPOLLIN | EPOLLET;
+        event.events = EPOLLIN;
 
         this->listener.add(this->socket, &event);
     }
@@ -32,10 +36,12 @@ public:
     void on_exception_event(Epoll::Event &event, Args &&... args)
     {
         // TODO: Do something about it
+        logger.warn("epoll exception");
     }
 
 protected:
     Epoll::Event event;
     Socket socket;
+    Logger logger;
 };
 }

include/io/network/stream_reader.hpp

@@ -17,10 +17,13 @@ public:
         size_t len;
     };
 
-    StreamReader(uint32_t flags = 0) : StreamListener<Derived, Stream>(flags) {}
+    StreamReader(uint32_t flags = 0) : StreamListener<Derived, Stream>(flags),
+        logger(logging::log->logger("io::StreamReader")) {}
 
     bool accept(Socket& socket)
     {
+        logger.trace("accept");
+
         // accept a connection from a socket
         auto s = socket.accept(nullptr, nullptr);
 
@@ -44,6 +47,8 @@ public:
 
     void on_data(Stream& stream)
     {
+        logger.trace("on data");
+
         while(true)
         {
             if(UNLIKELY(!stream.alive()))
@@ -82,6 +87,9 @@ public:
             this->derived().on_read(stream, buf);
         }
     }
+
+private:
+    Logger logger;
 };
 
 }