Reimplement the C# API.
This commit reimplements the C# API in terms of a Wasmtime linker. It removes the custom binding implementation that was based on reflection in favor of the linker's implementation. This should make the C# API a little closer to the Rust API. The `Engine` and `Store` types have been hidden behind the `Host` type which is responsible for hosting WebAssembly module instances. Documentation and tests have been updated.
This commit is contained in:
Peter Huene
@@ -11,106 +11,11 @@ namespace Wasmtime.Tests
|
||||
|
||||
public class GlobalImportBindingTests : IClassFixture<GlobalImportBindingFixture>
|
||||
{
|
||||
class NoImportsHost : IHost
|
||||
{
|
||||
public Instance Instance { get; set; }
|
||||
}
|
||||
|
||||
class GlobalIsStaticHost : IHost
|
||||
{
|
||||
public Instance Instance { get; set; }
|
||||
|
||||
[Import("global_i32_mut")]
|
||||
public static int x = 0;
|
||||
}
|
||||
|
||||
class GlobalIsNotReadOnlyHost : IHost
|
||||
{
|
||||
public Instance Instance { get; set; }
|
||||
|
||||
[Import("global_i32_mut")]
|
||||
public int x = 0;
|
||||
}
|
||||
|
||||
class NotAGlobalHost : IHost
|
||||
{
|
||||
public Instance Instance { get; set; }
|
||||
|
||||
[Import("global_i32_mut")]
|
||||
public readonly int x = 0;
|
||||
}
|
||||
|
||||
class NotAValidGlobalTypeHost : IHost
|
||||
{
|
||||
public struct NotAValue
|
||||
{
|
||||
}
|
||||
|
||||
public Instance Instance { get; set; }
|
||||
|
||||
[Import("global_i32_mut")]
|
||||
public readonly MutableGlobal<NotAValue> x = new MutableGlobal<NotAValue>(new NotAValue());
|
||||
}
|
||||
|
||||
class TypeMismatchHost : IHost
|
||||
{
|
||||
public Instance Instance { get; set; }
|
||||
|
||||
[Import("global_i32_mut")]
|
||||
public readonly MutableGlobal<long> x = new MutableGlobal<long>(0);
|
||||
}
|
||||
|
||||
class NotMutHost : IHost
|
||||
{
|
||||
public Instance Instance { get; set; }
|
||||
|
||||
[Import("global_i32_mut")]
|
||||
public readonly Global<int> Int32Mut = new Global<int>(0);
|
||||
}
|
||||
|
||||
class MutHost : IHost
|
||||
{
|
||||
public Instance Instance { get; set; }
|
||||
|
||||
[Import("global_i32_mut")]
|
||||
public readonly MutableGlobal<int> Int32Mut = new MutableGlobal<int>(0);
|
||||
|
||||
[Import("global_i32")]
|
||||
public readonly MutableGlobal<int> Int32 = new MutableGlobal<int>(0);
|
||||
}
|
||||
|
||||
class ValidHost : IHost
|
||||
{
|
||||
public Instance Instance { get; set; }
|
||||
|
||||
[Import("global_i32_mut")]
|
||||
public readonly MutableGlobal<int> Int32Mut = new MutableGlobal<int>(0);
|
||||
|
||||
[Import("global_i32")]
|
||||
public readonly Global<int> Int32 = new Global<int>(1);
|
||||
|
||||
[Import("global_i64_mut")]
|
||||
public readonly MutableGlobal<long> Int64Mut = new MutableGlobal<long>(2);
|
||||
|
||||
[Import("global_i64")]
|
||||
public readonly Global<long> Int64 = new Global<long>(3);
|
||||
|
||||
[Import("global_f32_mut")]
|
||||
public readonly MutableGlobal<float> Float32Mut = new MutableGlobal<float>(4);
|
||||
|
||||
[Import("global_f32")]
|
||||
public readonly Global<float> Float32 = new Global<float>(5);
|
||||
|
||||
[Import("global_f64_mut")]
|
||||
public readonly MutableGlobal<double> Float64Mut = new MutableGlobal<double>(6);
|
||||
|
||||
[Import("global_f64")]
|
||||
public readonly Global<double> Float64 = new Global<double>(7);
|
||||
}
|
||||
|
||||
public GlobalImportBindingTests(GlobalImportBindingFixture fixture)
|
||||
{
|
||||
Fixture = fixture;
|
||||
|
||||
Fixture.Host.ClearDefinitions();
|
||||
}
|
||||
|
||||
private GlobalImportBindingFixture Fixture { get; set; }
|
||||
@@ -118,140 +23,119 @@ namespace Wasmtime.Tests
|
||||
[Fact]
|
||||
public void ItFailsToInstantiateWithMissingImport()
|
||||
{
|
||||
Action action = () => { using var instance = Fixture.Module.Instantiate(new NoImportsHost()); };
|
||||
Action action = () => { using var instance = Fixture.Host.Instantiate(Fixture.Module); };
|
||||
|
||||
action
|
||||
.Should()
|
||||
.Throw<WasmtimeException>()
|
||||
.WithMessage("Failed to bind global import 'global_i32_mut': the host does not contain a global field with a matching 'Import' attribute.");
|
||||
.WithMessage("unknown import: `::global_i32_mut` has not been defined");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ItFailsToInstantiateWithStaticField()
|
||||
public void ItFailsToDefineAGlobalWithInvalidType()
|
||||
{
|
||||
Action action = () => { using var instance = Fixture.Module.Instantiate(new GlobalIsStaticHost()); };
|
||||
Action action = () => { Fixture.Host.DefineGlobal("", "global_i32_mut", "invalid"); };
|
||||
|
||||
action
|
||||
.Should()
|
||||
.Throw<WasmtimeException>()
|
||||
.WithMessage("Unable to bind 'GlobalIsStaticHost.x' to WebAssembly import 'global_i32_mut': field cannot be static.");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ItFailsToInstantiateWithNonReadOnlyField()
|
||||
{
|
||||
Action action = () => { using var instance = Fixture.Module.Instantiate(new GlobalIsNotReadOnlyHost()); };
|
||||
|
||||
action
|
||||
.Should()
|
||||
.Throw<WasmtimeException>()
|
||||
.WithMessage("Unable to bind 'GlobalIsNotReadOnlyHost.x' to WebAssembly import 'global_i32_mut': field must be readonly.");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ItFailsToInstantiateWithInvalidType()
|
||||
{
|
||||
Action action = () => { using var instance = Fixture.Module.Instantiate(new NotAGlobalHost()); };
|
||||
|
||||
action
|
||||
.Should()
|
||||
.Throw<WasmtimeException>()
|
||||
.WithMessage("Unable to bind 'NotAGlobalHost.x' to WebAssembly import 'global_i32_mut': field is expected to be of type 'Global<T>'.");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ItFailsToInstantiateWithInvalidGlobalType()
|
||||
{
|
||||
Action action = () => { using var instance = Fixture.Module.Instantiate(new NotAValidGlobalTypeHost()); };
|
||||
|
||||
action
|
||||
.Should()
|
||||
.Throw<NotSupportedException>()
|
||||
.WithMessage("Type 'Wasmtime.Tests.GlobalImportBindingTests+NotAValidGlobalTypeHost+NotAValue' is not a supported WebAssembly value type.");
|
||||
.WithMessage("Global variables cannot be of type 'System.String'.");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ItFailsToInstantiateWithGlobalTypeMismatch()
|
||||
{
|
||||
Action action = () => { using var instance = Fixture.Module.Instantiate(new TypeMismatchHost()); };
|
||||
Fixture.Host.DefineGlobal("", "global_i32_mut", 0L);
|
||||
Action action = () => { using var instance = Fixture.Host.Instantiate(Fixture.Module); };
|
||||
|
||||
action
|
||||
.Should()
|
||||
.Throw<WasmtimeException>()
|
||||
.WithMessage("Unable to bind 'TypeMismatchHost.x' to WebAssembly import 'global_i32_mut': global type argument is expected to be of type 'int'.");
|
||||
.WithMessage("incompatible import type for `::global_i32_mut` specified*");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ItFailsToInstantiateWhenGlobalIsNotMut()
|
||||
{
|
||||
Action action = () => { using var instance = Fixture.Module.Instantiate(new NotMutHost()); };
|
||||
Fixture.Host.DefineGlobal("", "global_i32_mut", 1);
|
||||
Action action = () => { using var instance = Fixture.Host.Instantiate(Fixture.Module); };
|
||||
|
||||
action
|
||||
.Should()
|
||||
.Throw<WasmtimeException>()
|
||||
.WithMessage("Unable to bind 'NotMutHost.Int32Mut' to WebAssembly import 'global_i32_mut': the import is mutable (use the 'MutableGlobal' type).");
|
||||
.WithMessage("incompatible import type for `::global_i32_mut` specified*");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ItFailsToInstantiateWhenGlobalIsMut()
|
||||
{
|
||||
Action action = () => { using var instance = Fixture.Module.Instantiate(new MutHost()); };
|
||||
Fixture.Host.DefineMutableGlobal("", "global_i32_mut", 0);
|
||||
Fixture.Host.DefineMutableGlobal("", "global_i32", 0);
|
||||
Action action = () => { using var instance = Fixture.Host.Instantiate(Fixture.Module); };
|
||||
|
||||
action
|
||||
.Should()
|
||||
.Throw<WasmtimeException>()
|
||||
.WithMessage("Unable to bind 'MutHost.Int32' to WebAssembly import 'global_i32': the import is constant (use the 'Global' type).");
|
||||
.WithMessage("incompatible import type for `::global_i32` specified*");
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ItBindsTheGlobalsCorrectly()
|
||||
{
|
||||
var host = new ValidHost();
|
||||
using dynamic instance = Fixture.Module.Instantiate(host);
|
||||
var global_i32_mut = Fixture.Host.DefineMutableGlobal("", "global_i32_mut", 0);
|
||||
var global_i32 = Fixture.Host.DefineGlobal("", "global_i32", 1);
|
||||
var global_i64_mut = Fixture.Host.DefineMutableGlobal("", "global_i64_mut", 2L);
|
||||
var global_i64 = Fixture.Host.DefineGlobal("", "global_i64", 3L);
|
||||
var global_f32_mut = Fixture.Host.DefineMutableGlobal("", "global_f32_mut", 4f);
|
||||
var global_f32 = Fixture.Host.DefineGlobal("", "global_f32", 5f);
|
||||
var global_f64_mut = Fixture.Host.DefineMutableGlobal("", "global_f64_mut", 6.0);
|
||||
var global_f64 = Fixture.Host.DefineGlobal("", "global_f64", 7.0);
|
||||
|
||||
host.Int32Mut.Value.Should().Be(0);
|
||||
using dynamic instance = Fixture.Host.Instantiate(Fixture.Module);
|
||||
|
||||
global_i32_mut.Value.Should().Be(0);
|
||||
((int)instance.get_global_i32_mut()).Should().Be(0);
|
||||
host.Int32.Value.Should().Be(1);
|
||||
global_i32.Value.Should().Be(1);
|
||||
((int)instance.get_global_i32()).Should().Be(1);
|
||||
host.Int64Mut.Value.Should().Be(2);
|
||||
global_i64_mut.Value.Should().Be(2);
|
||||
((long)instance.get_global_i64_mut()).Should().Be(2);
|
||||
host.Int64.Value.Should().Be(3);
|
||||
global_i64.Value.Should().Be(3);
|
||||
((long)instance.get_global_i64()).Should().Be(3);
|
||||
host.Float32Mut.Value.Should().Be(4);
|
||||
global_f32_mut.Value.Should().Be(4);
|
||||
((float)instance.get_global_f32_mut()).Should().Be(4);
|
||||
host.Float32.Value.Should().Be(5);
|
||||
global_f32.Value.Should().Be(5);
|
||||
((float)instance.get_global_f32()).Should().Be(5);
|
||||
host.Float64Mut.Value.Should().Be(6);
|
||||
global_f64_mut.Value.Should().Be(6);
|
||||
((double)instance.get_global_f64_mut()).Should().Be(6);
|
||||
host.Float64.Value.Should().Be(7);
|
||||
global_f64.Value.Should().Be(7);
|
||||
((double)instance.get_global_f64()).Should().Be(7);
|
||||
|
||||
host.Int32Mut.Value = 10;
|
||||
host.Int32Mut.Value.Should().Be(10);
|
||||
global_i32_mut.Value = 10;
|
||||
global_i32_mut.Value.Should().Be(10);
|
||||
((int)instance.get_global_i32_mut()).Should().Be(10);
|
||||
instance.set_global_i32_mut(11);
|
||||
host.Int32Mut.Value.Should().Be(11);
|
||||
global_i32_mut.Value.Should().Be(11);
|
||||
((int)instance.get_global_i32_mut()).Should().Be(11);
|
||||
|
||||
host.Int64Mut.Value = 12;
|
||||
host.Int64Mut.Value.Should().Be(12);
|
||||
global_i64_mut.Value = 12;
|
||||
global_i64_mut.Value.Should().Be(12);
|
||||
((long)instance.get_global_i64_mut()).Should().Be(12);
|
||||
instance.set_global_i64_mut(13);
|
||||
host.Int64Mut.Value.Should().Be(13);
|
||||
global_i64_mut.Value.Should().Be(13);
|
||||
((long)instance.get_global_i64_mut()).Should().Be(13);
|
||||
|
||||
host.Float32Mut.Value = 14;
|
||||
host.Float32Mut.Value.Should().Be(14);
|
||||
global_f32_mut.Value = 14;
|
||||
global_f32_mut.Value.Should().Be(14);
|
||||
((float)instance.get_global_f32_mut()).Should().Be(14);
|
||||
instance.set_global_f32_mut(15);
|
||||
host.Float32Mut.Value.Should().Be(15);
|
||||
global_f32_mut.Value.Should().Be(15);
|
||||
((float)instance.get_global_f32_mut()).Should().Be(15);
|
||||
|
||||
host.Float64Mut.Value = 16;
|
||||
host.Float64Mut.Value.Should().Be(16);
|
||||
global_f64_mut.Value = 16;
|
||||
global_f64_mut.Value.Should().Be(16);
|
||||
((double)instance.get_global_f64_mut()).Should().Be(16);
|
||||
instance.set_global_f64_mut(17);
|
||||
host.Float64Mut.Value.Should().Be(17);
|
||||
global_f64_mut.Value.Should().Be(17);
|
||||
((double)instance.get_global_f64_mut()).Should().Be(17);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user