Changeset: 3528d4113ea5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3528d4113ea5
Modified Files:
gdk/gdk_bbp.c
gdk/gdk_posix.c
monetdb5/modules/mal/mal_mapi.c
Branch: SciQL-2
Log Message:
Merged with Feb2013 branch.
diffs (80 lines):
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -2624,7 +2624,7 @@ BBPtrim_scan(bat bbppos, bat bbplim)
GDKqsort(lastused, bbptrim, NULL, bbptrimlast,
sizeof(lastused[0]), sizeof(bbptrim[0]), TYPE_int);
for (i = bbptrimfirst = 0; i < bbptrimlast; i++) {
- MEMDEBUG THRprintf(GDKstdout, "#TRIMSCAN: %11d%c
%9d=%s\t(#" BUNFMT ")\n", BBPLASTUSED(lastused[i]), (lastused[i] & 0x80000000)
? '*' : ' ', i, BBPname(bbptrim[i].bid), bbptrim[i].cnt);
+ MEMDEBUG THRprintf(GDKstdout, "#TRIMSCAN: %11d%c
%9d=%s\t(#" BUNFMT ")\n", BBPLASTUSED(lastused[i]), (lastused[i] & (1 << 31)) ?
'*' : ' ', i, BBPname(bbptrim[i].bid), bbptrim[i].cnt);
bbptrim[i].next = i + 1;
}
@@ -2863,7 +2863,7 @@ BBPtrim(size_t target)
}
MEMDEBUG THRprintf(GDKstdout, "#BBPTRIM: %8d%c %7d
%s\n",
BBPLASTUSED(lastused[i]),
- lastused[i] & 0x80000000 ? '*' : ' ',
+ lastused[i] & (1 << 31) ? '*' : ' ',
(int) bbptrim[i].bid,
BBPname(bbptrim[i].bid));
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -371,7 +371,6 @@ MT_mmap(const char *path, int mode, size
int fd = open(path, O_CREAT | ((mode & MMAP_WRITE) ? O_RDWR :
O_RDONLY), MONETDB_MODE);
void *ret = (void *) -1L;
- assert(len % MT_pagesize() == 0);
if (fd >= 0) {
ret = mmap(NULL,
len,
@@ -389,7 +388,6 @@ MT_munmap(void *p, size_t len)
{
int ret = munmap(p, len);
- assert(len % MT_pagesize() == 0);
#ifdef MMAP_DEBUG
fprintf(stderr, "#munmap(" PTRFMT "," SZFMT ") = %d\n", PTRFMTCAST p,
len, ret);
#endif
@@ -410,9 +408,6 @@ MT_mremap(const char *path, int mode, vo
/* doesn't make sense for us to extend read-only memory map */
assert(mode & MMAP_WRITABLE);
- assert(old_size % MT_pagesize() == 0);
- assert(*new_size % MT_pagesize() == 0);
- assert((size_t) old_address % MT_pagesize() == 0);
if (*new_size < old_size) {
/* shrink */
@@ -713,7 +708,6 @@ MT_mmap(const char *path, int mode, size
HANDLE h1, h2;
void *ret;
- assert(len % MT_pagesize() == 0);
if (mode & MMAP_WRITE) {
mode0 |= FILE_APPEND_DATA | FILE_WRITE_ATTRIBUTES |
FILE_WRITE_DATA;
}
@@ -784,9 +778,6 @@ MT_mremap(const char *path, int mode, vo
/* doesn't make sense for us to extend read-only memory map */
assert(mode & MMAP_WRITABLE);
- assert(old_size % MT_pagesize() == 0);
- assert(*new_size % MT_pagesize() == 0);
- assert((size_t) old_address % MT_pagesize() == 0);
if (old_size >= *new_size) {
*new_size = old_size;
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -282,7 +282,7 @@ SERVERlistenThread(SOCKET *Sock)
{ int *c_d;
/* filedescriptor, put it in place of
msgsock */
cmsg = CMSG_FIRSTHDR(&msgh);
- if (!cmsg || !cmsg->cmsg_type ==
SCM_RIGHTS) {
+ if (!cmsg || cmsg->cmsg_type !=
SCM_RIGHTS) {
closesocket(msgsock);
fprintf(stderr,
"!mal_mapi.listen: "
"expected
filedescriptor, but "
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
