Changeset: f87be3882c09 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f87be3882c09
Modified Files:
Branch: default
Log Message:
merge from default
diffs (96 lines):
diff -r a7fe22be9c36 -r f87be3882c09 MonetDB/src/gdk/gdk_bbp.mx
--- a/MonetDB/src/gdk/gdk_bbp.mx Tue May 11 23:35:28 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bbp.mx Wed May 12 09:11:26 2010 +0200
@@ -1907,6 +1907,7 @@
b = BBPquickdesc(i, TRUE);
if (b && destroy) {
+ BATaccessBegin(b, USE_HEAD | USE_TAIL, MMAP_DONTNEED);
BBPdestroy(b); /* free memory (if loaded) and delete
from disk (if transient but saved) */
} else if (b) {
BATDEBUG {
diff -r a7fe22be9c36 -r f87be3882c09 MonetDB/src/gdk/gdk_posix.mx
--- a/MonetDB/src/gdk/gdk_posix.mx Tue May 11 23:35:28 2010 +0200
+++ b/MonetDB/src/gdk/gdk_posix.mx Wed May 12 09:11:26 2010 +0200
@@ -954,6 +954,10 @@
MT_mmap_tab[i].writable = (writable > 0);
MT_mmap_tab[i].random += preload * (advice == MMAP_WILLNEED);
/* done as a counter to keep track of multiple threads */
MT_mmap_tab[i].usecnt += preload; /* active thread count
*/
+ if ( advice == MMAP_DONTNEED){
+ ret = posix_madvise(MT_mmap_tab[i].base,
MT_mmap_tab[i].len & ~(MT_pagesize() - 1), MMAP_DONTNEED);
+ MT_mmap_tab[i].usecnt = 0;
+ } else
if (MT_mmap_tab[i].usecnt == 0)
ret = posix_madvise(MT_mmap_tab[i].base,
MT_mmap_tab[i].len & ~(MT_pagesize() - 1), MMAP_SEQUENTIAL);
}
diff -r a7fe22be9c36 -r f87be3882c09 MonetDB/src/gdk/gdk_storage.mx
--- a/MonetDB/src/gdk/gdk_storage.mx Tue May 11 23:35:28 2010 +0200
+++ b/MonetDB/src/gdk/gdk_storage.mx Wed May 12 09:11:26 2010 +0200
@@ -732,7 +732,7 @@
access_heap(str id, str hp, Heap *h, char *base, size_t sz, size_t touch, int
preload, int adv)
{
size_t v0 = 0, v1 = 0, v2 = 0, v3 = 0, v4 = 0, v5 = 0, v6 = 0, v7 = 0,
page = MT_pagesize();
- str advice = (adv == MMAP_WILLNEED) ? "WILLNEED" : (adv ==
MMAP_SEQUENTIAL) ? "SEQUENTIAL" : (adv == MMAP_RANDOM) ? "RANDOM" : (adv ==
MMAP_NORMAL) ? "NORMAL" : NULL;
+ str advice = (adv == MMAP_WILLNEED) ? "WILLNEED" : (adv ==
MMAP_SEQUENTIAL) ? "SEQUENTIAL" : (adv == MMAP_RANDOM) ? "RANDOM" : (adv ==
MMAP_NORMAL) ? "NORMAL" : (adv == MMAP_DONTNEED)? "DONTNEED":NULL;
int t = GDKms();
assert(advice);
/* ignore claims of pages beyond 1/4 the physical memory */
diff -r a7fe22be9c36 -r f87be3882c09 MonetDB5/src/mal/Tests/All
--- a/MonetDB5/src/mal/Tests/All Tue May 11 23:35:28 2010 +0200
+++ b/MonetDB5/src/mal/Tests/All Wed May 12 09:11:26 2010 +0200
@@ -80,7 +80,7 @@
tst110
tst115
tst1150
-tst120
+#tst120 files are not located in module and paths are runtime dependent
tst1200
tst1201
tst1202
diff -r a7fe22be9c36 -r f87be3882c09
MonetDB5/src/mal/Tests/tst274.stable.out.oid64
--- a/MonetDB5/src/mal/Tests/tst274.stable.out.oid64 Tue May 11 23:35:28
2010 +0200
+++ b/MonetDB5/src/mal/Tests/tst274.stable.out.oid64 Wed May 12 09:11:26
2010 +0200
@@ -64,6 +64,7 @@
profiler.activate("stmt");
profiler.activate("rbytes");
profiler.activate("wbytes");
+ profiler.activate("disk");
profiler.setAll();
profiler.start();
io.printf("#monitor \n");
diff -r a7fe22be9c36 -r f87be3882c09 MonetDB5/src/modules/kernel/batmtime.mx
--- a/MonetDB5/src/modules/kernel/batmtime.mx Tue May 11 23:35:28 2010 +0200
+++ b/MonetDB5/src/modules/kernel/batmtime.mx Wed May 12 09:11:26 2010 +0200
@@ -467,14 +467,6 @@
@:baselineCode(timestamp,GT)@
@:baselineCode(timestamp,GE)@
-...@-
-@:implCmpOp(timestamp,==,EQ)@
-@:implCmpOp(timestamp,!=,NEQ)@
-@:implCmpOp(timestamp,<,LT)@
-@:implCmpOp(timestamp,<=,LE)@
-@:implCmpOp(timestamp,>,GT)@
-@:implCmpOp(timestamp,>=,GE)@
-
@= accumUnaryISNIL
{
@1 *p = (@1*)Tloc(b,BUNfirst(b));
@@ -497,7 +489,7 @@
@:getBATdescriptor(bid,b,"batcalc.isnil")@
@:voidresultBAT(TYPE_bit,"batcalc.isnil")@
- o = (bit*)Tloc(bn,BUNfirst(bn));
+ o = (bit*)Tloc(bn,BUNfirst(bn));
if ( BATttype(b) == TYPE_date) {
@:accumUnaryISNIL(date)@
} else
@@ -508,7 +500,7 @@
@:accumUnaryISNIL(timestamp)@
}
- BATsetcount(bn, BATcount(b));
+ BATsetcount(bn, BATcount(b));
bn->tsorted = 0;
BATkey(BATmirror(bn),FALSE);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
