Skip to content
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

Jump to bottom

Make map serialization/deserialization utils public #125

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Make map serialization/deserialization utils public #125

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c885e4
Avoid taking Vec as argument in hostcalls::utils
krdln Sep 16, 2021
3c20993
Make map serialization/deserialization utils public
krdln Sep 16, 2021
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
46 changes: 23 additions & 23 deletions src/hostcalls.rs
View file
Open in desktop
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 @@ -394,7 +394,7 @@ extern "C" {
}

pub fn get_property(path: Vec<&str>) -> Result<Option<Bytes>, Status> {
let serialized_path = utils::serialize_property_path(path);
let serialized_path = utils::serialize_property_path(&path);
let mut return_data: *mut u8 = null_mut();
let mut return_size: usize = 0;
unsafe {
Expand Down Expand Up @@ -431,7 +431,7 @@ extern "C" {
}

pub fn set_property(path: Vec<&str>, value: Option<&[u8]>) -> Result<(), Status> {
let serialized_path = utils::serialize_property_path(path);
let serialized_path = utils::serialize_property_path(&path);
unsafe {
match proxy_set_property(
serialized_path.as_ptr(),
Expand Down Expand Up @@ -708,7 +708,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 Down Expand Up @@ -748,8 +748,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 @@ -801,7 +801,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 @@ -849,7 +849,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 @@ -1067,39 +1067,39 @@ pub fn increment_metric(metric_id: u32, offset: i64) -> Result<(), Status> {
}
}

mod utils {
pub mod utils {
use crate::types::Bytes;
use std::convert::TryFrom;

pub(super) fn serialize_property_path(path: Vec<&str>) -> Bytes {
pub(super) fn serialize_property_path(path: &[&str]) -> Bytes {
if path.is_empty() {
return Vec::new();
}
let mut size: usize = 0;
for part in &path {
for part in path {
size += part.len() + 1;
}
let mut bytes: Bytes = Vec::with_capacity(size);
for part in &path {
for part in path {
bytes.extend_from_slice(part.as_bytes());
bytes.push(0);
}
bytes.pop();
bytes
}

pub(super) fn serialize_map(map: Vec<(&str, &str)>) -> Bytes {
pub 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().to_le_bytes());
for (name, value) in &map {
for (name, value) in map {
bytes.extend_from_slice(&name.len().to_le_bytes());
bytes.extend_from_slice(&value.len().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 @@ -1108,18 +1108,18 @@ mod utils {
bytes
}

pub(super) fn serialize_map_bytes(map: Vec<(&str, &[u8])>) -> Bytes {
pub 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().to_le_bytes());
for (name, value) in &map {
for (name, value) in map {
bytes.extend_from_slice(&name.len().to_le_bytes());
bytes.extend_from_slice(&value.len().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 All @@ -1128,7 +1128,7 @@ mod utils {
bytes
}

pub(super) fn deserialize_map(bytes: &[u8]) -> Vec<(String, String)> {
pub fn deserialize_map(bytes: &[u8]) -> Vec<(String, String)> {
let mut map = Vec::new();
if bytes.is_empty() {
return map;
Expand All @@ -1152,7 +1152,7 @@ mod utils {
map
}

pub(super) fn deserialize_map_bytes(bytes: &[u8]) -> Vec<(String, Bytes)> {
pub fn deserialize_map_bytes(bytes: &[u8]) -> Vec<(String, Bytes)> {
let mut map = Vec::new();
if bytes.is_empty() {
return map;
Expand Down