From 2f1c03a4693cfcfcb3edbe245d09f0229240fb04 Mon Sep 17 00:00:00 2001 From: Feng Date: Sun, 16 Aug 2015 00:36:56 +0800 Subject: [PATCH] misc fix --- src/emqttd_guid.erl | 10 ++++++++-- src/emqttd_log.erl | 1 + src/emqttd_throttle.erl | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/emqttd_guid.erl b/src/emqttd_guid.erl index 65fc172cc..bf668a384 100644 --- a/src/emqttd_guid.erl +++ b/src/emqttd_guid.erl @@ -38,6 +38,8 @@ -module(emqttd_guid). +-author("Feng Lee "). + -export([gen/0, new/0, timestamp/1]). -define(MAX_SEQ, 16#FFFF). @@ -54,17 +56,21 @@ gen() -> undefined -> new(); {_Ts, NPid, Seq} -> next(NPid, Seq) end, - put(guid, Guid), enc(Guid). + put(guid, Guid), bin(Guid). new() -> {ts(), npid(), 0}. +-spec timestamp(guid()) -> integer(). +timestamp(<>) -> + Ts. + next(NPid, Seq) when Seq >= ?MAX_SEQ -> {ts(), NPid, 0}; next(NPid, Seq) -> {ts(), NPid, Seq + 1}. -enc({Ts, NPid, Seq}) -> +bin({Ts, NPid, Seq}) -> <>. ts() -> diff --git a/src/emqttd_log.erl b/src/emqttd_log.erl index 9aafdb6d3..96522ae9d 100644 --- a/src/emqttd_log.erl +++ b/src/emqttd_log.erl @@ -26,6 +26,7 @@ %%%----------------------------------------------------------------------------- %% TODO: issue #103 +%% 0.12.0 ??? -module(emqttd_log). diff --git a/src/emqttd_throttle.erl b/src/emqttd_throttle.erl index 0eb095505..256ae27d4 100644 --- a/src/emqttd_throttle.erl +++ b/src/emqttd_throttle.erl @@ -28,5 +28,5 @@ -author("Feng Lee "). -%% TODO:... 0.10.0... +%% TODO:... 0.11.0...