kmwebnet/OpenSK
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add comment about AtomicUsize.

Browse Source
This commit is contained in:
Guillaume Endignoux
2020-03-03 19:32:25 +01:00
parent 9f6207f5a5
commit 7703ddb44c
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
patches/libtock-rs/07-debug_allocations.patch
View File

@@ -11,10 +11,10 @@ index 386a9ed..af3c5db 100644
[dev-dependencies] [dev-dependencies]
corepack = { version = "0.4.0", default-features = false, features = ["alloc"] } corepack = { version = "0.4.0", default-features = false, features = ["alloc"] }
diff --git a/src/entry_point.rs b/src/entry_point.rs diff --git a/src/entry_point.rs b/src/entry_point.rs
index 2fe5c40..c978ee5 100644 index 2fe5c40..545d163 100644
--- a/src/entry_point.rs --- a/src/entry_point.rs
+++ b/src/entry_point.rs +++ b/src/entry_point.rs
@@ -368,22 +368,77 @@ pub unsafe extern "C" fn rust_start(app_start: usize, stacktop: usize, app_heap_ @@ -368,22 +368,82 @@ pub unsafe extern "C" fn rust_start(app_start: usize, stacktop: usize, app_heap_
} }
} }
@@ -33,6 +33,11 @@ index 2fe5c40..c978ee5 100644
static mut HEAP: Heap = Heap::empty(); static mut HEAP: Heap = Heap::empty();
-struct TockAllocator; -struct TockAllocator;
+// With the "debug_allocations" feature, we use `AtomicUsize` to store the
+// statistics because:
+// - it is `Sync`, so we can use it in a static object (the allocator),
+// - it implements interior mutability, so we can use it in the allocator
+// methods (that take an immutable `&self` reference).
+struct TockAllocator { +struct TockAllocator {
+ #[cfg(feature = "debug_allocations")] + #[cfg(feature = "debug_allocations")]
+ count: AtomicUsize, + count: AtomicUsize,