diff options
| author | Christophe Romain <cromain@users.noreply.github.com> | 2017-08-04 12:58:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-04 12:58:06 +0200 |
| commit | 766b7c65a6841889220dffca766b8524f12df68d (patch) | |
| tree | 3db1ea9ab36bafcbe89aeb4e4751a090c24a1cc3 /src/misc.erl | |
| parent | Remove unused 'managers' option, related to the deferred XEP-0321 (#1443) (diff) | |
| parent | Add mod_push_keepalive (diff) | |
Merge pull request #1881 from weiss/push
Support XEP-0357: Push Notifications
Diffstat (limited to 'src/misc.erl')
| -rw-r--r-- | src/misc.erl | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/misc.erl b/src/misc.erl index 604a458af..2112cd90c 100644 --- a/src/misc.erl +++ b/src/misc.erl @@ -32,8 +32,8 @@ hex_to_bin/1, hex_to_base64/1, expand_keyword/3, atom_to_binary/1, binary_to_atom/1, tuple_to_binary/1, l2i/1, i2l/1, i2l/2, expr_to_term/1, term_to_expr/1, - encode_pid/1, decode_pid/2, compile_exprs/2, join_atoms/2, - try_read_file/1]). + now_to_usec/1, usec_to_now/1, encode_pid/1, decode_pid/2, + compile_exprs/2, join_atoms/2, try_read_file/1]). %% Deprecated functions -export([decode_base64/1, encode_base64/1]). @@ -127,6 +127,18 @@ expr_to_term(Expr) -> term_to_expr(Term) -> list_to_binary(io_lib:print(Term)). +-spec now_to_usec(erlang:timestamp()) -> non_neg_integer(). +now_to_usec({MSec, Sec, USec}) -> + (MSec*1000000 + Sec)*1000000 + USec. + +-spec usec_to_now(non_neg_integer()) -> erlang:timestamp(). +usec_to_now(Int) -> + Secs = Int div 1000000, + USec = Int rem 1000000, + MSec = Secs div 1000000, + Sec = Secs rem 1000000, + {MSec, Sec, USec}. + l2i(I) when is_integer(I) -> I; l2i(L) when is_binary(L) -> binary_to_integer(L). |