Changeset: 93153bff6179 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=93153bff6179
Modified Files:
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_relop.mx
gdk/gdk_setop.mx
monetdb5/modules/atoms/batxml.c
monetdb5/modules/kernel/aggr_be_avg.mx
monetdb5/modules/kernel/aggr_be_count.mx
monetdb5/modules/kernel/aggr_be_minmax.mx
monetdb5/modules/kernel/aggr_be_prod.mx
monetdb5/modules/kernel/aggr_be_sum.mx
monetdb5/modules/kernel/aggr_bge_avg.mx
monetdb5/modules/kernel/aggr_bge_count.mx
monetdb5/modules/kernel/aggr_bge_minmax.mx
monetdb5/modules/kernel/aggr_bge_prod.mx
monetdb5/modules/kernel/aggr_bge_sum.mx
monetdb5/modules/kernel/aggr_ri.mx
monetdb5/modules/kernel/algebra.mx
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/batcolor.c
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/kernel/group.mx
monetdb5/modules/mal/cluster.c
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/zorder.c
sql/backends/monet5/LSST/lsst.c
sql/backends/monet5/UDF/udf.c
sql/backends/monet5/sql.mx
Branch: default
Log Message:
Removed dummy calls to BATaccessBegin and BATaccessEnd.
These calls are dummies since changeset 4418cfd55eb8. They were
introduced because of flawed reasoning or incomplete understanding of
what the underlying system calls do.
diffs (truncated from 4792 to 300 lines):
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1165,9 +1165,7 @@ gdk_export bte ATOMelmshift(int sz);
if ((b)->HT->width < SIZEOF_VAR_T && \
((b)->HT->width <= 2 ? _d - GDK_VAROFFSET : _d) >=
((size_t) 1 << (8 * (b)->HT->width))) { \
/* doesn't fit in current heap, upgrade it */ \
- BATaccessBegin(b, USE_HEAD, MMAP_SEQUENTIAL); \
GDKupgradevarheap((b)->HT, _d, (copyall)); \
- BATaccessEnd(b, USE_HEAD, MMAP_SEQUENTIAL); \
} \
_ptr = (p); \
switch ((b)->HT->width) { \
@@ -1597,8 +1595,6 @@ gdk_export int GDK_mem_pagebits; /* page
#define USE_THASH 8 /* hash index */
#define USE_ALL (USE_HEAD|USE_TAIL|USE_HHASH|USE_THASH)
-#define BATaccessBegin(b,what,advice) ((void) 0)
-#define BATaccessEnd(b,what,advice) ((void) 0)
gdk_export BAT *BATsave(BAT *b);
gdk_export int BATmmap(BAT *b, int hb, int tb, int hh, int th, int force);
gdk_export int BATmadvise(BAT *b, int hb, int tb, int hh, int th);
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -1728,7 +1728,6 @@ void_replace_bat(BAT *b, BAT *u, bit for
BUN r, s;
BATiter ui = bat_iterator(u);
- BATaccessBegin(u, USE_HEAD | USE_TAIL, MMAP_SEQUENTIAL);
BATloop(u, r, s) {
oid updid = *(oid *) BUNhead(ui, r);
const void *val = BUNtail(ui, r);
@@ -1737,7 +1736,6 @@ void_replace_bat(BAT *b, BAT *u, bit for
return BUN_NONE;
nr++;
}
- BATaccessEnd(u, USE_HEAD | USE_TAIL, MMAP_SEQUENTIAL);
return nr;
}
@@ -2905,7 +2903,6 @@ BATassertHeadProps(BAT *b)
int cmpprv = b->hsorted | b->hrevsorted | b->hkey;
int cmpnil = b->H->nonil | b->H->nil;
- BATaccessBegin(b, USE_HEAD, MMAP_SEQUENTIAL);
BATloop(b, p, q) {
valp = BUNhead(bi, p);
if (prev && cmpprv) {
@@ -2938,7 +2935,6 @@ BATassertHeadProps(BAT *b)
}
prev = valp;
}
- BATaccessEnd(b, USE_HEAD, MMAP_SEQUENTIAL);
} else { /* b->hkey && !b->hsorted && !b->hrevsorted */
/* we need to check for uniqueness the hard
* way (i.e. using a hash table) */
@@ -3119,7 +3115,6 @@ BATderiveHeadProps(BAT *b, int expensive
key = 1;
sorted = revsorted = (BATatoms[b->htype].linear != 0);
dense = (b->htype == TYPE_oid);
- BATaccessBegin(b, USE_HEAD, MMAP_SEQUENTIAL);
/* if no* props already set correctly, we can maybe speed
* things up, if not set correctly, reset them now and set
* them later */
@@ -3249,7 +3244,6 @@ BATderiveHeadProps(BAT *b, int expensive
hs->hash[prb] = p;
}
}
- BATaccessEnd(b, USE_HEAD, MMAP_SEQUENTIAL);
if (hs) {
if (hp->storage == STORE_MEM)
HEAPfree(hp);
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -308,8 +308,6 @@ BATins(BAT *b, BAT *n, bit force)
(BATcount(n) && n->ttype != TYPE_void && !n->tdense))) {
BAThash(BATmirror(b), BATcount(b) + BATcount(n));
}
- BATaccessBegin(b, USE_HHASH | USE_THASH, MMAP_WILLNEED);
- BATaccessBegin(n, USE_HEAD | USE_TAIL, MMAP_SEQUENTIAL);
b->batDirty = 1;
if (fastpath) {
BUN p, q, r = BUNlast(b);
@@ -418,8 +416,6 @@ BATins(BAT *b, BAT *n, bit force)
}
res = b;
bunins_failed:
- BATaccessEnd(b, USE_HHASH | USE_THASH, MMAP_WILLNEED);
- BATaccessEnd(n, USE_HEAD | USE_TAIL, MMAP_SEQUENTIAL);
if (tmp)
BBPreclaim(tmp);
return res;
@@ -447,8 +443,6 @@ BATappend(BAT *b, BAT *n, bit force)
}
b->batDirty = 1;
- BATaccessBegin(b, USE_HHASH | USE_THASH, MMAP_WILLNEED);
- BATaccessBegin(n, USE_HEAD | USE_TAIL, MMAP_SEQUENTIAL);
if (sz > BATcapacity(b) - BUNlast(b)) {
/* if needed space exceeds a normal growth extend just
@@ -669,12 +663,8 @@ BATappend(BAT *b, BAT *n, bit force)
}
b->H->nonil &= n->H->nonil;
b->T->nonil &= n->T->nonil;
- BATaccessEnd(b, USE_HHASH | USE_THASH, MMAP_WILLNEED);
- BATaccessEnd(n, USE_HEAD | USE_TAIL, MMAP_SEQUENTIAL);
return b;
bunins_failed:
- BATaccessEnd(b, USE_HHASH | USE_THASH, MMAP_WILLNEED);
- BATaccessEnd(n, USE_HEAD | USE_TAIL, MMAP_SEQUENTIAL);
return NULL;
}
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -2364,13 +2364,6 @@ decref(bat i, int logical, int releaseSh
int destroy = BBP_lrefs(i) == 0 && (BBP_status(i) & BBPDELETED)
== 0;
if (b && destroy) {
- int flag = 0;
- if (b->H->heap.parentid == 0)
- flag |= USE_HEAD;
- if (b->T->heap.parentid == 0)
- flag |= USE_TAIL;
- if (flag)
- BATaccessBegin(b, flag, MMAP_DONTNEED);
BBPdestroy(b); /* free memory (if loaded) and delete
from disk (if transient but saved) */
} else if (b) {
BATDEBUG {
diff --git a/gdk/gdk_calc.c b/gdk/gdk_calc.c
--- a/gdk/gdk_calc.c
+++ b/gdk/gdk_calc.c
@@ -123,8 +123,6 @@ BATcalcnot(BAT *b)
if (bn == NULL)
return NULL;
- BATaccessBegin(b, USE_TAIL, MMAP_SEQUENTIAL);
-
switch (ATOMstorage(b->T->type)) {
case TYPE_bte:
if (b->T->type == TYPE_bit) {
@@ -148,8 +146,6 @@ BATcalcnot(BAT *b)
return NULL;
}
- BATaccessEnd(b, USE_TAIL, MMAP_SEQUENTIAL);
-
BATsetcount(bn, b->U->count);
bn = BATseqbase(bn, b->H->seq);
@@ -242,8 +238,6 @@ BATcalcnegate(BAT *b)
if (bn == NULL)
return NULL;
- BATaccessBegin(b, USE_TAIL, MMAP_SEQUENTIAL);
-
switch (ATOMstorage(b->T->type)) {
case TYPE_bte:
UNARY_2TYPE_FUNC(bte, bte, NEGATE);
@@ -269,8 +263,6 @@ BATcalcnegate(BAT *b)
return NULL;
}
- BATaccessEnd(b, USE_TAIL, MMAP_SEQUENTIAL);
-
BATsetcount(bn, b->U->count);
bn = BATseqbase(bn, b->H->seq);
@@ -372,8 +364,6 @@ BATcalcabsolute(BAT *b)
if (bn == NULL)
return NULL;
- BATaccessBegin(b, USE_TAIL, MMAP_SEQUENTIAL);
-
switch (ATOMstorage(b->T->type)) {
case TYPE_bte:
UNARY_2TYPE_FUNC(bte, bte, ABSOLUTE);
@@ -400,8 +390,6 @@ BATcalcabsolute(BAT *b)
return NULL;
}
- BATaccessEnd(b, USE_TAIL, MMAP_SEQUENTIAL);
-
BATsetcount(bn, b->U->count);
bn = BATseqbase(bn, b->H->seq);
@@ -501,8 +489,6 @@ BATcalciszero(BAT *b)
if (bn == NULL)
return NULL;
- BATaccessBegin(b, USE_TAIL, MMAP_SEQUENTIAL);
-
switch (ATOMstorage(b->T->type)) {
case TYPE_bte:
UNARY_2TYPE_FUNC(bte, bit, ISZERO);
@@ -529,8 +515,6 @@ BATcalciszero(BAT *b)
return NULL;
}
- BATaccessEnd(b, USE_TAIL, MMAP_SEQUENTIAL);
-
BATsetcount(bn, b->U->count);
bn = BATseqbase(bn, b->H->seq);
@@ -628,8 +612,6 @@ BATcalcsign(BAT *b)
if (bn == NULL)
return NULL;
- BATaccessBegin(b, USE_TAIL, MMAP_SEQUENTIAL);
-
switch (ATOMstorage(b->T->type)) {
case TYPE_bte:
UNARY_2TYPE_FUNC(bte, bte, SIGN);
@@ -656,8 +638,6 @@ BATcalcsign(BAT *b)
return NULL;
}
- BATaccessEnd(b, USE_TAIL, MMAP_SEQUENTIAL);
-
BATsetcount(bn, b->U->count);
bn = BATseqbase(bn, b->H->seq);
@@ -777,8 +757,6 @@ BATcalcisnil(BAT *b)
dst = (bit *) Tloc(bn, bn->U->first);
- BATaccessBegin(b, USE_TAIL, MMAP_SEQUENTIAL);
-
t = b->T->type;
nil = ATOMnilptr(t);
atomcmp = BATatoms[t].atomCmp;
@@ -819,8 +797,6 @@ BATcalcisnil(BAT *b)
}
}
- BATaccessEnd(b, USE_TAIL, MMAP_SEQUENTIAL);
-
BATsetcount(bn, b->U->count);
bn = BATseqbase(bn, b->H->seq);
@@ -1760,17 +1736,11 @@ BATcalcadd(BAT *b1, BAT *b2, int tp, int
if (bn == NULL)
return NULL;
- BATaccessBegin(b1, USE_TAIL, MMAP_SEQUENTIAL);
- BATaccessBegin(b2, USE_TAIL, MMAP_SEQUENTIAL);
-
nils = add_typeswitchloop(Tloc(b1, b1->U->first), b1->T->type, 1,
Tloc(b2, b2->U->first), b2->T->type, 1,
Tloc(bn, bn->U->first), tp,
b1->U->count, abort_on_error, "BATcalcadd");
- BATaccessEnd(b1, USE_TAIL, MMAP_SEQUENTIAL);
- BATaccessEnd(b2, USE_TAIL, MMAP_SEQUENTIAL);
-
if (nils == BUN_NONE) {
BBPunfix(bn->batCacheid);
return NULL;
@@ -1814,15 +1784,11 @@ BATcalcaddcst(BAT *b, const ValRecord *v
if (bn == NULL)
return NULL;
- BATaccessBegin(b, USE_TAIL, MMAP_SEQUENTIAL);
-
nils = add_typeswitchloop(Tloc(b, b->U->first), b->T->type, 1,
VALptr(v), v->vtype, 0,
Tloc(bn, bn->U->first), tp,
b->U->count, abort_on_error, "BATcalcaddcst");
- BATaccessEnd(b, USE_TAIL, MMAP_SEQUENTIAL);
-
if (nils == BUN_NONE) {
BBPunfix(bn->batCacheid);
return NULL;
@@ -1866,15 +1832,11 @@ BATcalccstadd(const ValRecord *v, BAT *b
if (bn == NULL)
return NULL;
- BATaccessBegin(b, USE_TAIL, MMAP_SEQUENTIAL);
-
nils = add_typeswitchloop(VALptr(v), v->vtype, 0,
Tloc(b, b->U->first), b->T->type, 1,
Tloc(bn, bn->U->first), tp,
b->U->count, abort_on_error, "BATcalccstadd");
- BATaccessEnd(b, USE_TAIL, MMAP_SEQUENTIAL);
-
if (nils == BUN_NONE) {
BBPunfix(bn->batCacheid);
return NULL;
@@ -1929,15 +1891,11 @@ BATcalcincr(BAT *b, int abort_on_error)
if (bn == NULL)
return NULL;
- BATaccessBegin(b, USE_TAIL, MMAP_SEQUENTIAL);
-
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
