Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -662,13 +662,13 @@ inferno = "0.11.14"
internment = { version = "0.5.0", features = ["arc"] }
ipnet = "2.5.0"
itertools = "0.13"
jemallocator = { package = "tikv-jemallocator", version = "0.6.0", features = [
jemallocator = { package = "tikv-jemallocator", version = "0.6.1", features = [
"profiling",
"stats",
"unprefixed_malloc_on_supported_platforms",
] }
jemalloc-ctl = { package = "tikv-jemalloc-ctl", version = "0.6.0" }
jemalloc-sys = { package = "tikv-jemalloc-sys", version = "0.6.0" }
jemalloc-ctl = { package = "tikv-jemalloc-ctl", version = "0.6.1" }
jemalloc-sys = { package = "tikv-jemalloc-sys", version = "0.6.1" }
json-patch = "0.2.6"
jsonwebtoken = "8.1"
jwt = "0.16.0"
Expand Down
10 changes: 9 additions & 1 deletion aptos-node/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
// Copyright (c) Aptos Foundation
// Licensed pursuant to the Innovation-Enabling Source Code License, available at https://github.com/aptos-labs/aptos-core/blob/main/LICENSE

#![forbid(unsafe_code)]
#![deny(unsafe_code)]

use aptos_node::{utils::ERROR_MSG_BAD_FEATURE_FLAGS, AptosNodeArgs};
use clap::Parser;
use std::ffi::c_char;

#[cfg(unix)]
#[global_allocator]
static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;

/// Can be overridden by setting the `MALLOC_CONF` env var.
#[allow(unsafe_code)]
#[cfg(unix)]
#[used]
#[unsafe(no_mangle)]
pub static mut malloc_conf: *const c_char = c"prof:true,lg_prof_sample:23".as_ptr().cast();

fn main() {
// Check that we are not including any Move test natives
aptos_vm::natives::assert_no_test_natives(ERROR_MSG_BAD_FEATURE_FLAGS);
Expand Down
6 changes: 6 additions & 0 deletions execution/executor-benchmark/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ use aptos_vm_environment::prod_configs::{
use clap::{Parser, Subcommand, ValueEnum};
use once_cell::sync::Lazy;
use std::{
ffi::c_char,
net::SocketAddr,
path::PathBuf,
time::{SystemTime, UNIX_EPOCH},
Expand All @@ -52,6 +53,11 @@ use std::{
#[global_allocator]
static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;

#[cfg(unix)]
#[used]
#[unsafe(no_mangle)]
pub static mut malloc_conf: *const c_char = c"prof:true,lg_prof_sample:23".as_ptr().cast();

/// This is needed for filters on the Grafana dashboard working as its used to populate the filter
/// variables.
pub static START_TIME: Lazy<IntGauge> =
Expand Down
Loading