Migrate from wasmi to wasmer

.gitignore

@@ -1,4 +1,5 @@
 Cargo.lock
 composer.lock
-target/
-vendor/
+/target/
+/vendor/
+/extension/wasmer.hh

Cargo.toml

@@ -1,13 +1,16 @@
 [package]
 name = "php-ext-wasm"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Ivan Enderlin <ivan.enderlin@hoa-project.net>"]
+edition = "2018"
 
 [lib]
-crate-type = ["dylib", "staticlib"]
 
 [dependencies]
-wasmi = "^0.4.2"
+wasmer-runtime-c-api = { version = "^0.2.1" }
 
 [build-dependencies]
-cbindgen = "^0.6.0"
+walkdir = "2.2"
+
+[patch.crates-io]
+wasmer-runtime-c-api = { path = "/Users/hywan/Development/Wasmer/wasmer/lib/runtime-c-api/" }

build.rs

@@ -1,11 +1,54 @@
-extern crate cbindgen;
+extern crate walkdir;
 
-use std::env;
+use core::cmp::Ordering;
+use std::{env::var, fs::copy, path::PathBuf};
+use walkdir::{DirEntry, WalkDir};
+
+fn is_hidden(entry: &DirEntry) -> bool {
+    entry
+        .file_name()
+        .to_str()
+        .map(|string| string.starts_with("."))
+        .unwrap_or(false)
+}
+
+fn last_modified_first(a: &DirEntry, b: &DirEntry) -> Ordering {
+    if let Ok(a_system_time) = a.metadata().unwrap().modified() {
+        if let Ok(b_system_time) = b.metadata().unwrap().modified() {
+            a_system_time.cmp(&b_system_time)
+        } else {
+            Ordering::Greater
+        }
+    } else {
+        Ordering::Less
+    }
+}
 
 fn main() {
-    let crate_dir = env::var("CARGO_MANIFEST_DIR").unwrap();
+    let out_directory = var("OUT_DIR").expect("The `OUT_DIR` environment variable is not found.");
+    let mut build_directory = PathBuf::from(&out_directory);
+    assert!(build_directory.pop(), "`OUT_DIR` is invalid.");
+    assert!(build_directory.pop(), "`OUT_DIR` is invalid.");
+
+    let mut walker = WalkDir::new(&build_directory)
+        .sort_by(last_modified_first)
+        .into_iter()
+        .filter_entry(|entry| !is_hidden(entry))
+        .filter_map(|entry| entry.ok())
+        .filter(|entry| entry.metadata().is_ok())
+        .filter(|entry| entry.file_name().to_string_lossy() == "wasmer.hh");
+
+    if let Some(entry) = walker.next() {
+        let cargo_directory = var("CARGO_MANIFEST_DIR")
+            .expect("The `CARGO_MANIFEST_DIR` environment variable is not found.");
+        let mut header_destination = PathBuf::from(&cargo_directory);
+        header_destination.push("extension");
+        header_destination.push("wasmer");
+        header_destination.set_extension("hh");
 
-    cbindgen::generate(crate_dir)
-        .expect("Unable to generate C bindings.")
-        .write_to_file("headers/php-ext-wasm.h");
+        copy(entry.path(), header_destination)
+            .expect("Cannot copy the `wasmer.hh` C header file from `wasmer-runtime-c-api`.");
+    } else {
+        panic!("The `wasmer.hh` file is not found.");
+    }
 }

extension/config.m4

@@ -5,7 +5,7 @@ if test "$PHP_WASM" != "no"; then
   AC_DEFINE(HAVE_WASM, 1, [ Have wasm support ])
 
   PHP_SUBST(WASM_SHARED_LIBADD)
-  PHP_ADD_LIBRARY_WITH_PATH(php_ext_wasm, ., WASM_SHARED_LIBADD)
+  PHP_ADD_LIBRARY_WITH_PATH(wasmer_runtime_c_api, ., WASM_SHARED_LIBADD)
 
-  PHP_NEW_EXTENSION(wasm, wasm.c, $ext_shared)
+  PHP_NEW_EXTENSION(wasm, wasm.cc, $ext_shared)
 fi

extension/libwasmer_runtime_c_api.a

@@ -0,0 +1 @@
+../target/release/deps/libwasmer_runtime_c_api.a

extension/php_wasm.h

@@ -22,7 +22,7 @@
 extern zend_module_entry wasm_module_entry;
 # define phpext_wasm_ptr &wasm_module_entry
 
-# define PHP_WASM_VERSION "0.1.0"
+# define PHP_WASM_VERSION "0.2.0"
 
 # if defined(ZTS) && defined(COMPILE_DL_WASM)
 ZEND_TSRMLS_CACHE_EXTERN()