michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: lwm2m: encapsulate ring buffer internals

Browse source 
Use struct ring_buf_index as a whole, don't access its constituants.

Signed-off-by: Nicolas Pitre <npitre@baylibre.com>
This commit is contained in:
Nicolas Pitre 2025-03-10 11:50:02 -04:00 • committed by Benjamin Cabé
commit b5bc307019
2 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
subsys/net/lib/lwm2m/lwm2m_message_handling.c
View file

@ -1403,9 +1403,7 @@ static int lwm2m_read_cached_data(struct lwm2m_message *msg,
read_info = &msg->cache_info->read_info[msg->cache_info->entry_size]; read_info = &msg->cache_info->read_info[msg->cache_info->entry_size];
/* Store original timeseries ring buffer get states for failure handling */ /* Store original timeseries ring buffer get states for failure handling */
read_info->cache_data = cached_data; read_info->cache_data = cached_data;
read_info->original_get_base = cached_data->rb.get.base; read_info->original_rb_get = cached_data->rb.get;
read_info->original_get_head = cached_data->rb.get.head;
read_info->original_get_tail = cached_data->rb.get.tail;
msg->cache_info->entry_size++; msg->cache_info->entry_size++;
if (msg->cache_info->entry_limit) { if (msg->cache_info->entry_limit) {
length = MIN(length, msg->cache_info->entry_limit); length = MIN(length, msg->cache_info->entry_limit);
@ -3079,12 +3077,8 @@ static bool lwm2m_timeseries_data_rebuild(struct lwm2m_message *msg, int error_c
/* Put Ring buffer back to original */ /* Put Ring buffer back to original */
for (int i = 0; i < cache_temp->entry_size; i++) { for (int i = 0; i < cache_temp->entry_size; i++) {
cache_temp->read_info[i].cache_data->rb.get.head = cache_temp->read_info[i].cache_data->rb.get =
cache_temp->read_info[i].original_get_head; cache_temp->read_info[i].original_rb_get;
cache_temp->read_info[i].cache_data->rb.get.tail =
cache_temp->read_info[i].original_get_tail;
cache_temp->read_info[i].cache_data->rb.get.base =
cache_temp->read_info[i].original_get_base;
} }
if (cache_temp->entry_limit) { if (cache_temp->entry_limit) {

4
subsys/net/lib/lwm2m/lwm2m_registry.h
View file

@ -219,9 +219,7 @@ struct lwm2m_time_series_resource {
struct lwm2m_cache_read_entry { struct lwm2m_cache_read_entry {
struct lwm2m_time_series_resource *cache_data; struct lwm2m_time_series_resource *cache_data;
int32_t original_get_head; struct ring_buf_index original_rb_get;
int32_t original_get_tail;
int32_t original_get_base;
}; };
struct lwm2m_cache_read_info { struct lwm2m_cache_read_info {