magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix unused import without feature jemalloc_conf

Browse source 
fix span passed by value

Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2025-03-09 03:14:00 +00:00
parent 07ec9d6d85
commit aa4d2e2363
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/core/alloc/je.rs
View file

@ -8,7 +8,6 @@ use std::{
};
use arrayvec::ArrayVec;
use const_str::concat_bytes;
use tikv_jemalloc_ctl as mallctl;
use tikv_jemalloc_sys as ffi;
use tikv_jemallocator as jemalloc;
@ -20,7 +19,7 @@ use crate::{
#[cfg(feature = "jemalloc_conf")]
#[unsafe(no_mangle)]
pub static malloc_conf: &[u8] = concat_bytes!(
pub static malloc_conf: &[u8] = const_str::concat_bytes!(
"lg_extent_max_active_fit:4",
",oversize_threshold:16777216",
",tcache_max:2097152",

4
src/router/request.rs
View file

@ -37,7 +37,7 @@ pub(crate) async fn handle(
let parent = Span::current();
let task = services.server.runtime().spawn(async move {
tokio::select! {
response = execute(&services_, req, next, parent) => response,
response = execute(&services_, req, next, &parent) => response,
response = services_.server.until_shutdown()
.then(|()| {
let timeout = services_.server.config.client_shutdown_timeout;
@ -79,7 +79,7 @@ async fn execute(
services: &Arc<Services>,
req: http::Request<axum::body::Body>,
next: axum::middleware::Next,
parent: Span,
parent: &Span,
) -> Response {
#[cfg(debug_assertions)]
conduwuit::defer! {{