feat(rfc-cm): baseline P0-P3 compute machine, stdlib and resource slices
Implements the first vertical slices of RFC-CM-0001/0002 on top of a113d89:
- P1: opaque Memory regions (64 KiB pages, budgets, grow-only), byte
read/write, Memory-index place assignment, wire/host-boundary rejection.
- CM-A04/A05: value-semantics List/Map/Text/Table primitives and the
recoverable Result map convention.
- CM-A06: opaque Resource handles, resource.open/read/write/close, stdout
write, granted project-file read and buffered write, strict fail-closed.
- CM-A07 Compat-A: explicit .mq.md format/utf8/io chain matching builtin
print for the covered value types; builtin remains default.
- P2 fixtures: allocators, list/tree/graph/hash, integer codecs, UTF-8
encode/decode, CSV/JSON subsets, table filter/sort/join, bytecode VM.
- ADRs 0022-0027, spec updates, evidence reports and 68 semantic goldens.
Gate: cargo fmt --check, clippy -D warnings, 407 tests passed.
This commit is contained in:
1 parent
a113d89496
commit
92bfbf2568
127 files changed
+11351
-141
No files matched your search
@@ -8,7 +8,9 @@
|
||||
use std::path::Path;
|
||||
|
||||
use marqdo_expression::{BinaryOp, Expr, UnaryOp};
|
||||
use marqdo_ir::{CallTarget, Function, Module, ModuleId, Resource, SignatureKind, Stmt, UnitKind};
|
||||
use marqdo_ir::{
|
||||
CallTarget, Function, Module, ModuleId, PlaceTarget, Resource, SignatureKind, Stmt, UnitKind,
|
||||
};
|
||||
use marqdo_span::Span;
|
||||
use serde_json::{json, Value};
|
||||
use sha2::{Digest, Sha256};
|
||||
@@ -232,13 +234,31 @@ fn function_json(function: &Function) -> Value {
|
||||
})
|
||||
}
|
||||
|
||||
/// Project an assignment place. Local targets keep the v1 string form; the new
|
||||
/// index target is an additive object so existing consumers that compare the
|
||||
/// local `target` string are unaffected (Analysis v2, ADR-0022).
|
||||
fn place_json(place: &PlaceTarget) -> Value {
|
||||
match place {
|
||||
PlaceTarget::Local { name, .. } => Value::String(name.clone()),
|
||||
PlaceTarget::Index { base, index, span } => json!({
|
||||
"kind": "index",
|
||||
"base": expr_json(base),
|
||||
"index": expr_json(index),
|
||||
"span": span_json(*span),
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
fn stmt_json(stmt: &Stmt) -> Value {
|
||||
match stmt {
|
||||
Stmt::Assign {
|
||||
name, value, span, ..
|
||||
target,
|
||||
value,
|
||||
span,
|
||||
..
|
||||
} => json!({
|
||||
"kind": "assign",
|
||||
"target": name,
|
||||
"target": place_json(target),
|
||||
"value": expr_json(value),
|
||||
"span": span_json(*span),
|
||||
}),
|
||||
@@ -497,9 +517,14 @@ fn collect_calls(
|
||||
) {
|
||||
for stmt in body {
|
||||
match stmt {
|
||||
Stmt::Assign { value, .. } | Stmt::Eval { expr: value, .. } => {
|
||||
expr_calls(project, module, function, value, calls)
|
||||
Stmt::Assign { target, value, .. } => {
|
||||
if let PlaceTarget::Index { base, index, .. } = target {
|
||||
expr_calls(project, module, function, base, calls);
|
||||
expr_calls(project, module, function, index, calls);
|
||||
}
|
||||
expr_calls(project, module, function, value, calls);
|
||||
}
|
||||
Stmt::Eval { expr: value, .. } => expr_calls(project, module, function, value, calls),
|
||||
Stmt::Return { value, .. } => expr_calls(project, module, function, value, calls),
|
||||
Stmt::Call { call, span } => calls.push(json!({
|
||||
"function": function.id.to_string(),
|
||||
|
||||
@@ -4,7 +4,7 @@ use std::path::{Path, PathBuf};
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use marqdo_host::{Capabilities, Host, StdHost};
|
||||
use marqdo_runtime::{run, EvaluatedArg, RuntimeError, Value};
|
||||
use marqdo_runtime::{run_with_limits, EvaluatedArg, MemoryLimits, RuntimeError, Value};
|
||||
use marqdo_sandbox::{PlatformCapabilities, SandboxMode};
|
||||
use marqdo_span::Span;
|
||||
use serde_json::json;
|
||||
@@ -32,6 +32,10 @@ pub struct SandboxSettings {
|
||||
pub stack: Option<usize>,
|
||||
/// Output limit override.
|
||||
pub max_output: Option<usize>,
|
||||
/// Total committed addressable-memory budget override (bytes).
|
||||
pub max_memory: Option<usize>,
|
||||
/// Per-region committed addressable-memory budget override (bytes).
|
||||
pub max_region_memory: Option<usize>,
|
||||
/// Wall-clock timeout in seconds.
|
||||
pub timeout: Option<u64>,
|
||||
/// Explicitly trusted plugin manifests to load.
|
||||
@@ -884,12 +888,21 @@ pub fn execute(
|
||||
.iter()
|
||||
.map(|(name, value)| EvaluatedArg::named(name.clone(), value.clone(), Span::default()))
|
||||
.collect();
|
||||
let result = run(
|
||||
let memory_limits = MemoryLimits {
|
||||
max_total_bytes: settings
|
||||
.max_memory
|
||||
.unwrap_or(marqdo_runtime::DEFAULT_MAX_TOTAL_BYTES),
|
||||
max_region_bytes: settings
|
||||
.max_region_memory
|
||||
.unwrap_or(marqdo_runtime::DEFAULT_MAX_REGION_BYTES),
|
||||
};
|
||||
let result = run_with_limits(
|
||||
&project.program,
|
||||
&mut host,
|
||||
&project.entry,
|
||||
&function_name,
|
||||
runtime_args,
|
||||
memory_limits,
|
||||
);
|
||||
if let Some(path) = &settings.trace_file {
|
||||
let status = match &result {
|
||||
|
||||
@@ -103,6 +103,12 @@ struct SandboxArgs {
|
||||
/// Override the program output byte limit.
|
||||
#[arg(long = "max-output")]
|
||||
max_output: Option<usize>,
|
||||
/// Override the total committed addressable-memory budget in bytes.
|
||||
#[arg(long = "max-memory", value_name = "BYTES")]
|
||||
max_memory: Option<usize>,
|
||||
/// Override the per-region committed addressable-memory budget in bytes.
|
||||
#[arg(long = "max-region-memory", value_name = "BYTES")]
|
||||
max_region_memory: Option<usize>,
|
||||
/// Wall-clock timeout in seconds.
|
||||
#[arg(long)]
|
||||
timeout: Option<u64>,
|
||||
@@ -137,6 +143,8 @@ impl SandboxArgs {
|
||||
fuel: self.fuel,
|
||||
stack: self.stack,
|
||||
max_output: self.max_output,
|
||||
max_memory: self.max_memory,
|
||||
max_region_memory: self.max_region_memory,
|
||||
timeout: self.timeout,
|
||||
plugins: self.plugin.clone(),
|
||||
trust_native_plugin: self.trust_native_plugin,
|
||||
|
||||
Reference in new issue
Block a user