Skip to content

Commit

Permalink
Pass slice instead of Vec during map serialization.
Browse files Browse the repository at this point in the history 
Before:

utils::bench_serialize_map         ... bench:    66.87 ns/iter (+/- 1.33)
utils::bench_serialize_map_bytes   ... bench:    69.42 ns/iter (+/- 1.45)

After:

utils::bench_serialize_map         ... bench:    55.84 ns/iter (+/- 1.16)
utils::bench_serialize_map_bytes   ... bench:    56.03 ns/iter (+/- 1.19)

Note that this is changed only in the private functions to avoid breaking
the public API.

Signed-off-by: Piotr Sikora <[email protected]>
  • Loading branch information
@PiotrSikora
PiotrSikora committed Oct 28, 2024
1 parent 7bad453 commit a5ca5c8
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions src/hostcalls.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ extern "C" {
}

pub fn set_map(map_type: MapType, map: Vec<(&str, &str)>) -> Result<(), Status> {
let serialized_map = utils::serialize_map(map);
let serialized_map = utils::serialize_map(&map);
unsafe {
match proxy_set_header_map_pairs(map_type, serialized_map.as_ptr(), serialized_map.len()) {
Status::Ok => Ok(()),
Expand All @@ -200,7 +200,7 @@ pub fn set_map(map_type: MapType, map: Vec<(&str, &str)>) -> Result<(), Status>
}

pub fn set_map_bytes(map_type: MapType, map: Vec<(&str, &[u8])>) -> Result<(), Status> {
let serialized_map = utils::serialize_map_bytes(map);
let serialized_map = utils::serialize_map_bytes(&map);
unsafe {
match proxy_set_header_map_pairs(map_type, serialized_map.as_ptr(), serialized_map.len()) {
Status::Ok => Ok(()),
Expand Down Expand Up @@ -710,7 +710,7 @@ pub fn send_http_response(
headers: Vec<(&str, &str)>,
body: Option<&[u8]>,
) -> Result<(), Status> {
let serialized_headers = utils::serialize_map(headers);
let serialized_headers = utils::serialize_map(&headers);
unsafe {
match proxy_send_local_response(
status_code,
Expand All @@ -733,7 +733,7 @@ pub fn send_grpc_response(
grpc_status_message: Option<&str>,
custom_metadata: Vec<(&str, &[u8])>,
) -> Result<(), Status> {
let serialized_custom_metadata = utils::serialize_map_bytes(custom_metadata);
let serialized_custom_metadata = utils::serialize_map_bytes(&custom_metadata);
unsafe {
match proxy_send_local_response(
200,
Expand Down Expand Up @@ -773,8 +773,8 @@ pub fn dispatch_http_call(
trailers: Vec<(&str, &str)>,
timeout: Duration,
) -> Result<u32, Status> {
let serialized_headers = utils::serialize_map(headers);
let serialized_trailers = utils::serialize_map(trailers);
let serialized_headers = utils::serialize_map(&headers);
let serialized_trailers = utils::serialize_map(&trailers);
let mut return_token: u32 = 0;
unsafe {
match proxy_http_call(
Expand Down Expand Up @@ -826,7 +826,7 @@ pub fn dispatch_grpc_call(
timeout: Duration,
) -> Result<u32, Status> {
let mut return_callout_id = 0;
let serialized_initial_metadata = utils::serialize_map_bytes(initial_metadata);
let serialized_initial_metadata = utils::serialize_map_bytes(&initial_metadata);
unsafe {
match proxy_grpc_call(
upstream_name.as_ptr(),
Expand Down Expand Up @@ -874,7 +874,7 @@ pub fn open_grpc_stream(
initial_metadata: Vec<(&str, &[u8])>,
) -> Result<u32, Status> {
let mut return_stream_id = 0;
let serialized_initial_metadata = utils::serialize_map_bytes(initial_metadata);
let serialized_initial_metadata = utils::serialize_map_bytes(&initial_metadata);
unsafe {
match proxy_grpc_stream(
upstream_name.as_ptr(),
Expand Down Expand Up @@ -1159,18 +1159,18 @@ mod utils {
bytes
}

pub(super) fn serialize_map(map: Vec<(&str, &str)>) -> Bytes {
pub(super) fn serialize_map(map: &[(&str, &str)]) -> Bytes {
let mut size: usize = 4;
for (name, value) in &map {
for (name, value) in map {
size += name.len() + value.len() + 10;
}
let mut bytes: Bytes = Vec::with_capacity(size);
bytes.extend_from_slice(&(map.len() as u32).to_le_bytes());
for (name, value) in &map {
for (name, value) in map {
bytes.extend_from_slice(&(name.len() as u32).to_le_bytes());
bytes.extend_from_slice(&(value.len() as u32).to_le_bytes());
}
for (name, value) in &map {
for (name, value) in map {
bytes.extend_from_slice(name.as_bytes());
bytes.push(0);
bytes.extend_from_slice(value.as_bytes());
Expand All @@ -1179,18 +1179,18 @@ mod utils {
bytes
}

pub(super) fn serialize_map_bytes(map: Vec<(&str, &[u8])>) -> Bytes {
pub(super) fn serialize_map_bytes(map: &[(&str, &[u8])]) -> Bytes {
let mut size: usize = 4;
for (name, value) in &map {
for (name, value) in map {
size += name.len() + value.len() + 10;
}
let mut bytes: Bytes = Vec::with_capacity(size);
bytes.extend_from_slice(&(map.len() as u32).to_le_bytes());
for (name, value) in &map {
for (name, value) in map {
bytes.extend_from_slice(&(name.len() as u32).to_le_bytes());
bytes.extend_from_slice(&(value.len() as u32).to_le_bytes());
}
for (name, value) in &map {
for (name, value) in map {
bytes.extend_from_slice(name.as_bytes());
bytes.push(0);
bytes.extend_from_slice(value);
Expand Down Expand Up @@ -1290,14 +1290,14 @@ mod utils {

#[test]
fn test_serialize_map() {
let serialized_map = serialize_map(MAP.to_vec());
let serialized_map = serialize_map(MAP);
assert_eq!(serialized_map, SERIALIZED_MAP);
}

#[test]
fn test_serialize_map_bytes() {
let map: Vec<(&str, &[u8])> = MAP.iter().map(|x| (x.0, x.1.as_bytes())).collect();
let serialized_map = serialize_map_bytes(map);
let serialized_map = serialize_map_bytes(&map);
assert_eq!(serialized_map, SERIALIZED_MAP);
}

Expand Down Expand Up @@ -1326,7 +1326,7 @@ mod utils {
fn bench_serialize_map(b: &mut Bencher) {
let map = MAP.to_vec();
b.iter(|| {
serialize_map(test::black_box(map.clone()));
serialize_map(test::black_box(&map));
});
}

Expand All @@ -1335,7 +1335,7 @@ mod utils {
fn bench_serialize_map_bytes(b: &mut Bencher) {
let map: Vec<(&str, &[u8])> = MAP.iter().map(|x| (x.0, x.1.as_bytes())).collect();
b.iter(|| {
serialize_map_bytes(test::black_box(map.clone()));
serialize_map_bytes(test::black_box(&map));
});
}

Expand Down

0 comments on commit a5ca5c8

Please sign in to comment.