Browse Source

added write operation

FlorianPalm 10 years ago
parent
commit
5e4b157c32

+ 3 - 3
CMakeLists.txt

@@ -38,7 +38,7 @@ set(lib_sources src/ua_types.c
 				src/server/nodestore/open62541_nodestore_view.c
 				src/server/nodestore/open62541_nodestore_attribute.c
 				src/server/nodestore/open62541_nodestore_nodemanagement.c
-				src/server/nodestore/open62541_nodestore.c
+				src/server/nodestore/open62541_nodestore_core.c
 				src/server/ua_nodestore_interface.c
                 ${headers}
                 ${generated_headers})
@@ -112,9 +112,9 @@ endif(ENABLE_JSON_ENCODING)
 option(ENABLE_MULTITHREADING "Enable multithreading" OFF)
 if(ENABLE_MULTITHREADING)
     find_package(Threads REQUIRED)
-    list(APPEND lib_sources src/server/ua_nodestore_concurrent.c)
+    list(APPEND lib_sources src/server/ua_nodestore_concurrent_core.c)
 else()
-    list(APPEND lib_sources src/server/nodestore/open62541_nodestore.c)
+    list(APPEND lib_sources src/server/nodestore/open62541_nodestore_core.c)
 endif()
 
 add_library(open62541-objects OBJECT ${lib_sources}) # static version that exports all symbols

+ 27 - 27
Makefile

@@ -233,30 +233,6 @@ examples/opcuaServer.c.s:
 	$(MAKE) -f CMakeFiles/exampleServer.dir/build.make CMakeFiles/exampleServer.dir/examples/opcuaServer.c.s
 .PHONY : examples/opcuaServer.c.s
 
-src/server/nodestore/open62541_nodestore.o: src/server/nodestore/open62541_nodestore.c.o
-.PHONY : src/server/nodestore/open62541_nodestore.o
-
-# target to build an object file
-src/server/nodestore/open62541_nodestore.c.o:
-	$(MAKE) -f CMakeFiles/open62541-objects.dir/build.make CMakeFiles/open62541-objects.dir/src/server/nodestore/open62541_nodestore.c.o
-.PHONY : src/server/nodestore/open62541_nodestore.c.o
-
-src/server/nodestore/open62541_nodestore.i: src/server/nodestore/open62541_nodestore.c.i
-.PHONY : src/server/nodestore/open62541_nodestore.i
-
-# target to preprocess a source file
-src/server/nodestore/open62541_nodestore.c.i:
-	$(MAKE) -f CMakeFiles/open62541-objects.dir/build.make CMakeFiles/open62541-objects.dir/src/server/nodestore/open62541_nodestore.c.i
-.PHONY : src/server/nodestore/open62541_nodestore.c.i
-
-src/server/nodestore/open62541_nodestore.s: src/server/nodestore/open62541_nodestore.c.s
-.PHONY : src/server/nodestore/open62541_nodestore.s
-
-# target to generate assembly for a file
-src/server/nodestore/open62541_nodestore.c.s:
-	$(MAKE) -f CMakeFiles/open62541-objects.dir/build.make CMakeFiles/open62541-objects.dir/src/server/nodestore/open62541_nodestore.c.s
-.PHONY : src/server/nodestore/open62541_nodestore.c.s
-
 src/server/nodestore/open62541_nodestore_attribute.o: src/server/nodestore/open62541_nodestore_attribute.c.o
 .PHONY : src/server/nodestore/open62541_nodestore_attribute.o
 
@@ -281,6 +257,30 @@ src/server/nodestore/open62541_nodestore_attribute.c.s:
 	$(MAKE) -f CMakeFiles/open62541-objects.dir/build.make CMakeFiles/open62541-objects.dir/src/server/nodestore/open62541_nodestore_attribute.c.s
 .PHONY : src/server/nodestore/open62541_nodestore_attribute.c.s
 
