fix

Signed-off-by: mathetake <[email protected]>

Author: mathetake

src/common/types.h

@@ -0,0 +1,40 @@
+// Copyright 2016-2019 Envoy Project Authors
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <memory>
+
+namespace proxy_wasm {
+namespace common {
+
+template <typename T, void (*deleter)(T *)>
+class CSmartPtr : public std::unique_ptr<T, void (*)(T *)> {
+public:
+  CSmartPtr() : std::unique_ptr<T, void (*)(T *)>(nullptr, deleter) {}
+  CSmartPtr(T *object) : std::unique_ptr<T, void (*)(T *)>(object, deleter) {}
+};
+
+template <typename T, void (*deleter)(T *)> class DeleterType {
+public:
+  ~DeleterType() { deleter(&item); }
+  T *get() { return &item; }
+
+private:
+  T item;
+};
+
+} // namespace common
+} // namespace proxy_wasm

src/wasmtime/types.h

@@ -0,0 +1,61 @@
+
+// Copyright 2016-2019 Envoy Project Authors
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "src/common/types.h"
+#include "wasmtime/include/wasm.h"
+#include "wasmtime/include/wasmtime.h"
+
+namespace proxy_wasm {
+namespace wasmtime {
+
+using WasmEnginePtr = common::CSmartPtr<wasm_engine_t, wasm_engine_delete>;
+using WasmFuncPtr = common::CSmartPtr<wasm_func_t, wasm_func_delete>;
+using WasmStorePtr = common::CSmartPtr<wasm_store_t, wasm_store_delete>;
+using WasmModulePtr = common::CSmartPtr<wasm_module_t, wasm_module_delete>;
+using WasmSharedModulePtr = common::CSmartPtr<wasm_shared_module_t, wasm_shared_module_delete>;
+using WasmMemoryPtr = common::CSmartPtr<wasm_memory_t, wasm_memory_delete>;
+using WasmTablePtr = common::CSmartPtr<wasm_table_t, wasm_table_delete>;
+using WasmInstancePtr = common::CSmartPtr<wasm_instance_t, wasm_instance_delete>;
+using WasmFunctypePtr = common::CSmartPtr<wasm_functype_t, wasm_functype_delete>;
+using WasmTrapPtr = common::CSmartPtr<wasm_trap_t, wasm_trap_delete>;
+using WasmExternPtr = common::CSmartPtr<wasm_extern_t, wasm_extern_delete>;
+
+using WasmByteVec = common::DeleterType<wasm_byte_vec_t, wasm_byte_vec_delete>;
+using WasmImporttypeVec = common::DeleterType<wasm_importtype_vec_t, wasm_importtype_vec_delete>;
+using WasmExportTypeVec = common::DeleterType<wasm_exporttype_vec_t, wasm_exporttype_vec_delete>;
+using WasmExternVec = common::DeleterType<wasm_extern_vec_t, wasm_extern_vec_delete>;
+using WasmValtypeVec = common::DeleterType<wasm_valtype_vec_t, wasm_valtype_vec_delete>;
+
+class WasmExternPtrVector {
+public:
+  ~WasmExternPtrVector() {
+    // TODO: come back later
+    for (auto it = vector.begin(); it < vector.end(); it++) {
+      //      wasm_extern_delete(*it);
+    }
+  }
+
+  wasm_extern_t **data() { return vector.data(); }
+  void push_back(wasm_extern_t *item) { vector.push_back(item); }
+  size_t size() { return vector.size(); }
+
+private:
+  std::vector<wasm_extern_t *> vector;
+};
+
+} // namespace wasmtime
+
+} // namespace proxy_wasm