Changeset: 94d22c8ce2eb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=94d22c8ce2eb
Modified Files:
monetdb5/extras/rdf/Makefile.ag
monetdb5/modules/mal/tokenizer.c
Branch: lodrdf
Log Message:
Change mal_set_lock() to the MT_lock_set() since mal_set_lock is not used any
more.
Modify the makefile to add algebra library
diffs (40 lines):
diff --git a/monetdb5/extras/rdf/Makefile.ag b/monetdb5/extras/rdf/Makefile.ag
--- a/monetdb5/extras/rdf/Makefile.ag
+++ b/monetdb5/extras/rdf/Makefile.ag
@@ -16,6 +16,7 @@
# All Rights Reserved.
INCLUDES = ../../modules/atoms ../../modules/mal ../../mal \
+ ../../modules/kernel \
../../../clients/mapilib \
../../../common/options \
../../../common/stream \
diff --git a/monetdb5/modules/mal/tokenizer.c b/monetdb5/modules/mal/tokenizer.c
--- a/monetdb5/modules/mal/tokenizer.c
+++ b/monetdb5/modules/mal/tokenizer.c
@@ -94,9 +94,9 @@ TKNZRopen(int *ret, str *in)
throw(MAL, "tokenizer.open",
ILLEGAL_ARGUMENT " tokenizer name too long");
- mal_set_lock(mal_contextLock,"tokenizer");
+ MT_lock_set(&mal_contextLock,"tokenizer");
if (TRANS != NULL) {
- mal_unset_lock(mal_contextLock,"tokenizer");
+ MT_lock_unset(&mal_contextLock,"tokenizer");
throw(MAL, "tokenizer.open", "Another tokenizer is already
open");
}
@@ -107,11 +107,11 @@ TKNZRopen(int *ret, str *in)
TRANS = BATnew(TYPE_void, TYPE_str, MAX_TKNZR_DEPTH+1);
if (TRANS == NULL) {
- mal_unset_lock(mal_contextLock,"tokenizer");
+ MT_lock_unset(&mal_contextLock,"tokenizer");
throw(MAL, "tokenizer.open", MAL_MALLOC_FAIL);
}
/* now we are sure that none overwrites the tokenizer table*/
- mal_unset_lock(mal_contextLock,"tokenizer");
+ MT_lock_unset(&mal_contextLock,"tokenizer");
BATseqbase(TRANS, 0);
snprintf(name, 128, "%s", *in);
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
