From feef0ea478967511e550fe7ba3368f605727cfc1 Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Thu, 16 Dec 2021 13:42:08 -0700 Subject: [PATCH] Revert "Revert "Spit log data charge into two (#21349) (#21352)"" This reverts commit 03db11eb3a872b77aac3f315a78362fa9d8aa270. --- programs/bpf_loader/src/syscalls.rs | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/programs/bpf_loader/src/syscalls.rs b/programs/bpf_loader/src/syscalls.rs index 231c301551..9c68d08b50 100644 --- a/programs/bpf_loader/src/syscalls.rs +++ b/programs/bpf_loader/src/syscalls.rs @@ -2725,11 +2725,14 @@ impl<'a> SyscallObject for SyscallLogData<'a> { budget .syscall_base_cost .saturating_mul(untranslated_fields.len() as u64) - .saturating_add( - untranslated_fields - .iter() - .fold(0, |total, e| total.saturating_add(e.len() as u64)) - ) + ), + result + ); + question_mark!( + invoke_context.get_compute_meter().consume( + untranslated_fields + .iter() + .fold(0, |total, e| total.saturating_add(e.len() as u64)) ), result );