projects
/
euphorik.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of gburri.org:euphorik
[euphorik.git]
/
modules
/
erl
/
euphorik_common.erl
diff --git
a/modules/erl/euphorik_common.erl
b/modules/erl/euphorik_common.erl
index
3806df3
..
f9e3f68
100644
(file)
--- a/
modules/erl/euphorik_common.erl
+++ b/
modules/erl/euphorik_common.erl
@@
-15,12
+15,12
@@
%
% You should have received a copy of the GNU General Public License
% along with Euphorik. If not, see <http://www.gnu.org/licenses/>.
%
% You should have received a copy of the GNU General Public License
% along with Euphorik. If not, see <http://www.gnu.org/licenses/>.
-%
-% Module avec plein de bordel utile à l'intérieur.
-% @author G.Burri
+%
+% Module with some useful stuffs.
-module(euphorik_common).
-module(euphorik_common).
+-author("Greg Burri <greg.burri@gmail.com>").
-export([
ceiling/1,
delta_date_ms/2,
-export([
ceiling/1,
delta_date_ms/2,
@@
-40,9
+40,9
@@
ceiling(X) ->
Pos when Pos > 0 -> T + 1;
_ -> T
end.
Pos when Pos > 0 -> T + 1;
_ -> T
end.
-
-% Retourne la difference entre deux timestamp (erlang:now()) en miliseconde
+
+% Retourne la difference entre deux timestamp (erlang:timestamp()) en miliseconde
delta_date_ms(D1, D2) ->
1000000000 * abs(element(1, D1) - element(1, D2)) + 1000 * abs(element(2, D1) - element(2, D2)) + trunc(abs(element(3, D1) - element(3, D2)) / 1000).
delta_date_ms(D1, D2) ->
1000000000 * abs(element(1, D1) - element(1, D2)) + 1000 * abs(element(2, D1) - element(2, D2)) + trunc(abs(element(3, D1) - element(3, D2)) / 1000).
@@
-50,14
+50,14
@@
delta_date_ms(D1, D2) ->
% Retourne la différence entre deux timestamp (erlang:now) en minutes
delta_date_minute(D1, D2) ->
trunc(delta_date_ms(D1, D2) / 1000 / 60).
% Retourne la différence entre deux timestamp (erlang:now) en minutes
delta_date_minute(D1, D2) ->
trunc(delta_date_ms(D1, D2) / 1000 / 60).
-
+
serialize_ip(undefined) ->
"<unknown IP>";
serialize_ip(IP) ->
lists:flatten(io_lib:format("~w.~w.~w.~w", tuple_to_list(IP))).
serialize_ip(undefined) ->
"<unknown IP>";
serialize_ip(IP) ->
lists:flatten(io_lib:format("~w.~w.~w.~w", tuple_to_list(IP))).
-
-
+
+
unserialize_ip(IP) ->
case io_lib:fread("~d.~d.~d.~d", IP) of
{ok, [A, B, C, D], []} -> {A, B, C, D};
unserialize_ip(IP) ->
case io_lib:fread("~d.~d.~d.~d", IP) of
{ok, [A, B, C, D], []} -> {A, B, C, D};