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

Decreased verbosity, fixed broker connection setup.

Browse Source
This commit is contained in:
Martin Preuss
2023-10-07 23:06:31 +02:00
parent d1f7a6b730
commit 077b367299
12 changed files with 57 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/aqhome-data/c_updatedata.c
View File

@@ -29,6 +29,7 @@
* ------------------------------------------------------------------------------------------------
*/
#define DISABLE_DEBUGLOG
@@ -109,7 +110,7 @@ int _storeDataPoints(AQHOME_DATA *aqh, const AQH_VALUE *v, const uint64_t *dataP
return AQH_MSG_IPC_ERROR_GENERIC;
}
else {
DBG_INFO(NULL, "Datapoint added for value \"%s\"", AQH_Value_GetNameForSystem(v));
DBG_DEBUG(NULL, "Datapoint added for value \"%s\"", AQH_Value_GetNameForSystem(v));
}
} /* for */

1
apps/aqhome-data/loop.c
View File

@@ -41,6 +41,7 @@
* ------------------------------------------------------------------------------------------------
*/
#define DISABLE_DEBUGLOG
/* ------------------------------------------------------------------------------------------------

6
apps/aqhome-data/main.c
View File

@@ -28,6 +28,8 @@
#endif
#define DISABLE_DEBUGLOG
//#define WRITE_INTERVAL_IN_SECS (5*60)
@@ -151,13 +153,13 @@ void _runService(AQHOME_DATA *aqh)
now=time(NULL);
if (((int)difftime(now, timeLastConnectionCleanup))>CONNCLEAN_INTERVAL_IN_SECS) {
DBG_INFO(NULL, "Cleanup connections");
DBG_DEBUG(NULL, "Cleanup connections");
GWEN_MsgEndpoint_RemoveUnconnectedAndEmptyChildren(AqHomeData_GetIpcdEndpoint(aqh));
timeLastConnectionCleanup=now;
}
if (((int)difftime(now, timeLastWrite))>WRITE_INTERVAL_IN_SECS) {
DBG_INFO(NULL, "Write time");
DBG_DEBUG(NULL, "Write time");
_writeCurrentState(aqh);
timeLastWrite=now;
}

31
apps/aqhome-tool/data/adddata.c
View File

@@ -33,7 +33,7 @@
static int _doAddData(GWEN_DB_NODE *dbArgs);
static void _sendCommand(GWEN_MSG_ENDPOINT *epTcp, const char *valueName, const char *valueUnits,
static void _sendCommand(GWEN_MSG_ENDPOINT *epTcp, const char *valueName, const char *valueUnits, const char *deviceName,
uint64_t timestampToSend, double dataToSend);
@@ -47,7 +47,7 @@ int AQH_Tool_AddDataPoint(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
GWEN_ArgsType_Char, /* type */
"tcpAddress", /* name */
"brokerAddress", /* name */
0, /* minnum */
1, /* maxnum */
"t", /* short option */
@@ -58,7 +58,7 @@ int AQH_Tool_AddDataPoint(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
GWEN_ArgsType_Int, /* type */
"tcpPort", /* name */
"brokerPort", /* name */
0, /* minnum */
1, /* maxnum */
"P", /* short option */
@@ -121,6 +121,17 @@ int AQH_Tool_AddDataPoint(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
I18S("Value to write"),
I18S("Value to write")
},
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
GWEN_ArgsType_Char, /* type */
"device", /* name */
1, /* minnum */
1, /* maxnum */
"d", /* short option */
"device", /* long option */
I18S("device name"),
I18S("device name")
},
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
GWEN_ArgsType_Char, /* type */
@@ -201,6 +212,7 @@ int _doAddData(GWEN_DB_NODE *dbArgs)
GWEN_MSG_ENDPOINT *epTcp;
int timeoutInSeconds;
const char *valueName;
const char *deviceName;
const char *valueUnits;
const char *valueTimestamp;
const char *valueData;
@@ -210,6 +222,7 @@ int _doAddData(GWEN_DB_NODE *dbArgs)
int rv;
timeoutInSeconds=GWEN_DB_GetIntValue(dbArgs, "timeout", 0, 5);
deviceName=GWEN_DB_GetCharValue(dbArgs, "device", 0, NULL);
valueName=GWEN_DB_GetCharValue(dbArgs, "valueName", 0, NULL);
valueUnits=GWEN_DB_GetCharValue(dbArgs, "valueUnits", 0, NULL);
valueTimestamp=GWEN_DB_GetCharValue(dbArgs, "timestamp", 0, NULL);
@@ -244,14 +257,13 @@ int _doAddData(GWEN_DB_NODE *dbArgs)
/*fprintf(stdout, "Sending AddData request\n");*/
epTcp=Utils_OpenBrokerConnection(dbArgs, 0, timeoutInSeconds);
epTcp=Utils_SetupBrokerClientEndpoint(dbArgs, 0);
if (epTcp==NULL) {
DBG_ERROR(NULL, "ERROR creating TCP connection");
return 2;
}
_sendCommand(epTcp, valueName, valueUnits, timestampToSend, dataToSend);
_sendCommand(epTcp, valueName, valueUnits, deviceName, timestampToSend, dataToSend);
for (;;) {
uint16_t code;
@@ -272,7 +284,7 @@ int _doAddData(GWEN_DB_NODE *dbArgs)
return 3;
}
else {
fprintf(stdout, "Data added.\n");
/*fprintf(stdout, "Data added.\n");*/
break;
}
}
@@ -289,7 +301,9 @@ int _doAddData(GWEN_DB_NODE *dbArgs)
void _sendCommand(GWEN_MSG_ENDPOINT *epTcp, const char *valueName, const char *valueUnits, uint64_t timestampToSend, double dataToSend)
void _sendCommand(GWEN_MSG_ENDPOINT *epTcp, const char *valueName, const char *valueUnits,
const char *deviceName,
uint64_t timestampToSend, double dataToSend)
{
GWEN_MSG *msgOut;
union {double f; uint64_t i;} u;
@@ -303,6 +317,7 @@ void _sendCommand(GWEN_MSG_ENDPOINT *epTcp, const char *valueName, const char *v
value=AQH_Value_new();
AQH_Value_SetName(value, valueName);
AQH_Value_SetValueUnits(value, valueUnits);
AQH_Value_SetDeviceName(value, deviceName);
msgOut=AQH_MultiDataDataIpcMsg_new(AQH_MSGTYPE_IPC_DATA_UPDATEDATA, value, arrayToSend, 1);
AQH_Value_free(value);

6
apps/aqhome-tool/data/getdatapoints.c
View File

@@ -50,7 +50,7 @@ int AQH_Tool_GetDataPoints(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
GWEN_ArgsType_Char, /* type */
"tcpAddress", /* name */
"brokerAddress", /* name */
0, /* minnum */
1, /* maxnum */
"t", /* short option */
@@ -61,7 +61,7 @@ int AQH_Tool_GetDataPoints(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
GWEN_ArgsType_Int, /* type */
"tcpPort", /* name */
"brokerPort", /* name */
0, /* minnum */
1, /* maxnum */
"P", /* short option */
@@ -224,7 +224,7 @@ int _doGetDataPoints(GWEN_DB_NODE *dbArgs)
return 2;
}
epTcp=Utils_OpenBrokerConnection(dbArgs, 0, timeoutInSeconds);
epTcp=Utils_SetupBrokerClientEndpoint(dbArgs, 0);
if (epTcp==NULL) {
DBG_ERROR(NULL, "ERROR creating TCP connection");
return 2;

10
apps/aqhome-tool/data/getdevices.c
View File

@@ -46,7 +46,7 @@ int AQH_Tool_GetDevices(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
GWEN_ArgsType_Char, /* type */
"tcpAddress", /* name */
"brokerAddress", /* name */
0, /* minnum */
1, /* maxnum */
"t", /* short option */
@@ -57,13 +57,13 @@ int AQH_Tool_GetDevices(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
GWEN_ArgsType_Int, /* type */
"tcpPort", /* name */
"brokerPort", /* name */
0, /* minnum */
1, /* maxnum */
"P", /* short option */
"tcpport", /* long option */
I18S("Specify the TCP port to listen on"),
I18S("Specify the TCP port to listen on")
I18S("Specify the TCP port to connect to"),
I18S("Specify the TCP port to connect to")
},
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
@@ -172,7 +172,7 @@ int _doGetDevices(GWEN_DB_NODE *dbArgs)
timeoutInSeconds=GWEN_DB_GetIntValue(dbArgs, "timeout", 0, 5);
printHeader=GWEN_DB_GetIntValue(dbArgs, "printHeader", 0, 0);
epTcp=Utils_OpenBrokerConnection(dbArgs, 0, timeoutInSeconds);
epTcp=Utils_SetupBrokerClientEndpoint(dbArgs, 0);
if (epTcp==NULL) {
DBG_ERROR(NULL, "ERROR creating TCP connection");
return 2;

6
apps/aqhome-tool/data/getlastdatapoint.c
View File

@@ -59,7 +59,7 @@ int AQH_Tool_GetLastDataPoint(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
GWEN_ArgsType_Char, /* type */
"tcpAddress", /* name */
"brokerAddress", /* name */
0, /* minnum */
1, /* maxnum */
"t", /* short option */
@@ -70,7 +70,7 @@ int AQH_Tool_GetLastDataPoint(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
GWEN_ArgsType_Int, /* type */
"tcpPort", /* name */
"brokerPort", /* name */
0, /* minnum */
1, /* maxnum */
"P", /* short option */
@@ -185,7 +185,7 @@ int _doGetLastDataPoint(GWEN_DB_NODE *dbArgs)
timeoutInSeconds=GWEN_DB_GetIntValue(dbArgs, "timeout", 0, 5);
valueName=GWEN_DB_GetCharValue(dbArgs, "valueName", 0, NULL);
epTcp=Utils_OpenBrokerConnection(dbArgs, 0, timeoutInSeconds);
epTcp=Utils_SetupBrokerClientEndpoint(dbArgs, 0);
if (epTcp==NULL) {
DBG_ERROR(NULL, "ERROR creating TCP connection");
return 2;

6
apps/aqhome-tool/data/getvalues.c
View File

@@ -46,7 +46,7 @@ int AQH_Tool_GetValues(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
GWEN_ArgsType_Char, /* type */
"tcpAddress", /* name */
"brokerAddress", /* name */
0, /* minnum */
1, /* maxnum */
"t", /* short option */
@@ -57,7 +57,7 @@ int AQH_Tool_GetValues(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
GWEN_ArgsType_Int, /* type */
"tcpPort", /* name */
"brokerPort", /* name */
0, /* minnum */
1, /* maxnum */
"P", /* short option */
@@ -159,7 +159,7 @@ int _doGetValues(GWEN_DB_NODE *dbArgs)
timeoutInSeconds=GWEN_DB_GetIntValue(dbArgs, "timeout", 0, 5);
epTcp=Utils_OpenBrokerConnection(dbArgs, 0, timeoutInSeconds);
epTcp=Utils_SetupBrokerClientEndpoint(dbArgs, 0);
if (epTcp==NULL) {
DBG_ERROR(NULL, "ERROR creating TCP connection");
return 2;

6
apps/aqhome-tool/data/moddevice.c
View File

@@ -46,7 +46,7 @@ int AQH_Tool_ModDevice(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
GWEN_ArgsType_Char, /* type */
"tcpAddress", /* name */
"brokerAddress", /* name */
0, /* minnum */
1, /* maxnum */
"t", /* short option */
@@ -57,7 +57,7 @@ int AQH_Tool_ModDevice(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
GWEN_ArgsType_Int, /* type */
"tcpPort", /* name */
"brokerPort", /* name */
0, /* minnum */
1, /* maxnum */
"P", /* short option */
@@ -216,7 +216,7 @@ int _doModDevice(GWEN_DB_NODE *dbArgs)
timeoutInSeconds=GWEN_DB_GetIntValue(dbArgs, "timeout", 0, 5);
device=Utils_DeviceFromArgs(dbArgs);
epTcp=Utils_OpenBrokerConnection(dbArgs, 0, timeoutInSeconds);
epTcp=Utils_SetupBrokerClientEndpoint(dbArgs, 0);
if (epTcp==NULL) {
DBG_ERROR(NULL, "ERROR creating TCP connection");
return 2;

6
apps/aqhome-tool/data/setdata.c
View File

@@ -46,7 +46,7 @@ int AQH_Tool_SetData(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
GWEN_ArgsType_Char, /* type */
"tcpAddress", /* name */
"brokerAddress", /* name */
0, /* minnum */
1, /* maxnum */
"t", /* short option */
@@ -57,7 +57,7 @@ int AQH_Tool_SetData(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
GWEN_ArgsType_Int, /* type */
"tcpPort", /* name */
"brokerPort", /* name */
0, /* minnum */
1, /* maxnum */
"P", /* short option */
@@ -218,7 +218,7 @@ int _doSetData(GWEN_DB_NODE *dbArgs)
/*fprintf(stdout, "Sending SetData request\n");*/
epTcp=Utils_OpenBrokerConnection(dbArgs, 0, timeoutInSeconds);
epTcp=Utils_SetupBrokerClientEndpoint(dbArgs, 0);
if (epTcp==NULL) {
DBG_ERROR(NULL, "ERROR creating TCP connection");
return 2;

4
apps/aqhome-tool/data/watch.c
View File

@@ -49,7 +49,7 @@ int AQH_Tool_Watch(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
GWEN_ArgsType_Char, /* type */
"tcpAddress", /* name */
"brokerAddress", /* name */
0, /* minnum */
1, /* maxnum */
"t", /* short option */
@@ -60,7 +60,7 @@ int AQH_Tool_Watch(GWEN_DB_NODE *dbGlobalArgs, int argc, char **argv)
{
GWEN_ARGS_FLAGS_HAS_ARGUMENT, /* flags */
GWEN_ArgsType_Int, /* type */
"tcpPort", /* name */
"brokerPort", /* name */
0, /* minnum */
1, /* maxnum */
"P", /* short option */

14
vg_calls.sh
View File

@@ -6,13 +6,9 @@ export LD_LIBRARY_PATH="0-build/aqhome/:$LD_LIBRARY_PATH"
# 0-build/apps/aqhomed/aqhomed -l aqhome.log -db aqhome.db -ma 192.168.117.192 -mp 1883 -t 127.0.0.1
valgrind --tool=callgrind --trace-children=yes --dump-instr=yes --collect-jumps=yes \
0-build/apps/aqhome-storage/aqhome-storage \
--sourcefolder=apps/aqhome-storage/test/html \
-D apps/aqhome-storage/test/config \
--datafolder=apps/aqhome-storage/test/data \
--statefile=apps/aqhome-storage/test/config/state \
-ma 192.168.117.192 -mp 1883 --mqttclientid=AQHOMESTORAGEVG \
-ha 127.0.0.1 -hp 1884 \
-p ./aqhome-storage.pid \
-T 90
0-build/apps/aqhome-data/aqhome-data \
--datafolder=apps/aqhome-data/test/data \
-t 127.0.0.1 -P 1899 \
-p ./aqhome-data.pid \
-T 1200