rustorb 0.2.0__tar.gz → 0.3.0__tar.gz

{rustorb-0.2.0 → rustorb-0.3.0}/Cargo.lock

@@ -438,20 +438,11 @@ dependencies = [
 
 [[package]]
 name = "rustorb-cdr"
-version = "0.2.0"
-
-[[package]]
-name = "rustorb-codegen"
-version = "0.2.0"
-dependencies = [
- "rustorb-core",
- "rustorb-typesupport",
- "tokio",
-]
+version = "0.3.0"
 
 [[package]]
 name = "rustorb-core"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "criterion",
  "libc",
@@ -466,7 +457,7 @@ dependencies = [
 
 [[package]]
 name = "rustorb-ffi"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "rustorb-cdr",
  "rustorb-core",
@@ -474,7 +465,7 @@ dependencies = [
 
 [[package]]
 name = "rustorb-giop"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "rustorb-cdr",
  "serde_json",
@@ -482,22 +473,31 @@ dependencies = [
 
 [[package]]
 name = "rustorb-interop"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "rustorb-core",
  "rustorb-naming",
 ]
 
+[[package]]
+name = "rustorb-mapping-tests"
+version = "0.0.0"
+dependencies = [
+ "rustorb-core",
+ "rustorb-typesupport",
+ "tokio",
+]
+
 [[package]]
 name = "rustorb-naming"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "rustorb-core",
 ]
 
 [[package]]
 name = "rustorb-python"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "pyo3",
  "pyo3-build-config",
@@ -507,7 +507,7 @@ dependencies = [
 
 [[package]]
 name = "rustorb-typesupport"
-version = "0.2.0"
+version = "0.3.0"
 dependencies = [
  "rustorb-cdr",
 ]

{rustorb-0.2.0 → rustorb-0.3.0}/Cargo.toml

@@ -3,7 +3,7 @@ resolver = "3"
 members = ["crates/rustorb-cdr", "crates/rustorb-giop", "crates/rustorb-core", "crates/rustorb-python"]
 
 [workspace.package]
-version = "0.2.0"
+version = "0.3.0"
 edition = "2024"
 rust-version = "1.85"
 license = "MIT OR Apache-2.0"
@@ -13,11 +13,11 @@ keywords = ["corba", "giop", "iiop", "orb", "rpc"]
 categories = ["network-programming"]
 
 [workspace.dependencies]
-rustorb-cdr = { path = "crates/rustorb-cdr", version = "0.2.0" }
-rustorb-typesupport = { path = "crates/rustorb-typesupport", version = "0.2.0" }
-rustorb-giop = { path = "crates/rustorb-giop", version = "0.2.0" }
-rustorb-core = { path = "crates/rustorb-core", version = "0.2.0" }
-rustorb-naming = { path = "crates/rustorb-naming", version = "0.2.0" }
+rustorb-cdr = { path = "crates/rustorb-cdr", version = "0.3.0" }
+rustorb-typesupport = { path = "crates/rustorb-typesupport", version = "0.3.0" }
+rustorb-giop = { path = "crates/rustorb-giop", version = "0.3.0" }
+rustorb-core = { path = "crates/rustorb-core", version = "0.3.0" }
+rustorb-naming = { path = "crates/rustorb-naming", version = "0.3.0" }
 tokio = { version = "1", default-features = false }
 
 [workspace.lints.rust]

{rustorb-0.2.0 → rustorb-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rustorb
-Version: 0.2.0
+Version: 0.3.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: System :: Networking
 Classifier: Topic :: Software Development :: Object Brokering

{rustorb-0.2.0 → rustorb-0.3.0}/crates/rustorb-cdr/src/encoder.rs

@@ -30,6 +30,12 @@ pub struct Encoder {
     /// The valuetypes written so far (for indirections) and the chunk
     /// being written; made with the first value.
     pub(crate) values: Option<Box<crate::value::WriteState>>,
+    /// The 8-byte alignment points written since
+    /// [`track_align8`](Encoder::track_align8), each as the buffer length
+    /// before its padding and the padding written; `None` when not
+    /// tracked, or when something was written whose bytes depend on
+    /// stream offsets (see [`take_align8`](Encoder::take_align8)).
+    align8: Option<Vec<(usize, usize)>>,
 }
 
 macro_rules! write_number {
@@ -66,6 +72,7 @@ impl Encoder {
             origin: 0,
             wstring_bom: true,
             values: None,
+            align8: None,
         }
     }
 
@@ -96,10 +103,48 @@ impl Encoder {
     }
 
     /// The stream offset of the next byte.
+    ///
+    /// A caller that writes bytes depending on it (an offset or an
+    /// indirection) calls [`pin`](Encoder::pin) as well.
     pub fn position(&self) -> usize {
+        self.offset()
+    }
+
+    /// The stream offset of the next byte.
+    pub(crate) fn offset(&self) -> usize {
         self.base + self.len()
     }
 
+    /// Starts recording where the stream is aligned to 8 bytes, so that
+    /// the bytes written from here on can be moved by 4 bytes with
+    /// [`take_align8`](Encoder::take_align8). Only for GIOP encodings;
+    /// recording stops for good when something is written whose bytes
+    /// depend on stream offsets: a valuetype, a call to
+    /// [`pin`](Encoder::pin), [`set_origin`](Encoder::set_origin),
+    /// [`as_bytes_mut`](Encoder::as_bytes_mut) or
+    /// [`truncate`](Encoder::truncate).
+    pub fn track_align8(&mut self) {
+        self.align8 = self.encoding.is_giop().then(Vec::new);
+    }
+
+    /// Stops recording, and returns the 8-byte alignment points written
+    /// since [`track_align8`](Encoder::track_align8): each is the buffer
+    /// length before its padding and the length of that padding. Data
+    /// whose alignment is at most 4 does not depend on the stream offset
+    /// modulo 8, so the bytes written since can be moved by 4 bytes by
+    /// recomputing the padding at these points alone. `None` if not
+    /// recording, or if recording stopped.
+    pub fn take_align8(&mut self) -> Option<Vec<(usize, usize)>> {
+        self.align8.take()
+    }
+
+    /// Says that bytes written from here on depend on stream offsets, as
+    /// an indirection does, so the stream cannot be moved: stops
+    /// [`track_align8`](Encoder::track_align8) for good.
+    pub fn pin(&mut self) {
+        self.align8 = None;
+    }
+
     /// Bytes written so far, shared octets included.
     pub fn len(&self) -> usize {
         self.buf.len() + self.shared_len
@@ -120,12 +165,14 @@ impl Encoder {
     /// buffer indexes, which differ from stream offsets after shared
     /// octets.
     pub fn as_bytes_mut(&mut self) -> &mut [u8] {
+        self.align8 = None;
         &mut self.buf
     }
 
     /// Drops bytes past `len`, which must not be before shared octets.
     pub fn truncate(&mut self, len: usize) {
         debug_assert!(self.shared.last().is_none_or(|(at, _)| *at <= len));
+        self.align8 = None;
         self.buf.truncate(len);
     }
 
@@ -175,9 +222,15 @@ impl Encoder {
     /// [`set_origin`](Encoder::set_origin)).
     pub fn align(&mut self, align: usize) {
         let align = align.min(self.encoding.max_align());
-        let rem = (self.position() - self.origin) % align;
-        if rem != 0 {
-            self.buf.resize(self.buf.len() + align - rem, 0);
+        let rem = (self.offset() - self.origin) % align;
+        let pad = if rem == 0 { 0 } else { align - rem };
+        if align == 8 {
+            if let Some(points) = self.align8.as_mut() {
+                points.push((self.buf.len(), pad));
+            }
+        }
+        if pad != 0 {
+            self.buf.resize(self.buf.len() + pad, 0);
         }
     }
 
@@ -192,7 +245,8 @@ impl Encoder {
     /// `PUSH(ORIGIN)`; the parameter headers of
     /// [`begin_parameter`](Encoder::begin_parameter) do it themselves.
     pub fn set_origin(&mut self, origin: usize) {
-        debug_assert!(origin <= self.position());
+        debug_assert!(origin <= self.offset());
+        self.align8 = None;
         self.origin = origin;
     }
 

{rustorb-0.2.0 → rustorb-0.3.0}/crates/rustorb-cdr/src/value.rs

@@ -100,6 +100,8 @@ impl Encoder {
     ///
     /// A value nested in a chunked value is chunked as well.
     pub fn begin_value(&mut self, key: u64, ids: &[&str], chunked: bool) -> Result<bool> {
+        // Chunk lengths and indirections depend on stream offsets.
+        self.pin();
         let state = self.values.get_or_insert_with(Default::default);
         if let Some(&tag_at) = state.written.get(&key) {
             self.write_u32(INDIRECTION);

{rustorb-0.2.0 → rustorb-0.3.0}/crates/rustorb-cdr/src/xcdr.rs

@@ -438,7 +438,7 @@ impl Encoder {
             extended,
             origin: self.origin,
         };
-        self.origin = self.position();
+        self.origin = self.offset();
         Ok(mark)
     }