diff options
| -rw-r--r-- | tvix/nix-compat/src/lib.rs | 5 | ||||
| -rw-r--r-- | tvix/nix-compat/src/nix_daemon/mod.rs | 1 | ||||
| -rw-r--r-- | tvix/nix-compat/src/nix_daemon/worker_protocol.rs (renamed from tvix/nix-compat/src/wire/worker_protocol.rs) | 54 | ||||
| -rw-r--r-- | tvix/nix-compat/src/wire/mod.rs | 2 | ||||
| -rw-r--r-- | users/picnoir/tvix-daemon/src/main.rs | 6 |
5 files changed, 34 insertions, 34 deletions
diff --git a/tvix/nix-compat/src/lib.rs b/tvix/nix-compat/src/lib.rs index da8ac2a6c0b5..5a9a3c69fa77 100644 --- a/tvix/nix-compat/src/lib.rs +++ b/tvix/nix-compat/src/lib.rs @@ -9,3 +9,8 @@ pub mod store_path; #[cfg(feature = "wire")] pub mod wire; + +#[cfg(feature = "wire")] +mod nix_daemon; +#[cfg(feature = "wire")] +pub use nix_daemon::worker_protocol; diff --git a/tvix/nix-compat/src/nix_daemon/mod.rs b/tvix/nix-compat/src/nix_daemon/mod.rs new file mode 100644 index 000000000000..633fdbebd47c --- /dev/null +++ b/tvix/nix-compat/src/nix_daemon/mod.rs @@ -0,0 +1 @@ +pub mod worker_protocol; diff --git a/tvix/nix-compat/src/wire/worker_protocol.rs b/tvix/nix-compat/src/nix_daemon/worker_protocol.rs index a9d3bd85478b..4630a4f77067 100644 --- a/tvix/nix-compat/src/wire/worker_protocol.rs +++ b/tvix/nix-compat/src/nix_daemon/worker_protocol.rs @@ -7,9 +7,7 @@ use enum_primitive_derive::Primitive; use num_traits::{FromPrimitive, ToPrimitive}; use tokio::io::{AsyncReadExt, AsyncWriteExt}; -use crate::wire::{bytes, primitive}; - -use super::bytes::read_string; +use crate::wire; static WORKER_MAGIC_1: u64 = 0x6e697863; // "nixc" static WORKER_MAGIC_2: u64 = 0x6478696f; // "dxio" @@ -131,30 +129,30 @@ pub async fn read_client_settings<R: AsyncReadExt + Unpin>( r: &mut R, client_version: u64, ) -> std::io::Result<ClientSettings> { - let keep_failed = primitive::read_bool(r).await?; - let keep_going = primitive::read_bool(r).await?; - let try_fallback = primitive::read_bool(r).await?; - let verbosity_uint = primitive::read_u64(r).await?; + let keep_failed = wire::read_bool(r).await?; + let keep_going = wire::read_bool(r).await?; + let try_fallback = wire::read_bool(r).await?; + let verbosity_uint = wire::read_u64(r).await?; let verbosity = Verbosity::from_u64(verbosity_uint).ok_or_else(|| { Error::new( ErrorKind::InvalidData, format!("Can't convert integer {} to verbosity", verbosity_uint), ) })?; - let max_build_jobs = primitive::read_u64(r).await?; - let max_silent_time = primitive::read_u64(r).await?; - _ = primitive::read_u64(r).await?; // obsolete useBuildHook - let verbose_build = primitive::read_bool(r).await?; - _ = primitive::read_u64(r).await?; // obsolete logType - _ = primitive::read_u64(r).await?; // obsolete printBuildTrace - let build_cores = primitive::read_u64(r).await?; - let use_substitutes = primitive::read_bool(r).await?; + let max_build_jobs = wire::read_u64(r).await?; + let max_silent_time = wire::read_u64(r).await?; + _ = wire::read_u64(r).await?; // obsolete useBuildHook + let verbose_build = wire::read_bool(r).await?; + _ = wire::read_u64(r).await?; // obsolete logType + _ = wire::read_u64(r).await?; // obsolete printBuildTrace + let build_cores = wire::read_u64(r).await?; + let use_substitutes = wire::read_bool(r).await?; let mut overrides = HashMap::new(); if client_version >= 12 { - let num_overrides = primitive::read_u64(r).await?; + let num_overrides = wire::read_u64(r).await?; for _ in 0..num_overrides { - let name = read_string(r, 0..MAX_SETTING_SIZE).await?; - let value = read_string(r, 0..MAX_SETTING_SIZE).await?; + let name = wire::read_string(r, 0..MAX_SETTING_SIZE).await?; + let value = wire::read_string(r, 0..MAX_SETTING_SIZE).await?; overrides.insert(name, value); } } @@ -197,17 +195,17 @@ pub async fn server_handshake_client<'a, RW: 'a>( where &'a mut RW: AsyncReadExt + AsyncWriteExt + Unpin, { - let worker_magic_1 = primitive::read_u64(&mut conn).await?; + let worker_magic_1 = wire::read_u64(&mut conn).await?; if worker_magic_1 != WORKER_MAGIC_1 { Err(std::io::Error::new( ErrorKind::InvalidData, format!("Incorrect worker magic number received: {}", worker_magic_1), )) } else { - primitive::write_u64(&mut conn, WORKER_MAGIC_2).await?; + wire::write_u64(&mut conn, WORKER_MAGIC_2).await?; conn.write_all(&PROTOCOL_VERSION).await?; conn.flush().await?; - let client_version = primitive::read_u64(&mut conn).await?; + let client_version = wire::read_u64(&mut conn).await?; if client_version < 0x10a { return Err(Error::new( ErrorKind::Unsupported, @@ -218,20 +216,20 @@ where let _protocol_major = client_version & 0xff00; if protocol_minor >= 14 { // Obsolete CPU affinity. - let read_affinity = primitive::read_u64(&mut conn).await?; + let read_affinity = wire::read_u64(&mut conn).await?; if read_affinity != 0 { - let _cpu_affinity = primitive::read_u64(&mut conn).await?; + let _cpu_affinity = wire::read_u64(&mut conn).await?; }; } if protocol_minor >= 11 { // Obsolete reserveSpace - let _reserve_space = primitive::read_u64(&mut conn).await?; + let _reserve_space = wire::read_u64(&mut conn).await?; } if protocol_minor >= 33 { // Nix version. We're plain lying, we're not Nix, but eh… // Setting it to the 2.3 lineage. Not 100% sure this is a // good idea. - bytes::write_bytes(&mut conn, nix_version).await?; + wire::write_bytes(&mut conn, nix_version).await?; conn.flush().await?; } if protocol_minor >= 35 { @@ -243,7 +241,7 @@ where /// Read a worker [Operation] from the wire. pub async fn read_op<R: AsyncReadExt + Unpin>(r: &mut R) -> std::io::Result<Operation> { - let op_number = primitive::read_u64(r).await?; + let op_number = wire::read_u64(r).await?; Operation::from_u64(op_number).ok_or(Error::new( ErrorKind::InvalidData, format!("Invalid OP number {}", op_number), @@ -276,8 +274,8 @@ where W: AsyncReadExt + AsyncWriteExt + Unpin, { match t { - Trust::Trusted => primitive::write_u64(conn, 1).await, - Trust::NotTrusted => primitive::write_u64(conn, 2).await, + Trust::Trusted => wire::write_u64(conn, 1).await, + Trust::NotTrusted => wire::write_u64(conn, 2).await, } } diff --git a/tvix/nix-compat/src/wire/mod.rs b/tvix/nix-compat/src/wire/mod.rs index 83d4a7c9bbca..65c053d58e21 100644 --- a/tvix/nix-compat/src/wire/mod.rs +++ b/tvix/nix-compat/src/wire/mod.rs @@ -6,5 +6,3 @@ pub use bytes::*; mod primitive; pub use primitive::*; - -pub mod worker_protocol; diff --git a/users/picnoir/tvix-daemon/src/main.rs b/users/picnoir/tvix-daemon/src/main.rs index 33501001285b..27bec90ce47f 100644 --- a/users/picnoir/tvix-daemon/src/main.rs +++ b/users/picnoir/tvix-daemon/src/main.rs @@ -3,10 +3,8 @@ use tokio::io::{AsyncReadExt, AsyncWriteExt}; use tokio_listener::{self, SystemOptions, UserOptions}; use tracing::{debug, error, info, instrument, Level}; -use nix_compat::wire::{ - self, - worker_protocol::{self, server_handshake_client, ClientSettings, Trust}, -}; +use nix_compat::wire; +use nix_compat::worker_protocol::{self, server_handshake_client, ClientSettings, Trust}; #[derive(Parser, Debug)] struct Cli { |