Skip to content

Commit 619fa4d

Browse files
committed
[ringbuffer] 采用局部变量,防止出现资源竞争
1 parent d57caa7 commit 619fa4d

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
@@ -333,11 +333,15 @@ rt_size_t rt_ringbuffer_data_len(struct rt_ringbuffer *rb)
333333
return rb->buffer_size;
334334
case RT_RINGBUFFER_HALFFULL:
335335
default:
336-
if (rb->write_index > rb->read_index)
337-
return rb->write_index - rb->read_index;
336+
{
337+
rt_size_t wi = rb->write_index, ri = rb->read_index;
338+
339+
if (wi > ri)
340+
return wi - ri;
338341
else
339-
return rb->buffer_size - (rb->read_index - rb->write_index);
340-
};
342+
return rb->buffer_size - (ri - wi);
343+
}
344+
}
341345
}
342346
RTM_EXPORT(rt_ringbuffer_data_len);
343347

0 commit comments

Comments
 (0)