mirror of https://github.com/FOME-Tech/fome-fw.git
hellen81 util changes
This commit is contained in:
parent
5d69310c4c
commit
8f3f2f4a55
|
@ -62,7 +62,7 @@ void cyclic_buffer<T, maxSize>::add(T value) {
|
||||||
// become invalid. And yes I did see a crash due to an overrun here.
|
// become invalid. And yes I did see a crash due to an overrun here.
|
||||||
uint16_t idx = currentIndex;
|
uint16_t idx = currentIndex;
|
||||||
|
|
||||||
elements[idx] = value;
|
((T &)elements[idx]) = value;
|
||||||
|
|
||||||
if (++idx == size) {
|
if (++idx == size) {
|
||||||
idx = 0;
|
idx = 0;
|
||||||
|
|
|
@ -18,15 +18,20 @@
|
||||||
// todo: this is not a thread-safe version!
|
// todo: this is not a thread-safe version!
|
||||||
template<typename T, size_t maxSize = CB_MAX_SIZE>
|
template<typename T, size_t maxSize = CB_MAX_SIZE>
|
||||||
class fifo_buffer : public cyclic_buffer<T, maxSize> {
|
class fifo_buffer : public cyclic_buffer<T, maxSize> {
|
||||||
|
using cyclic_buffer<T, maxSize>::add;
|
||||||
|
using cyclic_buffer<T, maxSize>::getSize;
|
||||||
|
using cyclic_buffer<T, maxSize>::elements;
|
||||||
|
using cyclic_buffer<T, maxSize>::size, cyclic_buffer<T, maxSize>::count;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
fifo_buffer() : currentIndexRead(0) {
|
fifo_buffer() : currentIndexRead(0) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void put(T item);
|
virtual bool put(T item);
|
||||||
T get();
|
T get();
|
||||||
void clear() /*override*/;
|
void clear() /*override*/;
|
||||||
|
|
||||||
void put(const T *items, int numItems);
|
virtual bool put(const T *items, int numItems);
|
||||||
|
|
||||||
bool isEmpty() const {
|
bool isEmpty() const {
|
||||||
return getCount() == 0;
|
return getCount() == 0;
|
||||||
|
@ -36,28 +41,40 @@ public:
|
||||||
return getCount() >= getSize();
|
return getCount() >= getSize();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int getCount() const {
|
||||||
|
return cyclic_buffer<T, maxSize>::getCount();
|
||||||
|
}
|
||||||
|
|
||||||
|
const volatile T* getElements() const {
|
||||||
|
return elements;
|
||||||
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
volatile int currentIndexRead; // FIFO "tail"
|
volatile int currentIndexRead; // FIFO "tail"
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename T, size_t maxSize>
|
template<typename T, size_t maxSize>
|
||||||
void fifo_buffer<T, maxSize>::put(T item) {
|
bool fifo_buffer<T, maxSize>::put(T item) {
|
||||||
// check if full
|
// check if full
|
||||||
if (!isFull()) {
|
if (!isFull()) {
|
||||||
cyclic_buffer::add(item);
|
add(item);
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T, size_t maxSize>
|
template<typename T, size_t maxSize>
|
||||||
void fifo_buffer<T, maxSize>::put(const T *items, int numItems) {
|
bool fifo_buffer<T, maxSize>::put(const T *items, int numItems) {
|
||||||
for (int i = 0; i < numItems; i++) {
|
for (int i = 0; i < numItems; i++) {
|
||||||
put(items[i]);
|
if (!put(items[i]))
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T, size_t maxSize>
|
template<typename T, size_t maxSize>
|
||||||
T fifo_buffer<T, maxSize>::get() {
|
T fifo_buffer<T, maxSize>::get() {
|
||||||
auto ret = elements[currentIndexRead];
|
T &ret = (T &)elements[currentIndexRead];
|
||||||
if (!isEmpty()) {
|
if (!isEmpty()) {
|
||||||
currentIndexRead = (currentIndexRead + 1) % size;
|
currentIndexRead = (currentIndexRead + 1) % size;
|
||||||
count--;
|
count--;
|
||||||
|
@ -67,9 +84,60 @@ T fifo_buffer<T, maxSize>::get() {
|
||||||
|
|
||||||
template<typename T, size_t maxSize>
|
template<typename T, size_t maxSize>
|
||||||
void fifo_buffer<T, maxSize>::clear() {
|
void fifo_buffer<T, maxSize>::clear() {
|
||||||
cyclic_buffer::clear();
|
cyclic_buffer<T, maxSize>::clear();
|
||||||
currentIndexRead = 0;
|
currentIndexRead = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template<typename T, size_t maxSize = CB_MAX_SIZE>
|
||||||
|
class fifo_buffer_sync : public fifo_buffer<T, maxSize> {
|
||||||
|
public:
|
||||||
|
fifo_buffer_sync() {
|
||||||
|
osalThreadQueueObjectInit(&q_waiting);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool put(T item) override {
|
||||||
|
chSysLock();
|
||||||
|
if (fifo_buffer<T, maxSize>::isFull()) {
|
||||||
|
chSysUnlock();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
fifo_buffer<T, maxSize>::put(item);
|
||||||
|
osalThreadDequeueNextI(&q_waiting, MSG_OK);
|
||||||
|
chSysUnlock();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool put(const T *items, int numItems) override {
|
||||||
|
for (int i = 0; i < numItems; i++) {
|
||||||
|
if (!put(items[i]))
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool get(T &item, int timeout) {
|
||||||
|
chSysLock();
|
||||||
|
while (fifo_buffer<T, maxSize>::isEmpty()) {
|
||||||
|
msg_t msg = osalThreadEnqueueTimeoutS(&q_waiting, timeout);
|
||||||
|
if (msg != MSG_OK) {
|
||||||
|
chSysUnlock();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
item = fifo_buffer<T, maxSize>::get();
|
||||||
|
chSysUnlock();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void clear() {
|
||||||
|
chSysLock();
|
||||||
|
fifo_buffer<T, maxSize>::clear();
|
||||||
|
osalThreadDequeueAllI(&q_waiting, MSG_RESET);
|
||||||
|
chSysUnlock();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected:
|
||||||
|
threads_queue_t q_waiting;
|
||||||
|
};
|
||||||
|
|
||||||
#endif /* FIFO_BUFFER_H */
|
#endif /* FIFO_BUFFER_H */
|
Loading…
Reference in New Issue