diff options
author | Aidan MacDonald <amachronic@protonmail.com> | 2022-04-03 10:48:14 +0100 |
---|---|---|
committer | Aidan MacDonald <amachronic@protonmail.com> | 2022-09-19 15:09:51 -0400 |
commit | f47aa584a8b447d8225fc5b09afb2d1fe6764c1d (patch) | |
tree | 8d767aa62d2415e555f49b3217f876afed39c310 /firmware/include | |
parent | ecfec3e9bf9178299cb0fe64bd530a81e10b1142 (diff) | |
download | rockbox-f47aa584a8b447d8225fc5b09afb2d1fe6764c1d.tar.gz rockbox-f47aa584a8b447d8225fc5b09afb2d1fe6764c1d.zip |
buflib: add pin/unpin operation
An allocation is pinned by calling buflib_pin() to up its pin count.
The pin count is like a reference count: when above 0, buflib won't
move the allocation and won't call its move callbacks. This makes it
safe to hold the pointer returned by buflib_get_data() across yields
or allocations.
Note that pinned allocations can still shrink because there are some
use cases where this would be valid, if buffer users coordinate with
the shrink callback.
Change-Id: I0d0c2a8ac7d891d3ad6b3d0eb80c5b5a1b4b9a9d
Diffstat (limited to 'firmware/include')
-rw-r--r-- | firmware/include/buflib.h | 20 | ||||
-rw-r--r-- | firmware/include/core_alloc.h | 3 |
2 files changed, 23 insertions, 0 deletions
diff --git a/firmware/include/buflib.h b/firmware/include/buflib.h index 45446c3b86..d2231ab79d 100644 --- a/firmware/include/buflib.h +++ b/firmware/include/buflib.h | |||
@@ -38,6 +38,7 @@ union buflib_data | |||
38 | intptr_t val; /* length of the block in n*sizeof(union buflib_data). | 38 | intptr_t val; /* length of the block in n*sizeof(union buflib_data). |
39 | Includes buflib metadata overhead. A negative value | 39 | Includes buflib metadata overhead. A negative value |
40 | indicates block is unallocated */ | 40 | indicates block is unallocated */ |
41 | volatile unsigned pincount; /* number of pins */ | ||
41 | struct buflib_callbacks* ops; /* callback functions for move and shrink. Can be NULL */ | 42 | struct buflib_callbacks* ops; /* callback functions for move and shrink. Can be NULL */ |
42 | char* alloc; /* start of allocated memory area */ | 43 | char* alloc; /* start of allocated memory area */ |
43 | union buflib_data *handle; /* pointer to entry in the handle table. | 44 | union buflib_data *handle; /* pointer to entry in the handle table. |
@@ -292,6 +293,25 @@ static inline void* buflib_get_data(struct buflib_context *ctx, int handle) | |||
292 | bool buflib_shrink(struct buflib_context *ctx, int handle, void* newstart, size_t new_size); | 293 | bool buflib_shrink(struct buflib_context *ctx, int handle, void* newstart, size_t new_size); |
293 | 294 | ||
294 | /** | 295 | /** |
296 | * Increment the pin count for a handle. When pinned the handle will not | ||
297 | * be moved and move callbacks will not be triggered, allowing a pointer | ||
298 | * to the buffer to be kept across yields or used for I/O. | ||
299 | * | ||
300 | * Note that shrink callbacks can still be invoked for pinned handles. | ||
301 | */ | ||
302 | void buflib_pin(struct buflib_context *ctx, int handle); | ||
303 | |||
304 | /** | ||
305 | * Decrement the pin count for a handle. | ||
306 | */ | ||
307 | void buflib_unpin(struct buflib_context *ctx, int handle); | ||
308 | |||
309 | /** | ||
310 | * Get the current pin count of a handle. Zero means the handle is not pinned. | ||
311 | */ | ||
312 | unsigned buflib_pin_count(struct buflib_context *ctx, int handle); | ||
313 | |||
314 | /** | ||
295 | * Frees memory associated with the given handle | 315 | * Frees memory associated with the given handle |
296 | * | 316 | * |
297 | * Returns: 0 (to invalidate handles in one line, 0 is not a valid handle) | 317 | * Returns: 0 (to invalidate handles in one line, 0 is not a valid handle) |
diff --git a/firmware/include/core_alloc.h b/firmware/include/core_alloc.h index f535fc1f6e..87246bcbd6 100644 --- a/firmware/include/core_alloc.h +++ b/firmware/include/core_alloc.h | |||
@@ -14,6 +14,9 @@ int core_alloc(const char* name, size_t size); | |||
14 | int core_alloc_ex(const char* name, size_t size, struct buflib_callbacks *ops); | 14 | int core_alloc_ex(const char* name, size_t size, struct buflib_callbacks *ops); |
15 | int core_alloc_maximum(const char* name, size_t *size, struct buflib_callbacks *ops); | 15 | int core_alloc_maximum(const char* name, size_t *size, struct buflib_callbacks *ops); |
16 | bool core_shrink(int handle, void* new_start, size_t new_size); | 16 | bool core_shrink(int handle, void* new_start, size_t new_size); |
17 | void core_pin(int handle); | ||
18 | void core_unpin(int handle); | ||
19 | unsigned core_pin_count(int handle); | ||
17 | int core_free(int handle); | 20 | int core_free(int handle); |
18 | size_t core_available(void); | 21 | size_t core_available(void); |
19 | size_t core_allocatable(void); | 22 | size_t core_allocatable(void); |