Merge pull request #56 from suborbital/connor/swift-pointers

Swift library improvements

.gitignore

@@ -23,4 +23,6 @@ test
 target
 
 .build
-Suborbital.wasm
+Suborbital.wasm
+
+.swiftpm

.travis.yml

@@ -4,10 +4,10 @@ jobs:
   include:
    - os: linux
      arch: amd64
-   - os: linux
-     arch: arm64
    - os: osx
      arch: amd64
+   - os: linux
+     arch: arm64-graviton2
 
 go:
 - "1.15.x"

Makefile

@@ -1,6 +1,9 @@
 test:
 	go test -v --count=1 -p=1 ./...
 
+testdata:
+	subo build ./rwasm/testdata/ --bundle --native
+
 wasm:
 	wasm-pack build
 	cp ./pkg/wasm_runner_bg.wasm ./wasm/

api/rust/suborbital/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "suborbital"
-version = "0.6.0"
+version = "0.6.3"
 authors = ["cohix <connorjhicks@gmail.com>"]
 edition = "2018"
 description = "Suborbital Wasm Runnable API"

api/swift/Sources/suborbital/lib.swift

@@ -246,7 +246,7 @@ public func GetStaticFile(name: String) -> String {
 }
 
 @_cdecl("run_e")
-func run_e(pointer: UnsafeRawPointer, size: Int32, ident: Int32) {
+func run_e(pointer: UnsafeMutablePointer<Int8>, size: Int32, ident: Int32) {
     CURRENT_IDENT = ident
 
     let inString = fromFFI(ptr: pointer, size: size)
@@ -261,13 +261,14 @@ func run_e(pointer: UnsafeRawPointer, size: Int32, ident: Int32) {
 }
 
 @_cdecl("allocate")
-func allocate(size: Int32) -> UnsafeMutableRawPointer {
-  return UnsafeMutableRawPointer.allocate(byteCount: Int(size), alignment: MemoryLayout<UInt8>.alignment)
+func allocate(size: Int32) -> UnsafeMutablePointer<Int8> {
+  return UnsafeMutablePointer<Int8>.allocate(capacity: Int(size) + 1)
 }
 
 @_cdecl("deallocate")
-func deallocate(pointer: UnsafeRawPointer, size: Int32) {
-    let ptr: UnsafePointer<UInt8> = pointer.bindMemory(to: UInt8.self, capacity: Int(size))
+func deallocate(ptr: UnsafeRawPointer, size: Int32) {
+    let ptr: UnsafeMutablePointer<Int8> = UnsafeMutablePointer(mutating: ptr.bindMemory(to: Int8.self, capacity: Int(size) + 1))
+    ptr.deinitialize(count: Int(size) + 1)
     ptr.deallocate()
 }
 
@@ -283,8 +284,11 @@ func toFFI(val: String, use: (UnsafePointer<Int8>, Int32) -> Void) {
 }
 
 func fromFFI(ptr: UnsafeRawPointer, size: Int32) -> String {
-    let typed: UnsafePointer<UInt8> = ptr.bindMemory(to: UInt8.self, capacity: Int(size))
+    let typed: UnsafeMutablePointer<Int8> = UnsafeMutablePointer(mutating: ptr.bindMemory(to: Int8.self, capacity: Int(size) + 1))
+    let term = typed + Int(size)
+    term.pointee = 0
+
     let val = String(cString: typed)
 
     return val
-}
+}

rwasm/testdata/swift-log/Sources/swift-log/main.swift

@@ -1,4 +1,5 @@
 import Suborbital
+import Foundation
 
 class SwiftEcho: Suborbital.Runnable {
     func run(input: String) -> String {

rwasm/wasm_test.go

@@ -68,6 +68,20 @@ func TestWasmRunnerWithFetchSwift(t *testing.T) {
 	}
 }
 
+func TestWasmRunnerEchoSwift(t *testing.T) {
+	job := rt.NewJob("hello-swift", "Connor")
+
+	res, err := sharedRT.Do(job).Then()
+	if err != nil {
+		t.Error(errors.Wrap(err, "failed to Then"))
+		return
+	}
+
+	if string(res.([]byte)) != "hello Connor" {
+		t.Error(fmt.Errorf("hello Connor, got %s", string(res.([]byte))))
+	}
+}
+
 func TestWasmRunnerWithRequest(t *testing.T) {
 	r := rt.New()