Skip to content

Commit ac26937

Browse files
authored
Impl some traits for ModuleMemoryStat (#159)
1 parent 515fa65 commit ac26937

File tree

6 files changed

+22
-19
lines changed

6 files changed

+22
-19
lines changed

Cargo.lock

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

fluence-app-service/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
[package]
22
name = "fluence-app-service"
33
description = "Fluence Application Service"
4-
version = "0.17.1"
4+
version = "0.17.2"
55
authors = ["Fluence Labs"]
66
license = "Apache-2.0"
77
edition = "2018"
88

99
[dependencies]
10-
fluence-faas = { path = "../fluence-faas", version = "0.16.1" }
10+
fluence-faas = { path = "../fluence-faas", version = "0.16.2" }
1111
marine-min-it-version = { path = "../crates/min-it-version", version = "0.1.0" }
1212

1313
maplit = "1.0.2"

fluence-faas/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
[package]
22
name = "fluence-faas"
33
description = "Fluence FaaS"
4-
version = "0.16.1"
4+
version = "0.16.2"
55
authors = ["Fluence Labs"]
66
license = "Apache-2.0"
77
edition = "2018"
88

99
[dependencies]
10-
marine-runtime = { path = "../runtime", version = "0.14.1" }
11-
marine-module-interface = { path = "../crates/module-interface", version = "0.4.0" }
10+
marine-runtime = { path = "../runtime", version = "0.14.2" }
11+
marine-module-interface = { path = "../crates/module-interface", version = "0.4.1" }
1212
marine-utils = { path = "../crates/utils", version = "0.4.0" }
1313
marine-rs-sdk-main = { version = "0.6.15", features = ["logger"] }
1414
marine-rs-sdk = { version = "0.6.15", features = ["logger"] }
15-
it-json-serde = { path = "../crates/it-json-serde", version = "0.3.0" }
15+
it-json-serde = { path = "../crates/it-json-serde", version = "0.3.1" }
1616

1717
wasmer-runtime = { package = "wasmer-runtime-fl", version = "=0.17.1" }
1818
# dynamicfunc-fat-closures allows using state inside DynamicFunc

runtime/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "marine-runtime"
33
description = "Marine is the Fluence Compute Runtime"
4-
version = "0.14.1"
4+
version = "0.14.2"
55
authors = ["Fluence Labs"]
66
license = "Apache-2.0"
77
edition = "2018"
@@ -15,7 +15,7 @@ marine-module-info-parser = { path = "../crates/module-info-parser", version = "
1515
marine-it-interfaces = { path = "../crates/it-interfaces", version = "0.7.1" }
1616
marine-it-parser = { path = "../crates/it-parser", version = "0.9.1" }
1717
marine-it-generator = { path = "../crates/it-generator", version = "0.8.1" }
18-
marine-module-interface = { path = "../crates/module-interface", version = "0.4.0" }
18+
marine-module-interface = { path = "../crates/module-interface", version = "0.4.1" }
1919
marine-utils = { path = "../crates/utils", version = "0.4.0" }
2020
marine-min-it-version = { path = "../crates/min-it-version", version = "0.1.0"}
2121

runtime/src/memory_statistic.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,17 @@
1414
* limitations under the License.
1515
*/
1616

17+
use serde::Serialize;
18+
use serde::Deserialize;
19+
1720
use std::fmt;
1821
use std::ops::Deref;
1922

2023
/// Contains module name and a size of its linear memory in bytes.
2124
/// Please note that linear memory contains not only heap, but globals, shadow stack and so on.
2225
/// Although it doesn't contain operand stack, additional runtime (Wasmer) structures,
2326
/// and some other stuff, that should be count separately.
24-
#[derive(Debug)]
27+
#[derive(Clone, Default, Debug, Serialize, Deserialize)]
2528
pub struct ModuleMemoryStat<'module_name> {
2629
pub name: &'module_name str,
2730
pub memory_size: usize,

web-runtime/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ crate-type = ["cdylib"]
1111

1212
[dependencies]
1313
marine-it-interfaces = { path = "../crates/it-interfaces", version = "0.7.1" }
14-
marine-module-interface = { path = "../crates/module-interface", version = "0.4.0" }
14+
marine-module-interface = { path = "../crates/module-interface", version = "0.4.1" }
1515
marine-utils = { path = "../crates/utils", version = "0.4.0" }
1616
marine-min-it-version = { path = "../crates/min-it-version", version = "0.1.0"}
17-
it-json-serde = { path = "../crates/it-json-serde", version = "0.3.0" }
17+
it-json-serde = { path = "../crates/it-json-serde", version = "0.3.1" }
1818

1919
marine-rs-sdk = "0.6.15"
2020
wasmer-it = { package = "wasmer-interface-types-fl", version = "0.23.1" }

0 commit comments

Comments
 (0)