feat(multithreading): Adding new macro for assertions and rename UA_L…

…OCK_RELEASE to UA_LOCK_DESTROY
kusumy · Aug 27, 2019 · 30c8b7d · 30c8b7d
1 parent 7345ab0
commit 30c8b7d
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 21 deletions.
diff --git a/arch/eCos/ua_architecture.h b/arch/eCos/ua_architecture.h
@@ -90,10 +90,10 @@ int gethostname_ecos(char* name, size_t len);
 #define UA_LOCK_TYPE(mutexName)
 #define UA_LOCK_TYPE_POINTER(mutexName)
 #define UA_LOCK_INIT(mutexName)
-#define UA_LOCK_RELEASE(mutexName)
+#define UA_LOCK_DESTROY(mutexName)
 #define UA_LOCK(mutexName)
 #define UA_UNLOCK(mutexName)
-#define UA_LOCK_SWITCH(currentMutex, newMutex)
+#define UA_LOCK_ASSERT(mutexName, num)
 #endif
 
 #include <open62541/architecture_functions.h>

diff --git a/arch/freertosLWIP/ua_architecture.h b/arch/freertosLWIP/ua_architecture.h
@@ -21,10 +21,10 @@
 #define UA_LOCK_TYPE(mutexName)
 #define UA_LOCK_TYPE_POINTER(mutexName)
 #define UA_LOCK_INIT(mutexName)
-#define UA_LOCK_RELEASE(mutexName)
+#define UA_LOCK_DESTROY(mutexName)
 #define UA_LOCK(mutexName)
 #define UA_UNLOCK(mutexName)
-#define UA_LOCK_SWITCH(currentMutex, newMutex)
+#define UA_LOCK_ASSERT(mutexName, num)
 #endif
 
 #include <open62541/architecture_functions.h>

