commit febcbfbd723369c184c24789cb1e28f5132085b8
author Radek Krejci <rkrejci@cesnet.cz> Thu Feb 04 14:58:42 2016 +0100
committer Radek Krejci <rkrejci@cesnet.cz> Thu Feb 04 14:58:42 2016 +0100
tree 266e074317da881d2daeeb8ce1fcd48e0b98c57e
parent 38095d44c1a3557d502aed44fa00ece189933f6d

dict CHANGE make dictionary thread-safe

Make possible parsing of different data trees in multiple threads,
so far there could be collision on context's dictionary.

src/dict.c

diff --git a/src/dict.c b/src/dict.c
index 963665a..fb1f1eb 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <stdlib.h>
+#include <pthread.h>
 
 #include "common.h"
 #include "context.h"
@@ -36,6 +37,7 @@
     }
 
     dict->hash_mask = DICT_SIZE - 1;
+    pthread_mutex_init(&dict->lock, NULL);
 }
 
 void
@@ -62,6 +64,8 @@
             free(rec);
         }
     }
+
+    pthread_mutex_destroy(&dict->lock);
 }
 
 /*
@@ -99,6 +103,8 @@
 
     len = strlen(value);
 
+    pthread_mutex_lock(&ctx->dict.lock);
+
     index = dict_hash(value, len) & ctx->dict.hash_mask;
     record = &ctx->dict.recs[index];
 
@@ -109,6 +115,7 @@
 
     if (!record) {
         /* record not found */
+        pthread_mutex_unlock(&ctx->dict.lock);
         return;
     }
 
@@ -135,6 +142,8 @@
             memset(record, 0, sizeof *record);
         }
     }
+
+    pthread_mutex_unlock(&ctx->dict.lock);
 }
 
 static char *
@@ -218,6 +227,8 @@
 API const char *
 lydict_insert(struct ly_ctx *ctx, const char *value, size_t len)
 {
+    const char *result;
+
     if (value && !len) {
         len = strlen(value);
     }
@@ -225,14 +236,26 @@
     if (!value) {
         return NULL;
     }
-    return dict_insert(ctx, (char *)value, len, 0);
+
+    pthread_mutex_lock(&ctx->dict.lock);
+    result = dict_insert(ctx, (char *)value, len, 0);
+    pthread_mutex_unlock(&ctx->dict.lock);
+
+    return result;
 }
 
 API const char *
 lydict_insert_zc(struct ly_ctx *ctx, char *value)
 {
+    const char *result;
+
     if (!value) {
         return NULL;
     }
-    return dict_insert(ctx, value, strlen(value), 1);
+
+    pthread_mutex_lock(&ctx->dict.lock);
+    result = dict_insert(ctx, value, strlen(value), 1);
+    pthread_mutex_unlock(&ctx->dict.lock);
+
+    return result;
 }