Skip to content

memorypool: remove custom arc in favor of system allocator #48296

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
jkarneges merged 1 commit into from
Jan 22, 2026
Merged

memorypool: remove custom arc in favor of system allocator #48296

Show file tree
Hide file tree
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
9 changes: 2 additions & 7 deletions src/connmgr/client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1655,7 +1655,6 @@ impl Client {

let req_scratch_mem = Rc::new(memorypool::RcMemory::new(1));
let req_req_mem = Rc::new(memorypool::RcMemory::new(1));
let msg_mem = Arc::new(memorypool::ArcMemory::new(1));

let scratch = memorypool::Rc::new(
RefCell::new(zhttppacket::ParseScratch::new()),
Expand All @@ -1669,7 +1668,7 @@ impl Client {
"0:text/plain,]]4:body,5:hello,4:more,4:true!}",
);

let msg = memorypool::Arc::new(zmq::Message::from(msg.as_bytes()), &msg_mem).unwrap();
let msg = Arc::new(zmq::Message::from(msg.as_bytes()));

let zreq = zhttppacket::OwnedRequest::parse(msg, 0, scratch).unwrap();
let zreq = memorypool::Rc::new(zreq, &req_req_mem).unwrap();
Expand Down Expand Up @@ -1720,7 +1719,6 @@ impl Client {

let req_scratch_mem = Rc::new(memorypool::RcMemory::new(1));
let req_req_mem = Rc::new(memorypool::RcMemory::new(1));
let msg_mem = Arc::new(memorypool::ArcMemory::new(1));

let scratch = memorypool::Rc::new(
RefCell::new(zhttppacket::ParseScratch::new()),
Expand All @@ -1734,7 +1732,7 @@ impl Client {
"0:text/plain,]]4:body,5:hello,4:more,4:true!}",
);

let msg = memorypool::Arc::new(zmq::Message::from(msg.as_bytes()), &msg_mem).unwrap();
let msg = Arc::new(zmq::Message::from(msg.as_bytes()));

let zreq = zhttppacket::OwnedRequest::parse(msg, 0, scratch).unwrap();
let zreq = memorypool::Rc::new(zreq, &req_req_mem).unwrap();
Expand Down Expand Up @@ -1828,12 +1826,9 @@ impl TestClient {
let req_maxconn = 100;
let stream_maxconn = 100;

let maxconn = req_maxconn + stream_maxconn;

let mut zsockman = zhttpsocket::ServerSocketManager::new(
Arc::clone(&zmq_context),
"test",
(MSG_RETAINED_PER_CONNECTION_MAX * maxconn) + (MSG_RETAINED_PER_WORKER_MAX * workers),
100,
100,
100,
Expand Down
Loading
Loading