Skip to content

Commit 69cd36b

Browse files
authored
Merge pull request #4905 from mysterywolf/rb
[ringbuffer] rt_ringbuffer_data_len采用局部变量承接,防止出现资源竞争
2 parents 37a58b5 + 619fa4d commit 69cd36b

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

components/drivers/src/ringbuffer.c

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -335,11 +335,15 @@ rt_size_t rt_ringbuffer_data_len(struct rt_ringbuffer *rb)
335335
return rb->buffer_size;
336336
case RT_RINGBUFFER_HALFFULL:
337337
default:
338-
if (rb->write_index > rb->read_index)
339-
return rb->write_index - rb->read_index;
338+
{
339+
rt_size_t wi = rb->write_index, ri = rb->read_index;
340+
341+
if (wi > ri)
342+
return wi - ri;
340343
else
341-
return rb->buffer_size - (rb->read_index - rb->write_index);
342-
};
344+
return rb->buffer_size - (ri - wi);
345+
}
346+
}
343347
}
344348
RTM_EXPORT(rt_ringbuffer_data_len);
345349

0 commit comments

Comments
 (0)