Skip to content

Commit

Permalink
Merge f70b15d into 17e5f6c
Browse files Browse the repository at this point in the history
  • Loading branch information
@Pro
Pro committed Jan 3, 2019
2 parents 17e5f6c + f70b15d commit 4e57760
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 18 deletions.
12 changes: 8 additions & 4 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -388,10 +388,12 @@ if(NOT UA_COMPILE_AS_CXX AND (CMAKE_COMPILER_IS_GNUCC OR "x${CMAKE_C_COMPILER_ID

# Debug
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
# add_definitions(-fsanitize=address)
# list(APPEND open62541_LIBRARIES asan)
# add_definitions(-fsanitize=undefined)
# list(APPEND open62541_LIBRARIES ubsan)
if ("x${CMAKE_C_COMPILER_ID}" STREQUAL "xClang")
# Add default sanitizer settings when using clang and Debug build.
# This allows e.g. CLion to find memory locations for SegFaults
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-omit-frame-pointer -gline-tables-only -fsanitize=address -fsanitize-address-use-after-scope -fsanitize-coverage=trace-pc-guard,trace-cmp")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -gline-tables-only -fsanitize=address -fsanitize-address-use-after-scope -fsanitize-coverage=trace-pc-guard,trace-cmp")
endif()
endif()

# Strip release builds
Expand All @@ -416,6 +418,8 @@ if(NOT UA_COMPILE_AS_CXX AND (CMAKE_COMPILER_IS_GNUCC OR "x${CMAKE_C_COMPILER_ID
endif()
endif()



if(APPLE)
set(CMAKE_MACOSX_RPATH 1)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_DARWIN_C_SOURCE=1")
Expand Down
2 changes: 1 addition & 1 deletion deps/mdnsd
Submodule mdnsd updated 4 files
+19 −4 .travis.yml
+8 −8 libmdnsd/mdnsd.c
+2 −2 libmdnsd/mdnsd.h
+0 −32 tools/travis/travis_linux_before_install.sh
8 changes: 4 additions & 4 deletions tests/pubsub/check_pubsub_connection_udp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@ START_TEST(AddSingleConnectionWithMaximalConfiguration){
UA_Variant_setScalar(&connectionOptions[0].value, &ttl, &UA_TYPES[UA_TYPES_UINT32]);
connectionOptions[1].key = UA_QUALIFIEDNAME(0, "loopback");
UA_Boolean loopback = UA_FALSE;
UA_Variant_setScalar(&connectionOptions[1].value, &loopback, &UA_TYPES[UA_TYPES_UINT32]);
UA_Variant_setScalar(&connectionOptions[1].value, &loopback, &UA_TYPES[UA_TYPES_BOOLEAN]);
connectionOptions[2].key = UA_QUALIFIEDNAME(0, "reuse");
UA_Boolean reuse = UA_TRUE;
UA_Variant_setScalar(&connectionOptions[2].value, &reuse, &UA_TYPES[UA_TYPES_UINT32]);
UA_Variant_setScalar(&connectionOptions[2].value, &reuse, &UA_TYPES[UA_TYPES_BOOLEAN]);

UA_PubSubConnectionConfig connectionConf;
memset(&connectionConf, 0, sizeof(UA_PubSubConnectionConfig));
Expand Down Expand Up @@ -155,10 +155,10 @@ START_TEST(GetMaximalConnectionConfigurationAndCompareValues){
UA_Variant_setScalar(&connectionOptions[0].value, &ttl, &UA_TYPES[UA_TYPES_UINT32]);
connectionOptions[1].key = UA_QUALIFIEDNAME(0, "loopback");
UA_Boolean loopback = UA_FALSE;
UA_Variant_setScalar(&connectionOptions[1].value, &loopback, &UA_TYPES[UA_TYPES_UINT32]);
UA_Variant_setScalar(&connectionOptions[1].value, &loopback, &UA_TYPES[UA_TYPES_BOOLEAN]);
connectionOptions[2].key = UA_QUALIFIEDNAME(0, "reuse");
UA_Boolean reuse = UA_TRUE;
UA_Variant_setScalar(&connectionOptions[2].value, &reuse, &UA_TYPES[UA_TYPES_UINT32]);
UA_Variant_setScalar(&connectionOptions[2].value, &reuse, &UA_TYPES[UA_TYPES_BOOLEAN]);

UA_PubSubConnectionConfig connectionConf;
memset(&connectionConf, 0, sizeof(UA_PubSubConnectionConfig));
Expand Down
66 changes: 57 additions & 9 deletions tests/server/check_historical_data.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,22 +36,44 @@ static UA_HistoryDataGathering *gathering;
#endif
static UA_Boolean running;
static THREAD_HANDLE server_thread;
static MUTEX_HANDLE serverMutex;

static UA_Client *client;
static UA_NodeId parentNodeId;
static UA_NodeId parentReferenceNodeId;
static UA_NodeId outNodeId;

static void serverMutexLock(void) {
if (!(MUTEX_LOCK(serverMutex))) {
fprintf(stderr, "Mutex cannot be locked.\n");
exit(1);
}
}

static void serverMutexUnlock(void) {
if (!(MUTEX_UNLOCK(serverMutex))) {
fprintf(stderr, "Mutex cannot be unlocked.\n");
exit(1);
}
}

THREAD_CALLBACK(serverloop)
{
while(running)
UA_Server_run_iterate(server, true);
while(running) {
serverMutexLock();
UA_Server_run_iterate(server, false);
serverMutexUnlock();
}
return 0;
}

static void
setup(void)
{
if (!(MUTEX_INIT(serverMutex))) {
fprintf(stderr, "Server mutex was not created correctly.\n");
exit(1);
}
running = true;
config = UA_ServerConfig_new_default();
#ifdef UA_ENABLE_HISTORIZING
Expand All @@ -61,7 +83,11 @@ setup(void)
#endif
server = UA_Server_new(config);
UA_StatusCode retval = UA_Server_run_startup(server);
ck_assert_str_eq(UA_StatusCode_name(retval), UA_StatusCode_name(UA_STATUSCODE_GOOD));
if (retval != UA_STATUSCODE_GOOD)
{
fprintf(stderr, "Error while calling Server_run_startup. %s\n", UA_StatusCode_name(retval));
exit(1);
}
THREAD_CREATE(server_thread, serverloop);
/* Define the attribute of the uint32 variable node */
UA_VariableAttributes attr = UA_VariableAttributes_default;
Expand All @@ -79,20 +105,28 @@ setup(void)
parentNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_OBJECTSFOLDER);
parentReferenceNodeId = UA_NODEID_NUMERIC(0, UA_NS0ID_ORGANIZES);
UA_NodeId_init(&outNodeId);
ck_assert_uint_eq(UA_Server_addVariableNode(server,
retval = UA_Server_addVariableNode(server,
uint32NodeId,
parentNodeId,
parentReferenceNodeId,
uint32Name,
UA_NODEID_NUMERIC(0, UA_NS0ID_BASEDATAVARIABLETYPE),
attr,
NULL,
&outNodeId)
, UA_STATUSCODE_GOOD);
&outNodeId);
if (retval != UA_STATUSCODE_GOOD)
{
fprintf(stderr, "Error adding variable node. %s\n", UA_StatusCode_name(retval));
exit(1);
}

client = UA_Client_new(UA_ClientConfig_default);
retval = UA_Client_connect(client, "opc.tcp://localhost:4840");
ck_assert_str_eq(UA_StatusCode_name(retval), UA_StatusCode_name(UA_STATUSCODE_GOOD));
if (retval != UA_STATUSCODE_GOOD)
{
fprintf(stderr, "Client can not connect to opc.tcp://localhost:4840. %s\n", UA_StatusCode_name(retval));
exit(1);
}

UA_Client_recv = client->connection.recv;
client->connection.recv = UA_Client_recvTesting;
Expand All @@ -104,17 +138,21 @@ teardown(void)
/* cleanup */
UA_Client_disconnect(client);
UA_Client_delete(client);
running = false;
THREAD_JOIN(server_thread);
UA_NodeId_deleteMembers(&parentNodeId);
UA_NodeId_deleteMembers(&parentReferenceNodeId);
UA_NodeId_deleteMembers(&outNodeId);
running = false;
THREAD_JOIN(server_thread);
UA_Server_run_shutdown(server);
UA_Server_delete(server);
UA_ServerConfig_delete(config);
#ifdef UA_ENABLE_HISTORIZING
UA_free(gathering);
#endif
if (!MUTEX_DESTROY(serverMutex)) {
fprintf(stderr, "Server mutex was not destroyed correctly.\n");
exit(1);
}
}

#ifdef UA_ENABLE_HISTORIZING
Expand Down Expand Up @@ -491,20 +529,26 @@ START_TEST(Server_HistorizingStrategyPoll)
setting.maxHistoryDataResponseSize = 100;
setting.pollingInterval = 100;
setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_POLL;
serverMutexLock();
retval = gathering->registerNodeId(server, gathering->context, &outNodeId, setting);
serverMutexUnlock();
ck_assert_str_eq(UA_StatusCode_name(retval), UA_StatusCode_name(UA_STATUSCODE_GOOD));

// fill the data
UA_DateTime start = UA_DateTime_now();
serverMutexLock();
retval = gathering->startPoll(server, gathering->context, &outNodeId);
serverMutexUnlock();
ck_assert_str_eq(UA_StatusCode_name(retval), UA_StatusCode_name(UA_STATUSCODE_GOOD));

ck_assert_str_eq(UA_StatusCode_name(retval), UA_StatusCode_name(UA_STATUSCODE_GOOD));
for (size_t k = 0; k < 10; ++k) {
UA_fakeSleep(50);
UA_realSleep(50);
if (k == 5) {
serverMutexLock();
gathering->stopPoll(server, gathering->context, &outNodeId);
serverMutexUnlock();
}
setUInt32(client, outNodeId, (unsigned int)k);
}
Expand Down Expand Up @@ -557,7 +601,9 @@ START_TEST(Server_HistorizingStrategyValueSet)
setting.historizingBackend = UA_HistoryDataBackend_Memory(3, 100);
setting.maxHistoryDataResponseSize = 100;
setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_VALUESET;
serverMutexLock();
retval = gathering->registerNodeId(server, gathering->context, &outNodeId, setting);
serverMutexUnlock();
ck_assert_str_eq(UA_StatusCode_name(retval), UA_StatusCode_name(UA_STATUSCODE_GOOD));

// fill the data
Expand Down Expand Up @@ -607,7 +653,9 @@ START_TEST(Server_HistorizingBackendMemory)
setting.historizingBackend = backend;
setting.maxHistoryDataResponseSize = 1000;
setting.historizingUpdateStrategy = UA_HISTORIZINGUPDATESTRATEGY_USER;
serverMutexLock();
UA_StatusCode ret = gathering->registerNodeId(server, gathering->context, &outNodeId, setting);
serverMutexUnlock();
ck_assert_str_eq(UA_StatusCode_name(ret), UA_StatusCode_name(UA_STATUSCODE_GOOD));

// empty backend should not crash
Expand Down

0 comments on commit 4e57760

Please sign in to comment.