+src/server/nodestore/open62541_nodestore_core.o: src/server/nodestore/open62541_nodestore_core.c.o
+.PHONY : src/server/nodestore/open62541_nodestore_core.o
+
+# target to build an object file
+src/server/nodestore/open62541_nodestore_core.c.o:
+	$(MAKE) -f CMakeFiles/open62541-objects.dir/build.make CMakeFiles/open62541-objects.dir/src/server/nodestore/open62541_nodestore_core.c.o
+.PHONY : src/server/nodestore/open62541_nodestore_core.c.o
+
+src/server/nodestore/open62541_nodestore_core.i: src/server/nodestore/open62541_nodestore_core.c.i
+.PHONY : src/server/nodestore/open62541_nodestore_core.i
+
+# target to preprocess a source file
+src/server/nodestore/open62541_nodestore_core.c.i:
+	$(MAKE) -f CMakeFiles/open62541-objects.dir/build.make CMakeFiles/open62541-objects.dir/src/server/nodestore/open62541_nodestore_core.c.i
+.PHONY : src/server/nodestore/open62541_nodestore_core.c.i
+
+src/server/nodestore/open62541_nodestore_core.s: src/server/nodestore/open62541_nodestore_core.c.s
+.PHONY : src/server/nodestore/open62541_nodestore_core.s
+
+# target to generate assembly for a file
+src/server/nodestore/open62541_nodestore_core.c.s:
+	$(MAKE) -f CMakeFiles/open62541-objects.dir/build.make CMakeFiles/open62541-objects.dir/src/server/nodestore/open62541_nodestore_core.c.s
+.PHONY : src/server/nodestore/open62541_nodestore_core.c.s
+
 src/server/nodestore/open62541_nodestore_nodemanagement.o: src/server/nodestore/open62541_nodestore_nodemanagement.c.o
 .PHONY : src/server/nodestore/open62541_nodestore_nodemanagement.o
 
@@ -904,12 +904,12 @@ help:
 	@echo "... examples/opcuaServer.o"
 	@echo "... examples/opcuaServer.i"
 	@echo "... examples/opcuaServer.s"
-	@echo "... src/server/nodestore/open62541_nodestore.o"
-	@echo "... src/server/nodestore/open62541_nodestore.i"
-	@echo "... src/server/nodestore/open62541_nodestore.s"
 	@echo "... src/server/nodestore/open62541_nodestore_attribute.o"
 	@echo "... src/server/nodestore/open62541_nodestore_attribute.i"
 	@echo "... src/server/nodestore/open62541_nodestore_attribute.s"
+	@echo "... src/server/nodestore/open62541_nodestore_core.o"
+	@echo "... src/server/nodestore/open62541_nodestore_core.i"
+	@echo "... src/server/nodestore/open62541_nodestore_core.s"
 	@echo "... src/server/nodestore/open62541_nodestore_nodemanagement.o"
 	@echo "... src/server/nodestore/open62541_nodestore_nodemanagement.i"
 	@echo "... src/server/nodestore/open62541_nodestore_nodemanagement.s"

+ 2 - 1
examples/opcuaServer.c

