MonetDB: k3match-jun2016 - fixes for compilation, tests worka ga...

[Hannes Muehleisen]

Changeset: 8c39d7692fbb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8c39d7692fbb
Modified Files:
        sql/backends/monet5/Makefile.ag
        sql/backends/monet5/k3m/k3m.c
Branch: k3match-jun2016
Log Message:

fixes for compilation, tests worka gain, praise something


diffs (51 lines):

diff --git a/sql/backends/monet5/Makefile.ag b/sql/backends/monet5/Makefile.ag
--- a/sql/backends/monet5/Makefile.ag
+++ b/sql/backends/monet5/Makefile.ag
@@ -4,7 +4,7 @@
 #
 # Copyright 1997 - July 2008 CWI, August 2008 - 2016 MonetDB B.V.
 
-SUBDIRS = NOT_WIN32?vaults UDF LSST HAVE_GSL?gsl generator
+SUBDIRS = NOT_WIN32?vaults UDF LSST HAVE_GSL?gsl generator HAVE_K3M?k3m
 
 INCLUDES = ../../include ../../common ../../storage ../../server \
                   ../../../monetdb5/modules/atoms \
diff --git a/sql/backends/monet5/k3m/k3m.c b/sql/backends/monet5/k3m/k3m.c
--- a/sql/backends/monet5/k3m/k3m.c
+++ b/sql/backends/monet5/k3m/k3m.c
@@ -63,7 +63,7 @@ str K3Mbuild(Client cntxt, MalBlkPtr mb,
        bit newtree = !k3m_tree;
        k3m_tree_tpe *k3m_tree_alloc = NULL;
        (void) cntxt;
-       MT_lock_set(&k3m_lock, "K3Mbuild");
+       MT_lock_set(&k3m_lock);
 
        if (!isaBatType(getArgType(mb,pci,0)) || 
!isaBatType(getArgType(mb,pci,1)) ||
                        !isaBatType(getArgType(mb,pci,2)) || 
!isaBatType(getArgType(mb,pci,3))) {
@@ -158,7 +158,7 @@ str K3Mbuild(Client cntxt, MalBlkPtr mb,
                        k3m_tree->tree = k3m_insert_node(k3m_tree->tree, 
&k3m_tree_alloc->tree[i]);
                }
        }
-       MT_lock_unset(&k3m_lock, "K3Mbuild");
+       MT_lock_unset(&k3m_lock);
        ret = BATnew(TYPE_void, TYPE_bit, 0, TRANSIENT);
        BUNappend(ret, &b, 0);
        *getArgReference_bat(stk, pci, 0) = ret->batCacheid;
@@ -179,7 +179,7 @@ str K3Mfree(Client cntxt, MalBlkPtr mb, 
        (void) stk;
        (void) pci;
 
-       MT_lock_set(&k3m_lock, "K3Mfree");
+       MT_lock_set(&k3m_lock);
 
        for (i = 0; i < k3m_allocs_pos; i++) {
                GDKfree(k3m_allocs[i]->tree);
@@ -192,7 +192,7 @@ str K3Mfree(Client cntxt, MalBlkPtr mb, 
        k3m_allocs_size = K3M_ALLOCS_DEFAULT_SIZE;
        k3m_tree = NULL;
 
-       MT_lock_unset(&k3m_lock, "K3Mfree");
+       MT_lock_unset(&k3m_lock);
 
        ret = BATnew(TYPE_void, TYPE_bit, 0, TRANSIENT);
        BUNappend(ret, &b, 0);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list