subsys/net/lib: update to new ring_buffer api

Move to new ring_buffer api.

Signed-off-by: Måns Ansgariusson <[email protected]>

Author: Mattemagikern

subsys/net/lib/lwm2m/Kconfig

@@ -227,7 +227,6 @@ config LWM2M_RD_CLIENT_MAX_RETRIES
 config LWM2M_RESOURCE_DATA_CACHE_SUPPORT
 	bool "Resource Time series data cache support"
 	depends on (LWM2M_RW_SENML_JSON_SUPPORT || LWM2M_RW_SENML_CBOR_SUPPORT)
-	depends on RING_BUFFER
 	help
 	  Enable time series data storage.
 	  Requires time() to provide current Unix timestamp.

subsys/net/lib/lwm2m/lwm2m_message_handling.c

@@ -1404,7 +1404,7 @@ static int lwm2m_read_cached_data(struct lwm2m_message *msg,
 		read_info = &msg->cache_info->read_info[msg->cache_info->entry_size];
 		/* Store original timeseries ring buffer get states for failure handling */
 		read_info->cache_data = cached_data;
-		read_info->original_rb_get = cached_data->rb.get;
+		read_info->original_rb_get = cached_data->rb.read_ptr;
 		msg->cache_info->entry_size++;
 		if (msg->cache_info->entry_limit) {
 			length = MIN(length, msg->cache_info->entry_limit);
@@ -3523,7 +3523,7 @@ static bool init_next_pending_timeseries_data(struct lwm2m_cache_read_info *cach
 
 	/* Check do we have still pending data to send */
 	for (int i = 0; i < cache_temp->entry_size; i++) {
-		if (ring_buf_is_empty(&cache_temp->read_info[i].cache_data->rb)) {
+		if (ring_buffer_empty(&cache_temp->read_info[i].cache_data->rb)) {
 			/* Skip Empty cached buffers */
 			continue;
 		}
@@ -3534,7 +3534,7 @@ static bool init_next_pending_timeseries_data(struct lwm2m_cache_read_info *cach
 			return false;
 		}
 
-		bytes_available += ring_buf_size_get(&cache_temp->read_info[i].cache_data->rb);
+		bytes_available += ring_buffer_size(&cache_temp->read_info[i].cache_data->rb);
 	}
 
 	if (bytes_available == 0) {

subsys/net/lib/lwm2m/lwm2m_registry.c

@@ -1618,7 +1618,7 @@ int lwm2m_enable_cache(const struct lwm2m_obj_path *path, struct lwm2m_time_seri
 		return -ENODATA;
 	}
 
-	ring_buf_init(&cache_entry->rb, cache_entry_size * cache_len, (uint8_t *)data_cache);
+	ring_buffer_init(&cache_entry->rb, (uint8_t *)data_cache, cache_entry_size * cache_len);
 
 	return 0;
 #else
@@ -1651,27 +1651,29 @@ bool lwm2m_cache_write(struct lwm2m_time_series_resource *cache_entry,
 	uint8_t *buf_ptr;
 	uint32_t element_size = sizeof(struct lwm2m_time_series_elem);
 
-	if (ring_buf_space_get(&cache_entry->rb) < element_size) {
+	if (ring_buffer_space(&cache_entry->rb) < element_size) {
 		/* No space  */
 		if (IS_ENABLED(CONFIG_LWM2M_CACHE_DROP_LATEST)) {
 			return false;
 		}
 		/* Free entry */
-		length = ring_buf_get_claim(&cache_entry->rb, &buf_ptr, element_size);
-		ring_buf_get_finish(&cache_entry->rb, length);
+		if (ring_buffer_size(&cache_entry->rb) < element_size) {
+			LOG_ERR("Cache entry too small %u", ring_buffer_size(&cache_entry->rb));
+			return false;
+		}
+		ring_buffer_consume(&cache_entry->rb, element_size);
 	}
 
-	length = ring_buf_put_claim(&cache_entry->rb, &buf_ptr, element_size);
+	length = ring_buffer_write_ptr(&cache_entry->rb, &buf_ptr, element_size);
 
-	if (length != element_size) {
-		ring_buf_put_finish(&cache_entry->rb, 0);
+	if (length < element_size) {
 		LOG_ERR("Allocation failed %u", length);
 		return false;
 	}
 
-	ring_buf_put_finish(&cache_entry->rb, length);
 	/* Store data */
 	memcpy(buf_ptr, buf, element_size);
+	ring_buffer_commit(&cache_entry->rb, length);
 	return true;
 #else
 	return NULL;
@@ -1686,21 +1688,19 @@ bool lwm2m_cache_read(struct lwm2m_time_series_resource *cache_entry,
 	uint8_t *buf_ptr;
 	uint32_t element_size = sizeof(struct lwm2m_time_series_elem);
 
-	if (ring_buf_is_empty(&cache_entry->rb)) {
+	if (ring_buffer_empty(&cache_entry->rb)) {
 		return false;
 	}
 
-	length = ring_buf_get_claim(&cache_entry->rb, &buf_ptr, element_size);
-
-	if (length != element_size) {
+	length = ring_buffer_read_ptr(&cache_entry->rb, &buf_ptr);
+	if (length < element_size) {
 		LOG_ERR("Cache read fail %u", length);
-		ring_buf_get_finish(&cache_entry->rb, 0);
 		return false;
 	}
 
 	/* Read Data */
 	memcpy(buf, buf_ptr, element_size);
-	ring_buf_get_finish(&cache_entry->rb, length);
+	ring_buffer_consume(&cache_entry->rb, element_size);
 	return true;
 
 #else
@@ -1713,11 +1713,11 @@ size_t lwm2m_cache_size(const struct lwm2m_time_series_resource *cache_entry)
 #if defined(CONFIG_LWM2M_RESOURCE_DATA_CACHE_SUPPORT)
 	uint32_t bytes_available;
 
-	if (ring_buf_is_empty(&cache_entry->rb)) {
+	if (ring_buffer_empty(&cache_entry->rb)) {
 		return 0;
 	}
 
-	bytes_available = ring_buf_size_get(&cache_entry->rb);
+	bytes_available = ring_buffer_size(&cache_entry->rb);
 
 	return (bytes_available / sizeof(struct lwm2m_time_series_elem));
 #else

subsys/net/lib/lwm2m/lwm2m_registry.h

@@ -210,7 +210,7 @@ struct lwm2m_time_series_resource {
 	/* Resource Path url */
 	struct lwm2m_obj_path path;
 	/* Ring buffer */
-	struct ring_buf rb;
+	struct ring_buffer rb;
 };
 
 #if defined(CONFIG_LWM2M_RESOURCE_DATA_CACHE_SUPPORT)
@@ -219,7 +219,7 @@ struct lwm2m_time_series_resource {
 
 struct lwm2m_cache_read_entry {
 	struct lwm2m_time_series_resource *cache_data;
-	struct ring_buf_index original_rb_get;
+	ring_buffer_index_t original_rb_get;
 };
 
 struct lwm2m_cache_read_info {

subsys/net/lib/sockets/socketpair.c

@@ -47,7 +47,7 @@ __net_socket struct spair {
 	int remote; /**< the remote endpoint file descriptor */
 	uint32_t flags; /**< status and option bits */
 	struct k_sem sem; /**< semaphore for exclusive structure access */
-	struct ring_buf recv_q;
+	struct ring_buffer recv_q;
 	/** indicates local @a recv_q isn't empty */
 	struct k_poll_signal readable;
 	/** indicates local @a recv_q isn't full */
@@ -106,7 +106,7 @@ static inline size_t spair_write_avail(struct spair *spair)
 		return 0;
 	}
 
-	return ring_buf_space_get(&remote->recv_q);
+	return ring_buffer_space(&remote->recv_q);
 }
 
 /**
@@ -117,7 +117,7 @@ static inline size_t spair_write_avail(struct spair *spair)
  */
 static inline size_t spair_read_avail(struct spair *spair)
 {
-	return ring_buf_size_get(&spair->recv_q);
+	return ring_buffer_size(&spair->recv_q);
 }
 
 /** Swap two 32-bit integers */
@@ -250,7 +250,7 @@ static struct spair *spair_new(void)
 	spair->flags = SPAIR_FLAGS_DEFAULT;
 
 	k_sem_init(&spair->sem, 1, 1);
-	ring_buf_init(&spair->recv_q, sizeof(spair->buf), spair->buf);
+	ring_buffer_init(&spair->recv_q, spair->buf, sizeof(spair->buf));
 	k_poll_signal_init(&spair->readable);
 	k_poll_signal_init(&spair->writeable);
 
@@ -550,7 +550,7 @@ static ssize_t spair_write(void *obj, const void *buffer, size_t count)
 		}
 	}
 
-	bytes_written = ring_buf_put(&remote->recv_q, (void *)buffer, count);
+	bytes_written = ring_buffer_write(&remote->recv_q, (void *)buffer, count);
 	if (spair_write_avail(spair) == 0) {
 		k_poll_signal_reset(&remote->writeable);
 	}
@@ -721,7 +721,7 @@ static ssize_t spair_read(void *obj, void *buffer, size_t count)
 		}
 	}
 
-	bytes_read = ring_buf_get(&spair->recv_q, (void *)buffer, count);
+	bytes_read = ring_buffer_read(&spair->recv_q, (void *)buffer, count);
 	if (spair_read_avail(spair) == 0 && !sock_is_eof(spair)) {
 		k_poll_signal_reset(&spair->readable);
 	}