File 2125-Use-iolist_size-instead-of-local-function.... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2125-Use-iolist_size-instead-of-local-function.patch of Package erlang (Revision 41749786708c8342f88ab38c05f4898c)

Currently displaying revision 41749786708c8342f88ab38c05f4898c , Show latest

From 6abc37b32ac6965ab780cd6fda5667585caaa711 Mon Sep 17 00:00:00 2001
From: Richard Carlsson <richardc@klarna.com>
Date: Tue, 15 Nov 2016 16:53:38 +0100
Subject: [PATCH 05/12] Use iolist_size instead of local function

---
 lib/kernel/src/disk_log.erl | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/kernel/src/disk_log.erl b/lib/kernel/src/disk_log.erl
index d06429d62..8dd9975b2 100644
--- a/lib/kernel/src/disk_log.erl
+++ b/lib/kernel/src/disk_log.erl
@@ -1695,7 +1695,7 @@ do_unblock(L, S) ->
 do_log(L, B) when L#log.type =:= halt ->
     #log{format = Format, extra = Halt} = L,
     #halt{curB = CurSize, size = Sz} = Halt,
-    {Bs, BSize} = bsize(B, Format),
+    {Bs, BSize} = logl(B, Format),
     case get(is_full) of
 	true ->
             {error, {error, {full, L#log.name}}, 0};
@@ -1731,17 +1731,14 @@ do_log(L, B) when L#log.format_type =:= wrap_ext ->
 	    {error, Error, Logged - Lost}
     end.
 
-bsize(B, external) ->
-    {B, xsz(B, 0)};
-bsize(B, internal) ->
+logl(B, external) ->
+    {B, iolist_size(B)};
+logl(B, internal) ->
     disk_log_1:logl(B).
 
-xsz([B|T], Sz) -> xsz(T, byte_size(B) + Sz);
-xsz([], Sz) -> Sz.
-	
 halt_write_full(L, [Bin | Bins], Format, N) ->
     B = [Bin],
-    {Bs, BSize} = bsize(B, Format),
+    {Bs, BSize} = logl(B, Format),
     Halt = L#log.extra,
     #halt{curB = CurSize, size = Sz} = Halt,
     if 
-- 
2.11.0

Places

File 2125-Use-iolist_size-instead-of-local-function.patch of Package erlang (Revision 41749786708c8342f88ab38c05f4898c)

Places