Browse Source

Switch to forked `shared_memory_extended` crate

The maintainer of the `shared_memory` crate did not react to our PR, so I decided to create a (temporary) fork.
tags/v0.2.4
Philipp Oppermann 2 years ago
parent
commit
979573689a
Failed to extract signature
8 changed files with 12 additions and 15 deletions
  1. +6
    -5
      Cargo.lock
  2. +0
    -4
      Cargo.toml
  3. +1
    -1
      apis/rust/node/Cargo.toml
  4. +1
    -1
      apis/rust/node/src/event_stream/event.rs
  5. +1
    -1
      apis/rust/node/src/node/mod.rs
  6. +1
    -1
      libraries/shared-memory-server/Cargo.toml
  7. +1
    -1
      libraries/shared-memory-server/src/channel.rs
  8. +1
    -1
      libraries/shared-memory-server/src/lib.rs

+ 6
- 5
Cargo.lock View File

@@ -1425,7 +1425,7 @@ dependencies = [
"serde_json",
"serde_yaml 0.8.26",
"shared-memory-server",
"shared_memory",
"shared_memory_extended",
"thiserror",
"tokio",
"tracing",
@@ -4339,14 +4339,15 @@ dependencies = [
"eyre",
"raw_sync_2",
"serde",
"shared_memory",
"shared_memory_extended",
"tracing",
]

[[package]]
name = "shared_memory"
version = "0.12.5"
source = "git+https://github.com/phil-opp/shared_memory.git?branch=read-only#dac07946862bfe459425a86238c7251fd6ee3770"
name = "shared_memory_extended"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "004d7ece9a3be64f85471d50967710b0a146144225bed5f0abd0514a3bed086f"
dependencies = [
"cfg-if",
"libc",


+ 0
- 4
Cargo.toml View File

@@ -102,7 +102,3 @@ path = "examples/benchmark/run.rs"
[[example]]
name = "multiple-daemons"
path = "examples/multiple-daemons/run.rs"

[patch.crates-io.shared_memory]
git = "https://github.com/phil-opp/shared_memory.git"
branch = "read-only"

+ 1
- 1
apis/rust/node/Cargo.toml View File

@@ -24,7 +24,7 @@ flume = "0.10.14"
uuid = { version = "1.1.2", features = ["v4"] }
capnp = "0.14.11"
bincode = "1.3.3"
shared_memory = "0.12.0"
shared_memory_extended = "0.13.0"
dora-tracing = { workspace = true, optional = true }
arrow = "35.0.0"



+ 1
- 1
apis/rust/node/src/event_stream/event.rs View File

@@ -5,7 +5,7 @@ use dora_core::{
message::Metadata,
};
use eyre::Context;
use shared_memory::{Shmem, ShmemConf};
use shared_memory_extended::{Shmem, ShmemConf};

#[derive(Debug)]
#[non_exhaustive]


+ 1
- 1
apis/rust/node/src/node/mod.rs View File

@@ -8,7 +8,7 @@ use dora_core::{
message::{uhlc, Metadata, MetadataParameters},
};
use eyre::{bail, WrapErr};
use shared_memory::{Shmem, ShmemConf};
use shared_memory_extended::{Shmem, ShmemConf};
use std::{
collections::{HashMap, VecDeque},
ops::{Deref, DerefMut},


+ 1
- 1
libraries/shared-memory-server/Cargo.toml View File

@@ -11,7 +11,7 @@ license.workspace = true
[dependencies]
eyre = "0.6.8"
serde = { version = "1.0.152", features = ["derive"] }
shared_memory = "0.12.0"
shared_memory_extended = "0.13.0"
# TODO use upstream release once https://github.com/elast0ny/raw_sync-rs/pull/29 is merged
# Current fix, use personally pushed `raw_sync_2` version.
raw_sync_2 = "0.1.5"


+ 1
- 1
libraries/shared-memory-server/src/channel.rs View File

@@ -1,7 +1,7 @@
use eyre::{eyre, Context};
use raw_sync_2::events::{Event, EventImpl, EventInit, EventState};
use serde::{Deserialize, Serialize};
use shared_memory::Shmem;
use shared_memory_extended::Shmem;
use std::{
mem, slice,
sync::atomic::{AtomicBool, AtomicU64},


+ 1
- 1
libraries/shared-memory-server/src/lib.rs View File

@@ -1,7 +1,7 @@
use self::channel::ShmemChannel;
use eyre::{eyre, Context};
use serde::{Deserialize, Serialize};
pub use shared_memory::{Shmem, ShmemConf};
pub use shared_memory_extended::{Shmem, ShmemConf};
use std::marker::PhantomData;
use std::time::Duration;



Loading…
Cancel
Save