martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aqhome: add and implement a flush function for fd/tty objects.

Browse Source
This commit is contained in:
Martin Preuss
2026-04-27 16:04:42 +02:00
parent 0ac20ba82c
commit 59c05d379c
4 changed files with 109 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
aqhome/events2/fdobject.c
View File

@@ -34,6 +34,7 @@ GWEN_INHERIT(AQH_OBJECT, AQH_FDOBJECT)
static void GWENHYWFAR_CB _freeData(void *bp, void *p);
static void _cbEnable(AQH_OBJECT *o);
static void _cbDisable(AQH_OBJECT *o);
static int _cbFlush(AQH_OBJECT *o);
@@ -53,6 +54,7 @@ AQH_OBJECT *AQH_FdObject_new(AQH_EVENT_LOOP *eventLoop, int fd, int mode)
GWEN_INHERIT_SETDATA(AQH_OBJECT, AQH_FDOBJECT, o, xo, _freeData);
xo->fd=fd;
xo->fdMode=mode;
xo->flushFn=_cbFlush;
AQH_Object_SetEnableFn(o, _cbEnable);
AQH_Object_SetDisableFn(o, _cbDisable);
@@ -110,6 +112,23 @@ AQH_FDOBJECT_ENDMSG_FN AQH_FdObject_SetEndMsgFn(AQH_OBJECT *o, AQH_FDOBJECT_ENDM
AQH_FDOBJECT_FLUSH_FN AQH_FdObject_SetFlushFn(AQH_OBJECT *o, AQH_FDOBJECT_FLUSH_FN f)
{
AQH_FDOBJECT *xo;
xo=GWEN_INHERIT_GETDATA(AQH_OBJECT, AQH_FDOBJECT, o);
if (xo) {
AQH_FDOBJECT_FLUSH_FN oldFn;
oldFn=xo->flushFn;
xo->flushFn=f;
return oldFn;
}
return NULL;
}
int AQH_FdObject_GetFdMode(const AQH_OBJECT *o)
{
if (o) {
@@ -205,40 +224,21 @@ int AQH_FdObject_FlushInput(AQH_OBJECT *o)
AQH_FDOBJECT *xo;
xo=GWEN_INHERIT_GETDATA(AQH_OBJECT, AQH_FDOBJECT, o);
if (xo) {
if (xo->fd!=-1) {
ssize_t rv;
ssize_t bytesRead=0;
uint8_t tbuf[16];
if (xo && xo->flushFn) {
int rv;
do {
rv=read(xo->fd, tbuf, sizeof(tbuf));
if (rv>0)
bytesRead+=rv;
} while(rv>=0);
if (rv==0) {
DBG_INFO(AQH_LOGDOMAIN, "EOF met");
return GWEN_ERROR_EOF;
rv=xo->flushFn(o);
if (rv<0) {
if (xo->fd!=-1) {
DBG_ERROR(AQH_LOGDOMAIN, "Error on flush, closing.");
close(xo->fd);
xo->fd=-1;
}
else if (rv<0) {
if (errno!=EINTR && errno!=EWOULDBLOCK && errno!=EAGAIN) {
DBG_ERROR(AQH_LOGDOMAIN, "Error on read: %s (%d)", strerror(errno), errno);
close(xo->fd);
xo->fd=-1;
return GWEN_ERROR_IO;
}
}
return (bytesRead>0)?1:0;
}
else {
DBG_ERROR(AQH_LOGDOMAIN, "Previous error, not reading.");
return GWEN_ERROR_IO;
}
return rv;
}
}
return GWEN_ERROR_INVALID;
return 0;
}
@@ -340,6 +340,48 @@ void _cbDisable(AQH_OBJECT *o)
int _cbFlush(AQH_OBJECT *o)
{
if (o) {
AQH_FDOBJECT *xo;
xo=GWEN_INHERIT_GETDATA(AQH_OBJECT, AQH_FDOBJECT, o);
if (xo) {
if (xo->fd!=-1) {
ssize_t rv;
ssize_t bytesRead=0;
uint8_t tbuf[16];
do {
rv=read(xo->fd, tbuf, sizeof(tbuf));
if (rv>0)
bytesRead+=rv;
} while(rv>=0);
if (rv==0) {
DBG_INFO(AQH_LOGDOMAIN, "EOF met");
return GWEN_ERROR_EOF;
}
else if (rv<0) {
if (errno!=EINTR && errno!=EWOULDBLOCK && errno!=EAGAIN) {
DBG_ERROR(AQH_LOGDOMAIN, "Error on read: %s (%d)", strerror(errno), errno);
return GWEN_ERROR_IO;
}
}
return (bytesRead>0)?1:0;
}
else {
DBG_ERROR(AQH_LOGDOMAIN, "Previous error, not reading.");
return GWEN_ERROR_IO;
}
}
}
return GWEN_ERROR_INVALID;
}