Changeset: 32403e2ff683 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=32403e2ff683
Modified Files:
        monetdb5/mal/mal.h
        sql/backends/monet5/UDF/capi/capi.c
Branch: Apr2019
Log Message:

Cleanup: remove unused lock, statically initialize static lock.


diffs (31 lines):

diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -243,7 +243,6 @@ typedef struct MALSTK {
         */
        DFhook admit;
        DFhook wrapup;
-       MT_Lock stklock;        /* used for parallel processing */
 
 /*
  * It is handy to administer the timing in the stack frame
diff --git a/sql/backends/monet5/UDF/capi/capi.c 
b/sql/backends/monet5/UDF/capi/capi.c
--- a/sql/backends/monet5/UDF/capi/capi.c
+++ b/sql/backends/monet5/UDF/capi/capi.c
@@ -63,7 +63,7 @@ typedef struct _cached_functions {
 #define FUNCTION_CACHE_SIZE 128
 
 static cached_functions *function_cache[FUNCTION_CACHE_SIZE];
-static MT_Lock cache_lock;
+static MT_Lock cache_lock = MT_LOCK_INITIALIZER("cache_lock");
 static int cudf_initialized = 0;
 
 static str CUDFeval(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci,
@@ -83,7 +83,6 @@ str CUDFprelude(void *ret)
 {
        (void)ret;
        if (!cudf_initialized) {
-               MT_lock_init(&cache_lock, "cache_lock");
                cudf_initialized = true;
                option_enable_mprotect = GDKgetenv_istrue(mprotect_enableflag) 
|| GDKgetenv_isyes(mprotect_enableflag);
                option_enable_longjmp = GDKgetenv_istrue(longjmp_enableflag) || 
GDKgetenv_isyes(longjmp_enableflag);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to