yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge dev

This commit is contained in:
huangdan 2015-06-03 18:19:40 +08:00
parent ae54ec1343
commit a047d34959
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/emqttd/src/emqttd_vm.erl
View File

@ -100,6 +100,8 @@
-author("Feng Lee <feng@emqtt.io>"). -author("Feng Lee <feng@emqtt.io>").
-export([timestamp/0, microsecs/0]).
-export([loads/0, -export([loads/0,
scheduler_usage/1]). scheduler_usage/1]).
@ -120,6 +122,13 @@
get_port_info/0, get_port_info/0,
get_port_info/1]). 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() -> loads() ->
[{load1, ftos(cpu_sup:avg1()/256)}, [{load1, ftos(cpu_sup:avg1()/256)},