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

aqhome: moved code from msg/endpointmgr to /msgmanager.

Browse Source 
This simplified further development.
This commit is contained in:
Martin Preuss
2023-03-20 22:48:58 +01:00
parent fecf4ab79c
commit 8712958228
3 changed files with 69 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
aqhome/msgmanager.c
View File

@@ -13,14 +13,17 @@
#include "aqhome/msgmanager.h"
#include "aqhome/msg/endpointmgr.h"
#include "aqhome/msg/msg_node.h"
#include <gwenhywfar/misc.h>
#include <gwenhywfar/debug.h>
void _loopOnceOverIpcEndpoints(GWEN_MSG_ENDPOINT_MGR *emgr);
void _handleIpcEndpoint(GWEN_MSG_ENDPOINT_MGR *emgr, GWEN_MSG_ENDPOINT *ep);
static void _loopOnceOverEndpoints(GWEN_MSG_ENDPOINT_MGR *emgr);
static void _handleEndpoint(GWEN_MSG_ENDPOINT_MGR *emgr, GWEN_MSG_ENDPOINT *ep);
static void _handleNodeMsg(GWEN_MSG_ENDPOINT_MGR *emgr, GWEN_MSG_ENDPOINT *ep, const GWEN_MSG *msg);
static void _handleIpcMsg(GWEN_MSG_ENDPOINT_MGR *emgr, GWEN_MSG_ENDPOINT *ep, const GWEN_MSG *msg);
@@ -38,15 +41,14 @@ int AQH_MsgManager_LoopOnce(GWEN_MSG_ENDPOINT_MGR *emgr)
int rv;
rv=GWEN_MsgEndpointMgr_IoLoopOnce(emgr);
AQH_MsgEndpointMgr_LoopOnceOverNodeEndpoints(emgr, AQH_MSGMGR_ENDPOINTGROUP_NODE);
_loopOnceOverIpcEndpoints(emgr);
_loopOnceOverEndpoints(emgr);
GWEN_MsgEndpointMgr_RunAllEndpoints(emgr);
return rv;
}
void _loopOnceOverIpcEndpoints(GWEN_MSG_ENDPOINT_MGR *emgr)
void _loopOnceOverEndpoints(GWEN_MSG_ENDPOINT_MGR *emgr)
{
GWEN_MSG_ENDPOINT_LIST *endpointList;
@@ -57,25 +59,53 @@ void _loopOnceOverIpcEndpoints(GWEN_MSG_ENDPOINT_MGR *emgr)
ep=GWEN_MsgEndpoint_List_First(endpointList);
while(ep) {
DBG_DEBUG(AQH_LOGDOMAIN, "- endpoint(%s)", GWEN_MsgEndpoint_GetName(ep));
if (GWEN_MsgEndpoint_GetGroupId(ep)==AQH_MSGMGR_ENDPOINTGROUP_IPC)
_handleIpcEndpoint(emgr, ep);
_handleEndpoint(emgr, ep);
ep=GWEN_MsgEndpoint_List_Next(ep);
}
} /* while */
}
}
void _handleIpcEndpoint(GWEN_MSG_ENDPOINT_MGR *emgr, GWEN_MSG_ENDPOINT *ep)
void _handleEndpoint(GWEN_MSG_ENDPOINT_MGR *emgr, GWEN_MSG_ENDPOINT *ep)
{
GWEN_MSG *msg;
while( (msg=GWEN_MsgEndpoint_TakeFirstReceivedMessage(ep)) ) {
/* exec IPC message */
int groupId;
groupId=GWEN_Msg_GetGroupId(msg);
switch(groupId) {
case AQH_MSGMGR_ENDPOINTGROUP_NODE: _handleNodeMsg(emgr, ep, msg); break;
case AQH_MSGMGR_ENDPOINTGROUP_IPC: _handleIpcMsg(emgr, ep, msg); break;
default:
DBG_ERROR(AQH_LOGDOMAIN, "unhandled groupId %d (%02x), ignoring message", groupId, groupId);
break;
}
GWEN_Msg_free(msg);
}
}
void _handleNodeMsg(GWEN_MSG_ENDPOINT_MGR *emgr, GWEN_MSG_ENDPOINT *ep, const GWEN_MSG *msg)
{
DBG_INFO(AQH_LOGDOMAIN,
" - msg %d from %d to %d",
AQH_NodeMsg_GetMsgType(msg), AQH_NodeMsg_GetSourceAddress(msg), AQH_NodeMsg_GetDestAddress(msg));
AQH_MsgEndpointMgr_DistributeMsgFromNodeEndpoint(emgr, ep, msg, AQH_MSGMGR_ENDPOINTGROUP_NODE);
}
void _handleIpcMsg(GWEN_MSG_ENDPOINT_MGR *emgr, GWEN_MSG_ENDPOINT *ep, const GWEN_MSG *msg)
{
/* exec IPC message */
}