Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:Ledest:erlang:24
erlang
0647-diameter-improve-codegen-changing-size-1-b...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 0647-diameter-improve-codegen-changing-size-1-by-XXX_size.patch of Package erlang
From 59b8ccdd4738577718d631345a824f5bcf6c7260 Mon Sep 17 00:00:00 2001 From: Kiko Fernandez-Reyes <kiko@erlang.org> Date: Wed, 18 Jan 2023 13:52:35 +0100 Subject: [PATCH] diameter: improve codegen changing size/1 by XXX_size/1 --- lib/diameter/src/base/diameter_codec.erl | 6 +++--- lib/diameter/src/base/diameter_lib.erl | 6 +++--- lib/diameter/src/base/diameter_types.erl | 4 ++-- lib/diameter/src/info/diameter_info.erl | 4 ++-- lib/diameter/test/diameter_codec_test.erl | 2 +- lib/diameter/test/diameter_gen_tcp_SUITE.erl | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/diameter/src/base/diameter_codec.erl b/lib/diameter/src/base/diameter_codec.erl index 7f6baf666a..2a21fb26b4 100644 --- a/lib/diameter/src/base/diameter_codec.erl +++ b/lib/diameter/src/base/diameter_codec.erl @@ -113,7 +113,7 @@ enc(_, Opts, #diameter_packet{msg = [#diameter_header{} = Hdr | As]} try encode_avps(As, Opts) of Avps -> Bin = list_to_binary(Avps), - Len = 20 + size(Bin), + Len = 20 + byte_size(Bin), #diameter_header{version = Vsn, is_request = R, @@ -161,7 +161,7 @@ enc(Mod, Opts, #diameter_packet{header = Hdr0, msg = Msg} = Pkt) -> try encode_avps(Mod, MsgName, Values, Opts) of Avps -> Bin = list_to_binary(Avps), - Len = 20 + size(Bin), + Len = 20 + byte_size(Bin), Hdr = Hdr0#diameter_header{length = Len, cmd_code = Code, @@ -628,7 +628,7 @@ pack_avp(#diameter_avp{code = undefined, data = B}, _) %% from the length header for this reason, to avoid creating a sub %% binary for no useful reason. Len = header_length(B), - Sz = min(5, size(B)), + Sz = min(5, byte_size(B)), <<B:Sz/binary, 0:(5-Sz)/unit:8, Len:24, 0:(Len-8)/unit:8>>; %% Ignoring errors in Failed-AVP or during a relay encode. diff --git a/lib/diameter/src/base/diameter_lib.erl b/lib/diameter/src/base/diameter_lib.erl index edd9d5a4ce..064de508d4 100644 --- a/lib/diameter/src/base/diameter_lib.erl +++ b/lib/diameter/src/base/diameter_lib.erl @@ -271,9 +271,9 @@ ipaddr(Addr) -> %% Already a tuple: ensure non-negative integers of the right size. ip(T) - when size(T) == 4; - size(T) == 8 -> - Bs = 2*size(T), + when tuple_size(T) == 4; + tuple_size(T) == 8 -> + Bs = 2*tuple_size(T), [] = lists:filter(fun(N) when 0 =< N -> 0 < N bsr Bs end, tuple_to_list(T)), T; diff --git a/lib/diameter/src/base/diameter_types.erl b/lib/diameter/src/base/diameter_types.erl index 79312dfe13..683fabb3d4 100644 --- a/lib/diameter/src/base/diameter_types.erl +++ b/lib/diameter/src/base/diameter_types.erl @@ -243,8 +243,8 @@ <<0:48>>; 'Address'(decode, <<A:16, B/binary>>, _) - when 1 == A, 4 == size(B); - 2 == A, 16 == size(B) -> + when 1 == A, 4 == byte_size(B); + 2 == A, 16 == byte_size(B) -> list_to_tuple([N || <<N:A/unit:8>> <= B]); 'Address'(decode, B, _) -> diff --git a/lib/diameter/src/info/diameter_info.erl b/lib/diameter/src/info/diameter_info.erl index 9d1f392c4e..cdd3de9f74 100644 --- a/lib/diameter/src/info/diameter_info.erl +++ b/lib/diameter/src/info/diameter_info.erl @@ -688,10 +688,10 @@ f(SFun, Width, [HF | _] = Fields, Values) -> end. values(Fields, Rec) - when length(Fields) == size(Rec) - 1 -> + when length(Fields) == tuple_size(Rec) - 1 -> ?VALUES(Rec); values(Fields, T) - when length(Fields) == size(T) -> + when length(Fields) == tuple_size(T) -> tuple_to_list(T). %% format_local/2 diff --git a/lib/diameter/test/diameter_codec_test.erl b/lib/diameter/test/diameter_codec_test.erl index e4ad139d93..43ff1aa199 100644 --- a/lib/diameter/test/diameter_codec_test.erl +++ b/lib/diameter/test/diameter_codec_test.erl @@ -294,7 +294,7 @@ d(F, Eq, V) -> end. z(B) -> - Sz = size(B), + Sz = byte_size(B), <<0:Sz/unit:8>>. %% values/1 diff --git a/lib/diameter/test/diameter_gen_tcp_SUITE.erl b/lib/diameter/test/diameter_gen_tcp_SUITE.erl index d1e01da27e..8c45c679ac 100644 --- a/lib/diameter/test/diameter_gen_tcp_SUITE.erl +++ b/lib/diameter/test/diameter_gen_tcp_SUITE.erl @@ -75,14 +75,14 @@ send_long() -> {Sock, SendF} = connection(), B = binary:copy(<<$X>>, 1 bsl 20), ok = SendF(B), - B = recv(Sock, size(B), []). + B = recv(Sock, byte_size(B), []). recv(_, 0, Acc) -> list_to_binary(lists:reverse(Acc)); recv(Sock, N, Acc) -> receive {tcp, Sock, Bin} -> - recv(Sock, N - size(Bin), [Bin | Acc]); + recv(Sock, N - byte_size(Bin), [Bin | Acc]); T -> {T, Acc} end. -- 2.35.3
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor