Merge branch 'stats'

Conflicts:
	grextras
	include/gras/top_block.hpp
	lib/block_handlers.cpp
	lib/block_task.cpp
	lib/element_impl.hpp
	tests/CMakeLists.txt

1 files changed, 12 insertions, 0 deletions

diff --git a/lib/block_handlers.cpp b/lib/block_handlers.cpp
index 1290a67..73a22da 100644
--- a/lib/block_handlers.cpp
+++ b/lib/block_handlers.cpp
@@ -16,6 +16,7 @@ void BlockActor::handle_top_active(
     if (this->block_state != BLOCK_STATE_LIVE)
     {
         this->block_ptr->notify_active();
+        this->stats.start_time = time_now();
     }
     this->block_state = BLOCK_STATE_LIVE;
     this->active_token = message.token;
@@ -128,3 +129,14 @@ void BlockActor::handle_self_kick(
     MESSAGE_TRACER();
     this->handle_task();
 }
+
+void BlockActor::handle_get_stats(
+    const GetStatsMessage &,
+    const Theron::Address from
+){
+    GetStatsMessage message;
+    message.block_id = this->block_ptr->to_string();
+    message.stats = this->stats;
+    message.stats_time = time_now();
+    this->Send(message, from); //ACK
+}