Changeset: 0d169bd31df2 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d169bd31df2
Modified Files:
buildtools/autogen/setup.py
clients/R/MonetDB.R/R/dplyr.R
clients/odbc/driver/Copyright
gdk/gdk_system.c
gdk/gdk_system.h
monetdb5/optimizer/opt_mitosis.c
testing/malcheck.py
Branch: geo
Log Message:
Merge with default branch.
diffs (124 lines):
diff --git a/buildtools/autogen/setup.py b/buildtools/autogen/setup.py
--- a/buildtools/autogen/setup.py
+++ b/buildtools/autogen/setup.py
@@ -16,6 +16,6 @@ setup(name = "autogen",
url = "http://www.monetdb.org/";,
maintainer = "Sjoerd Mullender",
maintainer_email = "i...@monetdb.org",
- license = "MonetDB Public License",
+ license = "Mozilla Public License, v. 2.0",
packages = ['autogen'],
scripts = ['autogen.py'])
diff --git a/clients/odbc/driver/Copyright b/clients/odbc/driver/Copyright
--- a/clients/odbc/driver/Copyright
+++ b/clients/odbc/driver/Copyright
@@ -7,7 +7,7 @@ The original code is licensed under the
General Public License, Version 2, June 1991), and therefore the code
in this directory is also licensed under the LPGL (see the file
COPYING in this directory), unlike the other directories in this
-project which are under the MonetDB Public License.
+project which are under the Mozilla Public License, v. 2.0.
All original files have been modified, often heavily, and some have
been deleted since they were originally copied in June 2001. The
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -90,11 +90,11 @@ sortlocklist(MT_Lock *l)
* start of unprocessed part of left and right lists */
t = ll = NULL;
while (l && r) {
- if (l->contention < r->contention ||
- (l->contention == r->contention &&
- l->sleep < r->sleep) ||
- (l->contention == r->contention &&
- l->sleep == r->sleep &&
+ if (l->sleep < r->sleep ||
+ (l->sleep == r->sleep &&
+ l->contention < r->contention) ||
+ (l->sleep == r->sleep &&
+ l->contention == r->contention &&
l->count <= r->count)) {
/* l is smaller */
if (ll == NULL) {
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -210,16 +210,13 @@ gdk_export ATOMIC_TYPE volatile GDKlocks
do { \
TEMDEBUG fprintf(stderr, "#lock %s contention in %s\n",
(l)->name, n); \
(void) ATOMIC_INC(GDKlockcontentioncnt, dummy, n); \
+ (l)->contention++; \
} while (0)
#define _DBG_LOCK_SLEEP(l, n) \
do { \
if (_spincnt == 1024) \
(void) ATOMIC_INC(GDKlocksleepcnt, dummy, n); \
- } while (0)
-#define _DBG_LOCK_COUNT_1(l) \
- do { \
- (l)->contention++; \
- (l)->sleep += _spincnt >= 1024; \
+ (l)->sleep++; \
} while (0)
#define _DBG_LOCK_COUNT_2(l) \
do { \
@@ -282,7 +279,6 @@ gdk_export ATOMIC_TYPE volatile GDKlocks
#define _DBG_LOCK_COUNT_0(l, n) ((void) (n))
#define _DBG_LOCK_CONTENTION(l, n) ((void) (n))
#define _DBG_LOCK_SLEEP(l, n) ((void) (n))
-#define _DBG_LOCK_COUNT_1(l) ((void) 0)
#define _DBG_LOCK_COUNT_2(l) ((void) 0)
#define _DBG_LOCK_INIT(l, n) ((void) (n))
#define _DBG_LOCK_DESTROY(l) ((void) 0)
@@ -300,10 +296,9 @@ gdk_export ATOMIC_TYPE volatile GDKlocks
do { \
if (++_spincnt >= 1024) { \
_DBG_LOCK_SLEEP(l, n); \
- MT_sleep_ms(_spincnt >> 10); \
+ MT_sleep_ms(1); \
} \
} while (ATOMIC_TAS((l)->lock, dummy, n) != 0); \
- _DBG_LOCK_COUNT_1(l); \
} \
_DBG_LOCK_LOCKER(l, n); \
_DBG_LOCK_COUNT_2(l); \
diff --git a/monetdb5/optimizer/opt_mitosis.c b/monetdb5/optimizer/opt_mitosis.c
--- a/monetdb5/optimizer/opt_mitosis.c
+++ b/monetdb5/optimizer/opt_mitosis.c
@@ -1,20 +1,9 @@
/*
- * The contents of this file are subject to the MonetDB Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.monetdb.org/Legal/MonetDBLicense
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
- * License for the specific language governing rights and limitations
- * under the License.
- *
- * The Original Code is the MonetDB Database System.
- *
- * The Initial Developer of the Original Code is CWI.
- * Portions created by CWI are Copyright (C) 1997-July 2008 CWI.
- * Copyright August 2008-2015 MonetDB B.V.
- * All Rights Reserved.
+ * Copyright 2008-2015 MonetDB B.V.
*/
#include "monetdb_config.h"
diff --git a/testing/malcheck.py b/testing/malcheck.py
--- a/testing/malcheck.py
+++ b/testing/malcheck.py
@@ -50,6 +50,7 @@ pdecls = {}
def process(f):
data = open(f).read()
if f.endswith('.mal'):
+ data = re.sub(r'[ \t]*#.*', '', data) # remove comments
res = comreg.search(data)
while res is not None:
malf, args, rets, func = res.groups()
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
