Skip to content

v8: avoid unnecessary log level checks. #146

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PiotrSikora merged 1 commit into from
Apr 2, 2021
Merged

v8: avoid unnecessary log level checks. #146

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions src/v8/v8.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,15 +649,16 @@ void V8::registerHostFunctionImpl(std::string_view module_name, std::string_view
store_.get(), type.get(),
[](void *data, const wasm::Val params[], wasm::Val[]) -> wasm::own<wasm::Trap> {
auto func_data = reinterpret_cast<FuncData *>(data);
if (func_data->vm_->cmpLogLevel(LogLevel::trace)) {
const bool log = func_data->vm_->cmpLogLevel(LogLevel::trace);
if (log) {
func_data->vm_->integration()->trace("[vm->host] " + func_data->name_ + "(" +
printValues(params, sizeof...(Args)) + ")");
}
auto args_tuple = convertValTypesToArgsTuple<std::tuple<Args...>>(params);
auto args = std::tuple_cat(std::make_tuple(current_context_), args_tuple);
auto function = reinterpret_cast<void (*)(void *, Args...)>(func_data->raw_func_);
std::apply(function, args);
if (func_data->vm_->cmpLogLevel(LogLevel::trace)) {
if (log) {
func_data->vm_->integration()->trace("[vm<-host] " + func_data->name_ + " return: void");
}
return nullptr;
Expand All @@ -682,7 +683,8 @@ void V8::registerHostFunctionImpl(std::string_view module_name, std::string_view
store_.get(), type.get(),
[](void *data, const wasm::Val params[], wasm::Val results[]) -> wasm::own<wasm::Trap> {
auto func_data = reinterpret_cast<FuncData *>(data);
if (func_data->vm_->cmpLogLevel(LogLevel::trace)) {
const bool log = func_data->vm_->cmpLogLevel(LogLevel::trace);
if (log) {
func_data->vm_->integration()->trace("[vm->host] " + func_data->name_ + "(" +
printValues(params, sizeof...(Args)) + ")");
}
Expand All @@ -691,7 +693,7 @@ void V8::registerHostFunctionImpl(std::string_view module_name, std::string_view
auto function = reinterpret_cast<R (*)(void *, Args...)>(func_data->raw_func_);
R rvalue = std::apply(function, args);
results[0] = makeVal(rvalue);
if (func_data->vm_->cmpLogLevel(LogLevel::trace)) {
if (log) {
func_data->vm_->integration()->trace("[vm<-host] " + func_data->name_ +
" return: " + std::to_string(rvalue));
}
Expand Down Expand Up @@ -729,17 +731,18 @@ void V8::getModuleFunctionImpl(std::string_view function_name,
}
*function = [func, function_name, this](ContextBase *context, Args... args) -> void {
wasm::Val params[] = {makeVal(args)...};
SaveRestoreContext saved_context(context);
if (cmpLogLevel(LogLevel::trace)) {
const bool log = cmpLogLevel(LogLevel::trace);
if (log) {
integration()->trace("[host->vm] " + std::string(function_name) + "(" +
printValues(params, sizeof...(Args)) + ")");
}
SaveRestoreContext saved_context(context);
auto trap = func->call(params, nullptr);
if (trap) {
fail(FailState::RuntimeError, getFailMessage(std::string(function_name), std::move(trap)));
return;
}
if (cmpLogLevel(LogLevel::trace)) {
if (log) {
integration()->trace("[host<-vm] " + std::string(function_name) + " return: void");
}
};
Expand Down Expand Up @@ -769,18 +772,19 @@ void V8::getModuleFunctionImpl(std::string_view function_name,
*function = [func, function_name, this](ContextBase *context, Args... args) -> R {
wasm::Val params[] = {makeVal(args)...};
wasm::Val results[1];
SaveRestoreContext saved_context(context);
if (cmpLogLevel(LogLevel::trace)) {
const bool log = cmpLogLevel(LogLevel::trace);
if (log) {
integration()->trace("[host->vm] " + std::string(function_name) + "(" +
printValues(params, sizeof...(Args)) + ")");
}
SaveRestoreContext saved_context(context);
auto trap = func->call(params, results);
if (trap) {
fail(FailState::RuntimeError, getFailMessage(std::string(function_name), std::move(trap)));
return R{};
}
R rvalue = results[0].get<typename ConvertWordTypeToUint32<R>::type>();
if (cmpLogLevel(LogLevel::trace)) {
if (log) {
integration()->trace("[host<-vm] " + std::string(function_name) +
" return: " + std::to_string(rvalue));
}
Expand Down