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

aqhome apps: more work on transition to events2.

Browse Source
This commit is contained in:
Martin Preuss
2025-03-09 00:06:12 +01:00
parent ca2103f7b3
commit ea564ba101
32 changed files with 475 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
aqhome/events2/fdobject.c
View File

@@ -169,7 +169,7 @@ int AQH_FdObject_Read(AQH_OBJECT *o, uint8_t *ptrBuffer, uint32_t lenBuffer)
}
else if (rv>0) {
/* data received */
DBG_INFO(AQH_LOGDOMAIN, "Received %d bytes", (int) rv);
DBG_DEBUG(AQH_LOGDOMAIN, "Received %d bytes", (int) rv);
return (int) rv;
}
else {

9
aqhome/ipc2/endpoint.c
View File

@@ -390,6 +390,7 @@ AQH_MESSAGE *AQH_Endpoint_GetNextMsgOut(AQH_OBJECT *o)
void AQH_Endpoint_AddMsgOut(AQH_OBJECT *o, AQH_MESSAGE *msg)
{
assert(o);
if (o && msg) {
AQH_ENDPOINT *xo;
@@ -456,7 +457,7 @@ void AQH_Endpoint_AddMsgIn(AQH_OBJECT *o, AQH_MESSAGE *msg)
xo=GWEN_INHERIT_GETDATA(AQH_OBJECT, AQH_ENDPOINT, o);
if (xo) {
AQH_Message_List_Add(msg, xo->msgInList);
DBG_INFO(AQH_LOGDOMAIN, "now %d msgs in list", AQH_Message_List_GetCount(xo->msgInList));
DBG_DEBUG(AQH_LOGDOMAIN, "now %d msgs in list", AQH_Message_List_GetCount(xo->msgInList));
}
}
}
@@ -510,7 +511,7 @@ int _handleMsgRecvd(AQH_OBJECT *o, int msgLen, const uint8_t *msgPtr)
{
AQH_MESSAGE *msg;
DBG_INFO(AQH_LOGDOMAIN, "Msg received:");
DBG_DEBUG(AQH_LOGDOMAIN, "Msg received:");
/*GWEN_Text_LogString((const char*) msgPtr, msgLen, AQH_LOGDOMAIN, GWEN_LoggerLevel_Error);*/
msg=AQH_NodeMessage_fromBuffer(msgPtr, msgLen);
AQH_Endpoint_AddMsgIn(o, msg);
@@ -522,7 +523,7 @@ int _handleMsgRecvd(AQH_OBJECT *o, int msgLen, const uint8_t *msgPtr)
int _handleMsgSent(AQH_OBJECT *o)
{
DBG_INFO(AQH_LOGDOMAIN, "Msg sent");
DBG_DEBUG(AQH_LOGDOMAIN, "Msg sent");
if (o) {
AQH_ENDPOINT *xo;
@@ -540,7 +541,7 @@ int _handleMsgSent(AQH_OBJECT *o)
/* get next message in list */
msg=AQH_Message_List_First(xo->msgOutList);
if (msg) {
DBG_INFO(AQH_LOGDOMAIN, "Sending next message");
DBG_DEBUG(AQH_LOGDOMAIN, "Sending next message");
AQH_MsgWriter_SendMsg(xo->msgWriter, AQH_Message_GetMsgPointer(msg), AQH_Message_GetUsedSize(msg));
}
else {

6
aqhome/ipc2/ipcmsgreader.c
View File

@@ -64,7 +64,7 @@ int _readMsg(AQH_OBJECT *o)
int rv;
if (xo->bytesReceived<AQH_MSG_READER_HEADER_SIZE) {
DBG_INFO(AQH_LOGDOMAIN, "Reading header");
DBG_DEBUG(AQH_LOGDOMAIN, "Reading header");
rv=_readHeaderFromRingbuffer(xo);
if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "here (%d)", rv);
@@ -73,7 +73,7 @@ int _readMsg(AQH_OBJECT *o)
}
if (xo->bytesReceived>=AQH_MSG_READER_HEADER_SIZE) {
DBG_INFO(AQH_LOGDOMAIN, "Reading body");
DBG_DEBUG(AQH_LOGDOMAIN, "Reading body");
/* reading remainder of msg directly into allocated buffer */
rv=AQH_MsgReader_ReadRemainderFromRingbuffer(o);
if (rv<0) {
@@ -122,7 +122,7 @@ int _readHeaderFromRingbuffer(AQH_MSG_READER *xo)
xferSize=remaining;
rv=GWEN_RingBuffer_ReadBytes(xo->ringBuffer, (char*) (xo->headerBuffer+xo->bytesReceived), &xferSize);
if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "Ringbuffer empty");
DBG_DEBUG(AQH_LOGDOMAIN, "Ringbuffer empty");
return 0;
}
if (xferSize<remaining) {

16
aqhome/ipc2/msgreader.c
View File

@@ -110,7 +110,6 @@ void AQH_MsgReader_SetFlags(AQH_OBJECT *o, uint32_t f)
xo=GWEN_INHERIT_GETDATA(AQH_OBJECT, AQH_MSG_READER, o);
if (xo) {
DBG_ERROR(AQH_LOGDOMAIN, "Set flags: %08x", f);
xo->flags=f;
}
}
@@ -123,7 +122,6 @@ void AQH_MsgReader_AddFlags(AQH_OBJECT *o, uint32_t f)
xo=GWEN_INHERIT_GETDATA(AQH_OBJECT, AQH_MSG_READER, o);
if (xo) {
DBG_ERROR(AQH_LOGDOMAIN, "Adding flags: %08x", f);
xo->flags|=f;
}
}
@@ -136,7 +134,6 @@ void AQH_MsgReader_SubFlags(AQH_OBJECT *o, uint32_t f)
xo=GWEN_INHERIT_GETDATA(AQH_OBJECT, AQH_MSG_READER, o);
if (xo) {
DBG_ERROR(AQH_LOGDOMAIN, "Clearing flags: %08x", f);
xo->flags&=~f;
}
}
@@ -207,7 +204,7 @@ int _handleSocketReady(AQH_OBJECT *o, AQH_OBJECT *fdObject)
{
AQH_MSG_READER *xo;
DBG_INFO(AQH_LOGDOMAIN, "Socket ready");
DBG_DEBUG(AQH_LOGDOMAIN, "Socket ready");
xo=GWEN_INHERIT_GETDATA(AQH_OBJECT, AQH_MSG_READER, o);
if (xo) {
int rv;
@@ -314,7 +311,7 @@ int _fillRingbuffer(AQH_OBJECT *o, AQH_MSG_READER *xo, AQH_OBJECT *fdObject)
rv=AQH_FdObject_Read(fdObject, (uint8_t*) GWEN_RingBuffer_GetWritePointer(xo->ringBuffer), len);
if (rv<0) {
if (rv!=GWEN_ERROR_TRY_AGAIN) {
DBG_ERROR(AQH_LOGDOMAIN, "here (%d)", rv);
DBG_INFO(AQH_LOGDOMAIN, "here (%d)", rv);
}
return rv;
}
@@ -330,8 +327,7 @@ int _fillRingbuffer(AQH_OBJECT *o, AQH_MSG_READER *xo, AQH_OBJECT *fdObject)
}
}
else {
DBG_INFO(AQH_LOGDOMAIN, "Ringbuffer full");
/*return GWEN_ERROR_BUFFER_OVERFLOW;*/
DBG_DEBUG(AQH_LOGDOMAIN, "Ringbuffer full");
return 0;
}
}
@@ -347,7 +343,7 @@ int AQH_MsgReader_ReadRemainderFromRingbuffer(AQH_OBJECT *o)
if (xo) {
if (xo->bytesLeft==0) {
/* msg finished */
DBG_INFO(AQH_LOGDOMAIN, "Message complete");
DBG_DEBUG(AQH_LOGDOMAIN, "Message complete");
return 1;
}
else {
@@ -367,7 +363,7 @@ int AQH_MsgReader_ReadRemainderFromRingbuffer(AQH_OBJECT *o)
xferSize=bytesToRead;
rv=GWEN_RingBuffer_ReadBytes(xo->ringBuffer, (char*) (xo->currentMsgBuf+xo->bytesReceived), &xferSize);
if (rv<0) {
DBG_INFO(AQH_LOGDOMAIN, "Ringbuffer empty");
DBG_DEBUG(AQH_LOGDOMAIN, "Ringbuffer empty");
return 0;
}
if (xferSize<bytesToRead) {
@@ -378,7 +374,7 @@ int AQH_MsgReader_ReadRemainderFromRingbuffer(AQH_OBJECT *o)
xo->bytesLeft-=xferSize;
if (xo->bytesLeft==0) {
/* msg finished */
DBG_INFO(AQH_LOGDOMAIN, "Message complete");
DBG_DEBUG(AQH_LOGDOMAIN, "Message complete");
return 1;
}
}

2
aqhome/ipc2/msgwriter.c
View File

@@ -129,7 +129,7 @@ int _handleSocketReady(AQH_OBJECT *o, AQH_OBJECT *fdObject)
{
AQH_MSG_WRITER *xo;
DBG_INFO(AQH_LOGDOMAIN, "Socket ready");
DBG_DEBUG(AQH_LOGDOMAIN, "Socket ready");
xo=GWEN_INHERIT_GETDATA(AQH_OBJECT, AQH_MSG_WRITER, o);
if (xo) {
int rv;