From a047d34959a31d1e97235eee5bed06bf3023c964 Mon Sep 17 00:00:00 2001
From: huangdan <huangd@opengoss.com>
Date: Wed, 3 Jun 2015 18:19:40 +0800
Subject: [PATCH] merge dev

---
 apps/emqttd/src/emqttd_vm.erl | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apps/emqttd/src/emqttd_vm.erl b/apps/emqttd/src/emqttd_vm.erl
index 87c7aafd5..d76942619 100644
--- a/apps/emqttd/src/emqttd_vm.erl
+++ b/apps/emqttd/src/emqttd_vm.erl
@@ -100,6 +100,8 @@
 
 -author("Feng Lee <feng@emqtt.io>").
 
+-export([timestamp/0, microsecs/0]).
+
 -export([loads/0,
 	scheduler_usage/1]).
 
@@ -120,6 +122,13 @@
 	 get_port_info/0,
  	 get_port_info/1]).
 
+timestamp() ->
+    {MegaSecs, Secs, _MicroSecs} = os:timestamp(),
+    MegaSecs * 1000000 + Secs.
+
+microsecs() ->
+    {Mega, Sec, Micro} = erlang:now(),
+    (Mega * 1000000 + Sec) * 1000000 + Micro.
 
 loads() ->
     [{load1, ftos(cpu_sup:avg1()/256)},