maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(tvix/glue): use TvixStoreIO as derivation builtin state

Browse source 
We propagate a `TvixStoreIO` as the `state` of our derivation-specific
builtins in the glue crate.

The evaluators `io_handle` itself is using a Rc<dyn EvalIO>.

An earlier version of TvixStoreIO was also introducing generics over the
different internal services themselves, but we opted for instead
hardcoding this to Arc<dyn …> for the sake of less macro voodoo.

Change-Id: I535c476f06b840858fa3070c4a237ece47f7a15b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10636
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Autosubmit: raitobezarius <tvl@lahfa.xyz>
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
This commit is contained in:
Ryan Lahfa 2024-01-16 05:31:20 +01:00 • committed by clbot
parent 43b9e25025
commit 12ae96cff2
7 changed files with 124 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

42
tvix/glue/src/builtins/mod.rs
View file

@ -1,12 +1,14 @@
//! Contains builtins that deal with the store or builder.
use std::{cell::RefCell, rc::Rc};
use crate::known_paths::KnownPaths;
use std::rc::Rc;
use crate::tvix_store_io::TvixStoreIO;
mod derivation;
mod derivation_error;
pub use derivation_error::Error as DerivationError;
use tvix_eval::EvalIO;
/// Adds derivation-related builtins to the passed [tvix_eval::Evaluation].
///
@ -14,12 +16,12 @@ pub use derivation_error::Error as DerivationError;
///
/// As they need to interact with `known_paths`, we also need to pass in
/// `known_paths`.
pub fn add_derivation_builtins<IO>(
eval: &mut tvix_eval::Evaluation<IO>,
known_paths: Rc<RefCell<KnownPaths>>,
) {
pub fn add_derivation_builtins<IO>(eval: &mut tvix_eval::Evaluation<IO>, io: Rc<TvixStoreIO>)
where
IO: AsRef<dyn EvalIO>,
{
eval.builtins
.extend(derivation::derivation_builtins::builtins(known_paths));
.extend(derivation::derivation_builtins::builtins(io));
// Add the actual `builtins.derivation` from compiled Nix code
eval.src_builtins
@ -28,22 +30,36 @@ pub fn add_derivation_builtins<IO>(
#[cfg(test)]
mod tests {
use std::rc::Rc;
use crate::tvix_store_io::TvixStoreIO;
use super::add_derivation_builtins;
use crate::known_paths::KnownPaths;
use nix_compat::store_path::hash_placeholder;
use std::{cell::RefCell, rc::Rc};
use test_case::test_case;
use tvix_eval::EvaluationResult;
use tvix_eval::{EvalIO, EvaluationResult};
use tvix_store::utils::construct_services;
/// evaluates a given nix expression and returns the result.
/// Takes care of setting up the evaluator so it knows about the
// `derivation` builtin.
fn eval(str: &str) -> EvaluationResult {
let mut eval = tvix_eval::Evaluation::new_impure();
// We assemble a complete store in memory.
let runtime = tokio::runtime::Runtime::new().expect("Failed to build a Tokio runtime");
let (blob_service, directory_service, path_info_service) = runtime
.block_on(async { construct_services("memory://", "memory://", "memory://").await })
.expect("Failed to construct store services in memory");
let known_paths: Rc<RefCell<KnownPaths>> = Default::default();
let io = Rc::new(TvixStoreIO::new(
blob_service,
directory_service,
path_info_service.into(),
runtime.handle().clone(),
));
add_derivation_builtins(&mut eval, known_paths.clone());
let mut eval = tvix_eval::Evaluation::new(io.clone() as Rc<dyn EvalIO>, false);
add_derivation_builtins(&mut eval, io);
// run the evaluation itself.
eval.evaluate(str, None)