diff --git a/arch/posix/ua_architecture.h b/arch/posix/ua_architecture.h
@@ -157,24 +157,23 @@ extern void * (*UA_globalRealloc)(void *ptr, size_t size);
                                         pthread_mutexattr_settype(&mutexName##_attr, PTHREAD_MUTEX_RECURSIVE); \
                                         pthread_mutex_init(&mutexName, &mutexName##_attr); \
                                         mutexName##Counter = 0;
-#define UA_LOCK_RELEASE(mutexName) pthread_mutex_destroy(&mutexName); \
+#define UA_LOCK_DESTROY(mutexName) pthread_mutex_destroy(&mutexName); \
                                    pthread_mutexattr_destroy(&mutexName##_attr);
 
 #define UA_LOCK(mutexName) pthread_mutex_lock(&mutexName); \
                            UA_assert(++(mutexName##Counter) == 1); \
 
 #define UA_UNLOCK(mutexName) UA_assert(--(mutexName##Counter) == 0); \
                              pthread_mutex_unlock(&mutexName);
-#define UA_LOCK_SWITCH(currentMutex, newMutex)  UA_UNLOCK(currentMutex) \
-                                                UA_LOCK(newMutex)
+#define UA_LOCK_ASSERT(mutexName, num) UA_assert(mutexName##Counter == num);
 #else
 #define UA_LOCK_TYPE_NAME
 #define UA_LOCK_TYPE(mutexName)
 #define UA_LOCK_INIT(mutexName)
-#define UA_LOCK_RELEASE(mutexName)
+#define UA_LOCK_DESTROY(mutexName)
 #define UA_LOCK(mutexName)
 #define UA_UNLOCK(mutexName)
-#define UA_LOCK_SWITCH(currentMutex, newMutex)
+#define UA_LOCK_ASSERT(mutexName, num)
 #endif
 
 #include <open62541/architecture_functions.h>

diff --git a/arch/vxworks/ua_architecture.h b/arch/vxworks/ua_architecture.h
@@ -116,10 +116,10 @@
 #define UA_LOCK_TYPE(mutexName)
 #define UA_LOCK_TYPE_POINTER(mutexName)
 #define UA_LOCK_INIT(mutexName)
-#define UA_LOCK_RELEASE(mutexName)
+#define UA_LOCK_DESTROY(mutexName)
 #define UA_LOCK(mutexName)
 #define UA_UNLOCK(mutexName)
-#define UA_LOCK_SWITCH(currentMutex, newMutex)
+#define UA_LOCK_ASSERT(mutexName, num)
 #endif
 
 #include <open62541/architecture_functions.h>

diff --git a/arch/wec7/ua_architecture.h b/arch/wec7/ua_architecture.h
@@ -144,10 +144,9 @@ char *strerror(int errnum);
 #define UA_LOCK_TYPE(mutexName)
 #define UA_LOCK_TYPE_POINTER(mutexName)
 #define UA_LOCK_INIT(mutexName)
-#define UA_LOCK_RELEASE(mutexName)
+#define UA_LOCK_DESTROY(mutexName)
 #define UA_LOCK(mutexName)
 #define UA_UNLOCK(mutexName)
-#define UA_LOCK_SWITCH(currentMutex, newMutex)
 #endif
 
 #include <open62541/architecture_functions.h>

diff --git a/arch/win32/ua_architecture.h b/arch/win32/ua_architecture.h
@@ -149,22 +149,21 @@
                                 int mutexName##Counter;
 #define UA_LOCK_INIT(mutexName) InitializeCriticalSection(&mutexName); \
                                 mutexName##Counter = 0;;
-#define UA_LOCK_RELEASE(mutexName) DeleteCriticalSection(&mutexName);
+#define UA_LOCK_DESTROY(mutexName) DeleteCriticalSection(&mutexName);
 #define UA_LOCK(mutexName) EnterCriticalSection(&mutexName); \
                            UA_assert(++(mutexName##Counter) == 1);
 #define UA_UNLOCK(mutexName) UA_assert(--(mutexName##Counter) == 0); \
                              LeaveCriticalSection(&mutexName);
-#define UA_LOCK_SWITCH(currentMutex, newMutex)  UA_UNLOCK(currentMutex) \
-                                                        UA_LOCK(newMutex)
+#define UA_LOCK_ASSERT(mutexName, num) UA_assert(mutexName##Counter == num);
 #else
 #define UA_LOCK_TYPE_NAME
 #define UA_LOCK_TYPE(mutexName)
 #define UA_LOCK_TYPE_POINTER(mutexName)
 #define UA_LOCK_INIT(mutexName)
-#define UA_LOCK_RELEASE(mutexName)
+#define UA_LOCK_DESTROY(mutexName)
 #define UA_LOCK(mutexName)
 #define UA_UNLOCK(mutexName)
-#define UA_LOCK_SWITCH(currentMutex, newMutex)
+#define UA_LOCK_ASSERT(mutexName, num)
 #endif
 
 #include <open62541/architecture_functions.h>

diff --git a/plugins/ua_nodestore_default.c b/plugins/ua_nodestore_default.c
@@ -348,7 +348,7 @@ UA_Nodestore_delete(void *nsCtx) {
 
     NodeMap *ns = (NodeMap*)nsCtx;
 #if UA_MULTITHREADING >= 100
-    UA_LOCK_RELEASE(ns->lock);
+    UA_LOCK_DESTROY(ns->lock);
 #endif
     ZIP_ITER(NodeTree, &ns->root, deleteNodeVisitor, NULL);
     UA_free(ns);

diff --git a/src/server/ua_server.c b/src/server/ua_server.c
@@ -176,8 +176,8 @@ void UA_Server_delete(UA_Server *server) {
 #endif
 
 #if UA_MULTITHREADING >= 100
-    UA_LOCK_RELEASE(server->networkMutex)
-    UA_LOCK_RELEASE(server->serviceMutex)
+    UA_LOCK_DESTROY(server->networkMutex)
+    UA_LOCK_DESTROY(server->serviceMutex)
 #endif
 
     /* Clean up the Admin Session */