DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ustream: prevent recursive calls to the read callback

Browse source 
Simplifies stacked ustreams and calling poll from the read function.
Reuse an unused leftover struct member in order to not break ABI.

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2024-03-29 10:23:28 +01:00
parent 12bda4bdb1
commit eb9bcb6418
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ustream.c
View file

@ -24,6 +24,8 @@
#include "ustream.h" #include "ustream.h"
#define CB_PENDING_READ (1 << 0)
static void ustream_init_buf(struct ustream_buf *buf, int len) static void ustream_init_buf(struct ustream_buf *buf, int len)
{ {
if (!len) if (!len)
@ -133,7 +135,6 @@ void ustream_init_defaults(struct ustream *s)
s->state_change.cb = ustream_state_change_cb; s->state_change.cb = ustream_state_change_cb;
s->write_error = false; s->write_error = false;
s->eof = false; s->eof = false;
s->eof_write_done = false;
s->read_blocked = 0; s->read_blocked = 0;
s->r.buffers = 0; s->r.buffers = 0;
@ -301,7 +302,6 @@ char *ustream_reserve(struct ustream *s, int len, int *maxlen)
void ustream_fill_read(struct ustream *s, int len) void ustream_fill_read(struct ustream *s, int len)
{ {
struct ustream_buf *buf = s->r.data_tail; struct ustream_buf *buf = s->r.data_tail;
int n = len;
int maxlen; int maxlen;
s->r.data_bytes += len; s->r.data_bytes += len;
@ -321,8 +321,14 @@ void ustream_fill_read(struct ustream *s, int len)
buf = buf->next; buf = buf->next;
} while (len); } while (len);
if (s->notify_read) if (s->notify_read) {
s->notify_read(s, n); if (s->pending_cb & CB_PENDING_READ)
return;
s->pending_cb |= CB_PENDING_READ;
s->notify_read(s, s->r.data_bytes);
s->pending_cb &= ~CB_PENDING_READ;
}
} }
char *ustream_get_read_buf(struct ustream *s, int *buflen) char *ustream_get_read_buf(struct ustream *s, int *buflen)

3
ustream.h
View file

@ -114,7 +114,8 @@ struct ustream {
*/ */
bool string_data; bool string_data;
bool write_error; bool write_error;
bool eof, eof_write_done; bool eof;
uint8_t pending_cb;
enum read_blocked_reason read_blocked; enum read_blocked_reason read_blocked;
}; };