jemalloc creates too many problems

main
Ziyang Hu 2 years ago
parent c40473a08e
commit 68774c53ab

@ -30,11 +30,11 @@ ordered-float = { version = "3.0", features = ["serde"] }
itertools = "0.10.3"
cozorocks = { path = "cozorocks" }
[target.'cfg(not(target_env = "msvc"))'.dependencies]
tikv-jemallocator = "0.5"
#[target.'cfg(not(target_env = "msvc"))'.dependencies]
#tikv-jemallocator = { version = "0.5", features = ["disable_initial_exec_tls"] }
[profile.release]
lto = true
#[profile.release]
#lto = true
[workspace]
members = ["cozorocks", "cozohttp", "cozopy"]

@ -1,3 +1,10 @@
// #[cfg(not(target_env = "msvc"))]
// use tikv_jemallocator::Jemalloc;
//
// #[cfg(not(target_env = "msvc"))]
// #[global_allocator]
// static GLOBAL: Jemalloc = Jemalloc;
//
use pyo3::exceptions::PyException;
use pyo3::prelude::*;

@ -10,7 +10,7 @@ fn main() {
println!("cargo:rustc-link-lib=lz4");
println!("cargo:rustc-link-lib=snappy");
println!("cargo:rustc-link-lib=zstd");
println!("cargo:rustc-link-lib=jemalloc");
// println!("cargo:rustc-link-lib=jemalloc");
println!("cargo:rerun-if-changed=src/bridge/mod.rs");
println!("cargo:rerun-if-changed=bridge/bridge.h");
println!("cargo:rerun-if-changed=bridge/common.h");

@ -11,13 +11,13 @@ mkdir -p deps
INSTALL_DIR=$(readlink -f deps)
echo "$INSTALL_DIR"
cd jemalloc || exit
./autogen.sh --disable-debug --prefix="$INSTALL_DIR" --with-jemalloc-prefix=""
make
make install
cd ..
#cd jemalloc || exit
#
#./autogen.sh --disable_initial_exec_tls --disable-debug --prefix="$INSTALL_DIR" --with-jemalloc-prefix=""
#make
#make install
#
#cd ..
cd rocksdb || exit
make clean
@ -27,12 +27,13 @@ export JEMALLOC_BASE=$INSTALL_DIR
export EXTRA_CFLAGS='-fPIC'
export EXTRA_CXXFLAGS='-fPIC'
# JEMALLOC_INCLUDE=" -I $JEMALLOC_BASE/include/" \
# JEMALLOC_LIB=" $JEMALLOC_BASE/lib/libjemalloc.a" \
# JEMALLOC=1 \
DEBUG_LEVEL=0 \
JEMALLOC_INCLUDE=" -I $JEMALLOC_BASE/include/" \
JEMALLOC_LIB=" $JEMALLOC_BASE/lib/libjemalloc.a" \
USE_RTTI=1 \
USE_CLANG=1 \
JEMALLOC=1 \
PREFIX=$INSTALL_DIR \
make install-static || exit

@ -1,8 +1,6 @@
#![warn(rust_2018_idioms, future_incompatible)]
pub use anyhow::Error;
#[cfg(not(target_env = "msvc"))]
use tikv_jemallocator::Jemalloc;
pub use cozorocks::DbBuilder;
pub use data::encode::EncodedVec;
@ -10,9 +8,12 @@ pub use data::id::{AttrId, EntityId, TxId, Validity};
pub use parse::schema::AttrTxItem;
pub use runtime::db::Db;
#[cfg(not(target_env = "msvc"))]
#[global_allocator]
static GLOBAL: Jemalloc = Jemalloc;
// #[cfg(not(target_env = "msvc"))]
// use tikv_jemallocator::Jemalloc;
// #[cfg(not(target_env = "msvc"))]
// #[global_allocator]
// static GLOBAL: Jemalloc = Jemalloc;
pub(crate) mod data;
pub(crate) mod parse;

Loading…
Cancel
Save