@@ -71,8 +71,9 @@ int main(int argc, char** argv) {
 	UA_NodeStore_registerReadNodesOperation(&newNodeStore,open62541NodeStore_ReadNodes);
 	UA_NodeStore_registerBrowseNodesOperation(&newNodeStore,open62541NodeStore_BrowseNodes);
 	UA_NodeStore_registerAddNodesOperation(&newNodeStore,open62541NodeStore_AddNodes);
+	UA_NodeStore_registerWriteNodesOperation(&newNodeStore,open62541NodeStore_WriteNodes);
 	//register more operations/ services
-	//UA_NodeStore_registerWriteNodesOperation(&newNodeStore,writeNodes);
+
 	UA_Server_init(&server, &endpointUrl);
 
 	//initMyNode();

+ 3 - 0
src/server/nodestore/open62541_nodestore.h

@@ -80,4 +80,7 @@ UA_Int32 UA_EXPORT open62541NodeStore_AddNodes(UA_AddNodesItem *nodesToAdd,
 		UA_UInt32 *indices, UA_UInt32 indicesSize,
 		UA_AddNodesResult* addNodesResults, UA_DiagnosticInfo *diagnosticInfos);
 
+UA_Int32 UA_EXPORT open62541NodeStore_WriteNodes(UA_WriteValue *writeValues,
+		UA_UInt32 *indices, UA_UInt32 indicesSize,
+		UA_StatusCode *writeNodesResults, UA_DiagnosticInfo *diagnosticInfo);
 #endif /* UA_OPEN62541_NODESTORE_H_ */

+ 14 - 13
src/server/nodestore/open62541_nodestore_attribute.c

@@ -334,17 +334,18 @@ static UA_StatusCode Service_Write_writeNode(open62541NodeStore *nodestore, UA_W
     return retval;
 
 }
+UA_Int32 UA_EXPORT open62541NodeStore_WriteNodes(UA_WriteValue *writeValues,
+		UA_UInt32 *indices, UA_UInt32 indicesSize,
+		UA_StatusCode *writeNodesResults, UA_DiagnosticInfo *diagnosticInfo){
+	open62541NodeStore *nodestore = UA_NULL;
+	nodestore = open62541NodeStore_getNodeStore();
+	if(nodestore == UA_NULL){
+		return UA_STATUSCODE_BADINTERNALERROR;
+	}
+
+	for(UA_UInt32 i =0; i<indicesSize; i++){
+		writeNodesResults[indices[i]] =  Service_Write_writeNode(open62541NodeStore_getNodeStore(),&writeValues[indices[i]]);
+	}
+	return UA_STATUSCODE_GOOD; //
+}
 
-//void Service_Write(UA_Server *server, UA_Session *session,
-//                   const UA_WriteRequest *request, UA_WriteResponse *response) {
- //   UA_assert(server != UA_NULL && session != UA_NULL && request != UA_NULL && response != UA_NULL);
-//
-    //if(UA_Array_new((void **)&response->results, request->nodesToWriteSize, &UA_[UA_STATUSCODE])) {
-    //    response->responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
-    //    return;
-    //}
-
-   // response->resultsSize = request->nodesToWriteSize;
-   // for(UA_Int32 i = 0;i < request->nodesToWriteSize;i++)
-     //   response->results[i] = Service_Write_writeNode(server, &request->nodesToWrite[i]);
-//}

+ 357 - 0
src/server/nodestore/open62541_nodestore_concurrent_core.c

@@ -0,0 +1,357 @@
+#include "open62541_nodestore.h"
+#include "ua_util.h"
+
+#include <urcu.h>
+#include <urcu/compiler.h> // for caa_container_of
+#include <urcu/uatomic.h>
+#include <urcu/rculfhash.h>
+
+#define ALIVE_BIT (1 << 15) /* Alive bit in the readcount */
+
+typedef struct open62541NodeStore_Entry {
+    struct cds_lfht_node htn;      /* contains next-ptr for urcu-hashmap */
+    struct rcu_head      rcu_head; /* For call-rcu */
+    UA_UInt16 readcount;           /* Counts the amount of readers on it [alive-bit, 15 counter-bits] */
+    UA_Node   node;                /* Might be cast from any _bigger_ UA_Node* type. Allocate enough memory! */
+} open62541NodeStore_Entry;
+
+struct open62541NodeStore {
+    struct cds_lfht *ht; /* Hash table */
+};
+
+/********/
+/* Hash */
+/********/
+
+typedef UA_UInt32 hash_t;
+
+/* Based on Murmur-Hash 3 by Austin Appleby (public domain, freely usable) */
+static INLINE hash_t hash_array(const UA_Byte *data, UA_UInt32 len, UA_UInt32 seed) {
+    static const uint32_t c1 = 0xcc9e2d51;
+    static const uint32_t c2 = 0x1b873593;
+    static const uint32_t r1 = 15;
+    static const uint32_t r2 = 13;
+    static const uint32_t m  = 5;
+    static const uint32_t n  = 0xe6546b64;
+    hash_t hash = seed;
+
+    if(data == UA_NULL) return 0;
+
+    const int32_t   nblocks = len / 4;
+    const uint32_t *blocks  = (const uint32_t *)data;
+    for(int32_t i = 0;i < nblocks;i++) {
+        uint32_t k = blocks[i];
+        k    *= c1;
+        k     = (k << r1) | (k >> (32 - r1));
+        k    *= c2;
+        hash ^= k;
+        hash  = ((hash << r2) | (hash >> (32 - r2))) * m + n;
+    }
+
+    const uint8_t *tail = (const uint8_t *)(data + nblocks * 4);
+    uint32_t       k1   = 0;
+
+    switch(len & 3) {
+    case 3:
+        k1 ^= tail[2] << 16;
+
+    case 2:
+        k1 ^= tail[1] << 8;
+
+    case 1:
+        k1   ^= tail[0];
+        k1   *= c1;
+        k1    = (k1 << r1) | (k1 >> (32 - r1));
+        k1   *= c2;
+        hash ^= k1;
+    }
+
+    hash ^= len;
+    hash ^= (hash >> 16);
+    hash *= 0x85ebca6b;
+    hash ^= (hash >> 13);
+    hash *= 0xc2b2ae35;
+    hash ^= (hash >> 16);
+
+    return hash;
+}
+
+static INLINE hash_t hash(const UA_NodeId *n) {
+    switch(n->identifierType) {
+    case UA_NODEIDTYPE_NUMERIC:
+        /*  Knuth's multiplicative hashing */
+        return (n->identifier.numeric + n->namespaceIndex) * 2654435761;   // mod(2^32) is implicit
+
+    case UA_NODEIDTYPE_STRING:
+        return hash_array(n->identifier.string.data, n->identifier.string.length, n->namespaceIndex);
+
+    case UA_NODEIDTYPE_GUID:
+        return hash_array((UA_Byte *)&(n->identifier.guid), sizeof(UA_Guid), n->namespaceIndex);
+
+    case UA_NODEIDTYPE_BYTESTRING:
+        return hash_array((UA_Byte *)n->identifier.byteString.data, n->identifier.byteString.length, n->namespaceIndex);
+
+    default:
+        UA_assert(UA_FALSE);
+        return 0;
+    }
+}
+
+/****************/
+/* open62541NodeStore */
+/****************/
+
+static inline void node_deleteMembers(const UA_Node *node) {
+    switch(node->nodeClass) {
+    case UA_NODECLASS_OBJECT:
+        UA_ObjectNode_deleteMembers((UA_ObjectNode *)node);
+        break;
+
+    case UA_NODECLASS_VARIABLE:
+        UA_VariableNode_deleteMembers((UA_VariableNode *)node);
+        break;
+
+    case UA_NODECLASS_METHOD:
+        UA_MethodNode_deleteMembers((UA_MethodNode *)node);
+        break;
+
+    case UA_NODECLASS_OBJECTTYPE:
+        UA_ObjectTypeNode_deleteMembers((UA_ObjectTypeNode *)node);
+        break;
+
+    case UA_NODECLASS_VARIABLETYPE:
+        UA_VariableTypeNode_deleteMembers((UA_VariableTypeNode *)node);
+        break;
+
+    case UA_NODECLASS_REFERENCETYPE:
+        UA_ReferenceTypeNode_deleteMembers((UA_ReferenceTypeNode *)node);
+        break;
+
+    case UA_NODECLASS_DATATYPE:
+        UA_DataTypeNode_deleteMembers((UA_DataTypeNode *)node);
+        break;
+
+    case UA_NODECLASS_VIEW:
+        UA_ViewNode_deleteMembers((UA_ViewNode *)node);
+        break;
+
+    default:
+        UA_assert(UA_FALSE);
+        break;
+    }
+}
+
+/* We are in a rcu_read lock. So the node will not be freed under our feet. */
+static int compare(struct cds_lfht_node *htn, const void *orig) {
+    UA_NodeId *origid = (UA_NodeId *)orig;
+    UA_NodeId *newid  = &((open62541NodeStore_Entry *)htn)->node.nodeId;   /* The htn is first in the entry structure. */
+
+    return UA_NodeId_equal(newid, origid);
+}
+
+/* The entry was removed from the hashtable. No more readers can get it. Since
+   all readers using the node for a longer time (outside the rcu critical
+   section) increased the readcount, we only need to wait for the readcount
+   to reach zero. */
+static void markDead(struct rcu_head *head) {
+    open62541NodeStore_Entry *entry = caa_container_of(head, open62541NodeStore_Entry, rcu_head);
+    if(uatomic_sub_return(&entry->readcount, ALIVE_BIT) > 0)
+        return;
+
+    node_deleteMembers(&entry->node);
+    UA_free(entry);
+    return;
+}
+
+/* Free the entry if it is dead and nobody uses it anymore */
+void open62541NodeStore_release(const UA_Node *managed) {
+    open62541NodeStore_Entry *entry = caa_container_of(managed, open62541NodeStore_Entry, node); // pointer to the first entry
+    if(uatomic_sub_return(&entry->readcount, 1) > 0)
+        return;
+
+    node_deleteMembers(managed);
+    UA_free(entry);
+    return;
+}
+
+UA_StatusCode open62541NodeStore_new(open62541NodeStore **result) {
+    open62541NodeStore *ns;
+    if(!(ns = UA_alloc(sizeof(open62541NodeStore))))
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+
+    /* 32 is the minimum size for the hashtable. */
+    ns->ht = cds_lfht_new(32, 32, 0, CDS_LFHT_AUTO_RESIZE, NULL);
+    if(!ns->ht) {
+        UA_free(ns);
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    }
+
+    *result = ns;
+    return UA_STATUSCODE_GOOD;
+}
+
+void open62541NodeStore_delete(open62541NodeStore *ns) {
+    struct cds_lfht      *ht = ns->ht;
+    struct cds_lfht_iter  iter;
+    struct cds_lfht_node *found_htn;
+
+    rcu_read_lock();
+    cds_lfht_first(ht, &iter);
+    while(iter.node != UA_NULL) {
+        found_htn = cds_lfht_iter_get_node(&iter);
+        if(!cds_lfht_del(ht, found_htn)) {
+            open62541NodeStore_Entry *entry = caa_container_of(found_htn, open62541NodeStore_Entry, htn);
+            call_rcu(&entry->rcu_head, markDead);
+        }
+        cds_lfht_next(ht, &iter);
+    }
+    rcu_read_unlock();
+
+    cds_lfht_destroy(ht, UA_NULL);
+    UA_free(ns);
+}
+
+UA_StatusCode open62541NodeStore_insert(open62541NodeStore *ns, UA_Node **node, UA_Byte flags) {
+    UA_UInt32 nodesize;
+    /* Copy the node into the entry. Then reset the original node. It shall no longer be used. */
+    switch((*node)->nodeClass) {
+    case UA_NODECLASS_OBJECT:
+        nodesize = sizeof(UA_ObjectNode);
+        break;
+
+    case UA_NODECLASS_VARIABLE:
+        nodesize = sizeof(UA_VariableNode);
+        break;
+
+    case UA_NODECLASS_METHOD:
+        nodesize = sizeof(UA_MethodNode);
+        break;
+
+    case UA_NODECLASS_OBJECTTYPE:
+        nodesize = sizeof(UA_ObjectTypeNode);
+        break;
+
+    case UA_NODECLASS_VARIABLETYPE:
+        nodesize = sizeof(UA_VariableTypeNode);
+        break;
+
+    case UA_NODECLASS_REFERENCETYPE:
+        nodesize = sizeof(UA_ReferenceTypeNode);
+        break;
+
+    case UA_NODECLASS_DATATYPE:
+        nodesize = sizeof(UA_DataTypeNode);
+        break;
+
+    case UA_NODECLASS_VIEW:
+        nodesize = sizeof(UA_ViewNode);
+        break;
+
+    default:
+        return UA_STATUSCODE_BADINTERNALERROR;
+    }
+
+    open62541NodeStore_Entry *entry;
+    if(!(entry = UA_alloc(sizeof(open62541NodeStore_Entry) - sizeof(UA_Node) + nodesize)))
+        return UA_STATUSCODE_BADOUTOFMEMORY;
+    memcpy(&entry->node, *node, nodesize);
+
+    cds_lfht_node_init(&entry->htn);
+    entry->readcount = ALIVE_BIT;
+    if(flags & open62541NodeStore_INSERT_GETMANAGED)
+        entry->readcount++;
+
+    hash_t nhash = hash(&(*node)->nodeId);
+    struct cds_lfht_node *result;
+    if(flags & open62541NodeStore_INSERT_UNIQUE) {
+        rcu_read_lock();
+        result = cds_lfht_add_unique(ns->ht, nhash, compare, &entry->node.nodeId, &entry->htn);
+        rcu_read_unlock();
+
+        /* If the nodeid exists already */
+        if(result != &entry->htn) {
+            UA_free(entry);
+            return UA_STATUSCODE_BADNODEIDEXISTS;
+        }
+    } else {
+        rcu_read_lock();
+        result = cds_lfht_add_replace(ns->ht, nhash, compare, &(*node)->nodeId, &entry->htn);
+        /* If an entry got replaced, mark it as dead. */
+        if(result) {
+            open62541NodeStore_Entry *entry = caa_container_of(result, open62541NodeStore_Entry, htn);
+            call_rcu(&entry->rcu_head, markDead);      /* Queue this for the next time when no readers are on the entry.*/
+        }
+        rcu_read_unlock();
+    }
+
+    UA_free((UA_Node *)*node);     /* The old node is replaced by a managed node. */
+    if(flags & open62541NodeStore_INSERT_GETMANAGED)
+        *node = &entry->node;
+    else
+        *node = UA_NULL;
+
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode open62541NodeStore_remove(open62541NodeStore *ns, const UA_NodeId *nodeid) {
+    hash_t nhash = hash(nodeid);
+    struct cds_lfht_iter iter;
+
+    rcu_read_lock();
+    cds_lfht_lookup(ns->ht, nhash, compare, &nodeid, &iter);
+    struct cds_lfht_node *found_htn = cds_lfht_iter_get_node(&iter);
+
+    /* If this fails, then the node has already been removed. */
+    if(!found_htn || cds_lfht_del(ns->ht, found_htn) != 0) {
+        rcu_read_unlock();
+        return UA_STATUSCODE_BADNODEIDUNKNOWN;
+    }
+
+    open62541NodeStore_Entry *entry = caa_container_of(found_htn, open62541NodeStore_Entry, htn);
+    call_rcu(&entry->rcu_head, markDead);
+    rcu_read_unlock();
+
+    return UA_STATUSCODE_GOOD;
+}
+
+UA_StatusCode open62541NodeStore_get(const open62541NodeStore *ns, const UA_NodeId *nodeid, const UA_Node **managedNode) {
+    hash_t nhash = hash(nodeid);
+    struct cds_lfht_iter iter;
+
+    rcu_read_lock();
+    cds_lfht_lookup(ns->ht, nhash, compare, nodeid, &iter);
+    open62541NodeStore_Entry *found_entry = (open62541NodeStore_Entry *)cds_lfht_iter_get_node(&iter);
+
+    if(!found_entry) {
+        rcu_read_unlock();
+        return UA_STATUSCODE_BADNODEIDUNKNOWN;
+    }
+
+    /* This is done within a read-lock. The node will not be marked dead within a read-lock. */
+    uatomic_inc(&found_entry->readcount);
+    rcu_read_unlock();
+
+    *managedNode = &found_entry->node;
+    return UA_STATUSCODE_GOOD;
+}
+
+void open62541NodeStore_iterate(const open62541NodeStore *ns, open62541NodeStore_nodeVisitor visitor) {
+    struct cds_lfht     *ht = ns->ht;
+    struct cds_lfht_iter iter;
+
+    rcu_read_lock();
+    cds_lfht_first(ht, &iter);
+    while(iter.node != UA_NULL) {
+        open62541NodeStore_Entry *found_entry = (open62541NodeStore_Entry *)cds_lfht_iter_get_node(&iter);
+        uatomic_inc(&found_entry->readcount);
+        const UA_Node      *node = &found_entry->node;
+        rcu_read_unlock();
+        visitor(node);
+        open62541NodeStore_release((UA_Node *)node);
+        rcu_read_lock();
+        cds_lfht_next(ht, &iter);
+    }
+    rcu_read_unlock();
+}
+
+

src/server/nodestore/open62541_nodestore.c → src/server/nodestore/open62541_nodestore_core.c


+ 1 - 0
src/server/nodestore/open62541_nodestore_nodemanagement.c

@@ -249,6 +249,7 @@ UA_Int32 open62541NodeStore_AddNodes(UA_AddNodesItem *nodesToAdd,UA_UInt32 *indi
 			}
 			case UA_NODECLASS_OBJECTTYPE:
 			{
+				addNodesResults[indices[i]].statusCode = UA_STATUSCODE_BADNOTIMPLEMENTED;
 				continue;
 				break;
 			}

+ 1 - 19
src/server/ua_nodestore_interface.c

@@ -67,26 +67,8 @@ UA_StatusCode UA_NodeStore_registerBrowseNodesOperation(UA_NodeStore *nodeStore,
 	nodeStore->browseNodes = browseNodes;
 	return UA_STATUSCODE_GOOD;
 }
-/*
-UA_Boolean UA_NodeStore_nodeExists(UA_NodeStore* nodestore, const UA_NodeId *nodeId)
-{
-	UA_DataValue *value;
-	UA_ReadValueId readValueId;
-	readValueId.attributeId = UA_ATTRIBUTEWRITEMASK_NODEID;
-	readValueId.nodeId = nodeId;
-	readValueId.indexRange.data = UA_NULL;
-	readValueId.indexRange.length = 0;
-	UA_NodeStore_readNode r;
-
-	if(nodestore->readNodes(nodeId,readValueId,&value) == UA_SUCCESS &&
-			value->value.storage.data.dataPtr != UA_NULL){
-		return UA_TRUE;
-	}
-	return UA_FALSE;
-
-}
-*/
 
+//add method to add a 'delete nodestore'
 
 
 

+ 1 - 1
src/server/ua_server.c

@@ -1,5 +1,5 @@
 #include "ua_server.h"
-//#include "nodestore/ua_nodestoreExample.h"
+
 #include "ua_services_internal.h" // AddReferences
 #include "ua_namespace_0.h"
 #include "ua_securechannel_manager.h"

+ 90 - 1
src/server/ua_services_attribute.c

@@ -457,8 +457,97 @@ void Service_Write(UA_Server *server, UA_Session *session,
 		return;
 	}
 
+	if (request->nodesToWriteSize <= 0) {
+		response->responseHeader.serviceResult = UA_STATUSCODE_BADNOTHINGTODO;
+		return;
+	}
+
+	if (UA_Array_new((void **) &response->results, request->nodesToWriteSize,
+			&UA_[UA_DATAVALUE]) != UA_STATUSCODE_GOOD) {
+		response->responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
+		return;
+	}
+
+	if (UA_Array_new((void **) &response->diagnosticInfos,
+			request->nodesToWriteSize, &UA_[UA_DIAGNOSTICINFO])
+			!= UA_STATUSCODE_GOOD) {
+		response->responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
+		return;
+	}
 	response->resultsSize = request->nodesToWriteSize;
-	for (UA_Int32 i = 0; i < request->nodesToWriteSize; i++){}
+
+	UA_Int32 *numberOfFoundIndices;
+	UA_UInt16 *associatedIndices;
+	UA_UInt32 differentNamespaceIndexCount = 0;
+	if (UA_Array_new((void **) &numberOfFoundIndices, request->nodesToWriteSize,
+			&UA_[UA_UINT32]) != UA_STATUSCODE_GOOD) {
+		response->responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
+		return;
+	}
+
+	if (UA_Array_new((void **) &associatedIndices, request->nodesToWriteSize,
+			&UA_[UA_UINT16]) != UA_STATUSCODE_GOOD) {
+		response->responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
+		return;
+	}
+	// find out count of different namespace indices
+
+	for (UA_Int32 i = 0; i < request->nodesToWriteSize; i++) {
+		//for(UA_UInt32 j = 0; j <= differentNamespaceIndexCount; j++){
+		UA_UInt32 j = 0;
+		do {
+			if (associatedIndices[j]
+					== request->nodesToWrite[i].nodeId.namespaceIndex) {
+				if (differentNamespaceIndexCount == 0) {
+					differentNamespaceIndexCount++;
+				}
+				numberOfFoundIndices[j]++;
+				break;
+			} else if (j == (differentNamespaceIndexCount - 1)) {
+				associatedIndices[j + 1] =
+						request->nodesToWrite[i].nodeId.namespaceIndex;
+				associatedIndices[j + 1] = 1;
+				differentNamespaceIndexCount++;
+				break;
+			}
+			j++;
+		} while (j <= differentNamespaceIndexCount);
+	}
+
+	UA_UInt32 *readValueIdIndices;
+	if (UA_Array_new((void **) &readValueIdIndices, request->nodesToWriteSize,
+			&UA_[UA_UINT32]) != UA_STATUSCODE_GOOD) {
+		response->responseHeader.serviceResult = UA_STATUSCODE_BADOUTOFMEMORY;
+		return;
+	}
+
+	for (UA_UInt32 i = 0; i < differentNamespaceIndexCount; i++) {
+		UA_Namespace *tmpNamespace;
+		UA_NamespaceManager_getNamespace(server->namespaceManager,
+				associatedIndices[i], &tmpNamespace);
+		if (tmpNamespace != UA_NULL) {
+
+			//build up index array for each read operation onto a different namespace
+			UA_UInt32 n = 0;
+			for (UA_Int32 j = 0; j < request->nodesToWriteSize; j++) {
+				if (request->nodesToWrite[j].nodeId.namespaceIndex
+						== associatedIndices[i]) {
+					readValueIdIndices[n] = j;
+					n++;
+				}
+			}
+			//call read for every namespace
+			tmpNamespace->nodeStore->writeNodes(request->nodesToWrite,
+					readValueIdIndices, numberOfFoundIndices[i],
+					response->results,
+					response->diagnosticInfos);
+		}
+	}
+	UA_free(readValueIdIndices);
+	UA_free(numberOfFoundIndices);
+	UA_free(associatedIndices);
+	//response->resultsSize = request->nodesToWriteSize;
+	//for (UA_Int32 i = 0; i < request->nodesToWriteSize; i++){}
 	//	response->results[i] = Service_Write_writeNode(server,
 	//			&request->nodesToWrite[i]);
 }