Changeset: dc6eacaa0ff1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=dc6eacaa0ff1
Modified Files:
buildtools/autogen/autogen/am.py
clients/Tests/exports.stable.out
common/stream/stream.c
gdk/gdk.h
gdk/gdk_atoms.c
gdk/gdk_bat.c
gdk/gdk_bbp.c
gdk/gdk_delta.c
gdk/gdk_delta.h
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_storage.c
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_utils.c
sql/server/rel_dump.c
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (truncated from 2159 to 300 lines):
diff --git a/buildtools/autogen/autogen/am.py b/buildtools/autogen/autogen/am.py
--- a/buildtools/autogen/autogen/am.py
+++ b/buildtools/autogen/autogen/am.py
@@ -977,7 +977,7 @@ def am_gem(fd, var, gem, am):
for src in srcs:
fd.write("\t[ '$(srcdir)' -ef . ] || rm -f '%s'\n" % src)
for d in sorted(dirs, reverse = True):
- fd.write("\t[ '$(srcdir)' -ef . ] || rmdir '%s'\n" % d)
+ fd.write("\t[ '$(srcdir)' -ef . -o ! -d '%s' ] || rmdir '%s'\n" %
(d, d))
fd.write("install-exec-local-%s: %s\n" % (sf, f[:-4]))
fd.write("\tmkdir -p $(DESTDIR)'%s'\n" % rd)
fd.write("\tgem install --local --install-dir $(DESTDIR)'%s' --force
--rdoc '%s'\n" % (rd, f[:-4]))
@@ -1026,7 +1026,7 @@ def am_python_generic(fd, var, python, a
fd.write("\trm '$(DESTDIR)$(prefix)/$(%s_LIBDIR)'/%s-*.egg-info\n" %
(PYTHON, name.replace('-', '_')))
fd.write('mostlyclean-local:\n')
for pkgdir in sorted(pkgdirs, reverse = True):
- fd.write("\t[ '$(srcdir)' -ef . ] || rm -r '%s'\n" % pkgdir)
+ fd.write("\t[ '$(srcdir)' -ef . -o ! -d '%s' ] || rm -r '%s'\n" %
(pkgdir, pkgdir))
def am_python2(fd, var, python, am):
am_python_generic(fd, var, python, am, 'PYTHON2')
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -320,7 +320,7 @@ void PROPdestroy(PROPrec *p);
BUN SORTfnd(BAT *b, const void *v);
BUN SORTfndfirst(BAT *b, const void *v);
BUN SORTfndlast(BAT *b, const void *v);
-void *THRdata[16];
+void *THRdata[THREADDATA];
void THRdel(Thread t);
Thread THRget(int tid);
void *THRgetdata(int);
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -207,7 +207,7 @@ mnstr_read(stream *s, void *buf, size_t
if (s == NULL || buf == NULL)
return -1;
#ifdef STREAM_DEBUG
- printf("read %s " SZFMT " " SZFMT "\n", s->name ? s->name :
"<unnamed>", elmsize, cnt);
+ fprintf(stderr, "read %s " SZFMT " " SZFMT "\n", s->name ? s->name :
"<unnamed>", elmsize, cnt);
#endif
assert(s->access == ST_READ);
if (s->errnr)
@@ -226,7 +226,7 @@ mnstr_readline(stream *s, void *buf, siz
if (s == NULL || buf == NULL)
return -1;
#ifdef STREAM_DEBUG
- printf("readline %s " SZFMT "\n", s->name ? s->name : "<unnamed>",
maxcnt);
+ fprintf(stderr, "readline %s " SZFMT "\n", s->name ? s->name :
"<unnamed>", maxcnt);
#endif
assert(s->access == ST_READ);
if (s->errnr)
@@ -283,7 +283,7 @@ mnstr_write(stream *s, const void *buf,
if (s == NULL || buf == NULL)
return -1;
#ifdef STREAM_DEBUG
- printf("write %s " SZFMT " " SZFMT "\n", s->name ? s->name :
"<unnamed>", elmsize, cnt);
+ fprintf(stderr, "write %s " SZFMT " " SZFMT "\n", s->name ? s->name :
"<unnamed>", elmsize, cnt);
#endif
assert(s->access == ST_WRITE);
if (s->errnr)
@@ -307,7 +307,7 @@ mnstr_close(stream *s)
{
if (s) {
#ifdef STREAM_DEBUG
- printf("close %s\n", s->name ? s->name : "<unnamed>");
+ fprintf(stderr, "close %s\n", s->name ? s->name : "<unnamed>");
#endif
(*s->close) (s);
}
@@ -318,7 +318,7 @@ mnstr_destroy(stream *s)
{
if (s) {
#ifdef STREAM_DEBUG
- printf("destroy %s\n", s->name ? s->name : "<unnamed>");
+ fprintf(stderr, "destroy %s\n", s->name ? s->name :
"<unnamed>");
#endif
(*s->destroy) (s);
}
@@ -339,7 +339,7 @@ mnstr_flush(stream *s)
if (s == NULL)
return -1;
#ifdef STREAM_DEBUG
- printf("flush %s\n", s->name ? s->name : "<unnamed>");
+ fprintf(stderr, "flush %s\n", s->name ? s->name : "<unnamed>");
#endif
assert(s->access == ST_WRITE);
if (s->errnr)
@@ -356,7 +356,7 @@ mnstr_fsync(stream *s)
if (s == NULL)
return -1;
#ifdef STREAM_DEBUG
- printf("fsync %s (%d)\n", s->name ? s->name : "<unnamed>", s->errnr);
+ fprintf(stderr, "fsync %s (%d)\n", s->name ? s->name : "<unnamed>",
s->errnr);
#endif
assert(s->access == ST_WRITE);
if (s->errnr)
@@ -372,7 +372,7 @@ mnstr_fgetpos(stream *s, lng *p)
if (s == NULL || p == NULL)
return -1;
#ifdef STREAM_DEBUG
- printf("fgetpos %s\n", s->name ? s->name : "<unnamed>");
+ fprintf(stderr, "fgetpos %s\n", s->name ? s->name : "<unnamed>");
#endif
if (s->errnr)
return -1;
@@ -387,7 +387,7 @@ mnstr_fsetpos(stream *s, lng p)
if (s == NULL)
return -1;
#ifdef STREAM_DEBUG
- printf("fsetpos %s\n", s->name ? s->name : "<unnamed>");
+ fprintf(stderr, "fsetpos %s\n", s->name ? s->name : "<unnamed>");
#endif
if (s->errnr)
return -1;
@@ -445,7 +445,7 @@ mnstr_set_byteorder(stream *s, char bige
if (s == NULL)
return;
#ifdef STREAM_DEBUG
- printf("mnstr_set_byteorder %s\n", s->name ? s->name : "<unnamed>");
+ fprintf(stderr, "mnstr_set_byteorder %s\n", s->name ? s->name :
"<unnamed>");
#endif
assert(s->access == ST_READ);
s->type = ST_BIN;
@@ -472,7 +472,7 @@ mnstr_rstream(stream *s)
if (s == NULL)
return NULL;
#ifdef STREAM_DEBUG
- printf("mnstr_rstream %s\n", s->name ? s->name : "<unnamed>");
+ fprintf(stderr, "mnstr_rstream %s\n", s->name ? s->name : "<unnamed>");
#endif
assert(s->access == ST_READ);
s->type = ST_BIN;
@@ -487,7 +487,7 @@ mnstr_wstream(stream *s)
if (s == NULL)
return NULL;
#ifdef STREAM_DEBUG
- printf("mnstr_wstream %s\n", s->name ? s->name : "<unnamed>");
+ fprintf(stderr, "mnstr_wstream %s\n", s->name ? s->name : "<unnamed>");
#endif
assert(s->access == ST_WRITE);
s->type = ST_BIN;
@@ -566,7 +566,7 @@ create_stream(const char *name)
s->timeout_func = NULL;
s->update_timeout = NULL;
#ifdef STREAM_DEBUG
- printf("create_stream %s -> " PTRFMT "\n", name ? name : "<unnamed>",
PTRFMTCAST s);
+ fprintf(stderr, "create_stream %s -> " PTRFMT "\n", name ? name :
"<unnamed>", PTRFMTCAST s);
#endif
return s;
}
@@ -1207,7 +1207,7 @@ open_rstream(const char *filename)
if (filename == NULL)
return NULL;
#ifdef STREAM_DEBUG
- printf("open_rstream %s\n", filename);
+ fprintf(stderr, "open_rstream %s\n", filename);
#endif
ext = get_extention(filename);
@@ -1240,7 +1240,7 @@ open_wstream_(const char *filename, char
if (filename == NULL)
return NULL;
#ifdef STREAM_DEBUG
- printf("open_wstream %s\n", filename);
+ fprintf(stderr, "open_wstream %s\n", filename);
#endif
ext = get_extention(filename);
@@ -1285,7 +1285,7 @@ open_rastream(const char *filename)
if (filename == NULL)
return NULL;
#ifdef STREAM_DEBUG
- printf("open_rastream %s\n", filename);
+ fprintf(stderr, "open_rastream %s\n", filename);
#endif
ext = get_extention(filename);
@@ -1309,7 +1309,7 @@ open_wastream_(const char *filename, cha
if (filename == NULL)
return NULL;
#ifdef STREAM_DEBUG
- printf("open_wastream %s\n", filename);
+ fprintf(stderr, "open_wastream %s\n", filename);
#endif
ext = get_extention(filename);
@@ -1853,7 +1853,7 @@ socket_rstream(SOCKET sock, const char *
stream *s;
#ifdef STREAM_DEBUG
- printf("socket_rstream " SSZFMT " %s\n", (ssize_t) sock, name);
+ fprintf(stderr, "socket_rstream " SSZFMT " %s\n", (ssize_t) sock, name);
#endif
if ((s = socket_open(sock, name)) == NULL)
return NULL;
@@ -1872,7 +1872,7 @@ socket_wstream(SOCKET sock, const char *
stream *s;
#ifdef STREAM_DEBUG
- printf("socket_wstream " SSZFMT " %s\n", (ssize_t) sock, name);
+ fprintf(stderr, "socket_wstream " SSZFMT " %s\n", (ssize_t) sock, name);
#endif
if ((s = socket_open(sock, name)) == NULL)
return NULL;
@@ -1892,7 +1892,7 @@ socket_rastream(SOCKET sock, const char
stream *s = NULL;
#ifdef STREAM_DEBUG
- printf("socket_rastream " SSZFMT " %s\n", (ssize_t) sock, name);
+ fprintf(stderr, "socket_rastream " SSZFMT " %s\n", (ssize_t) sock,
name);
#endif
if ((s = socket_open(sock, name)) != NULL)
s->type = ST_ASCII;
@@ -1905,7 +1905,7 @@ socket_wastream(SOCKET sock, const char
stream *s;
#ifdef STREAM_DEBUG
- printf("socket_wastream " SSZFMT " %s\n", (ssize_t) sock, name);
+ fprintf(stderr, "socket_wastream " SSZFMT " %s\n", (ssize_t) sock,
name);
#endif
if ((s = socket_open(sock, name)) == NULL)
return NULL;
@@ -2100,7 +2100,7 @@ udp_rastream(const char *hostname, int p
if (hostname == NULL || name == NULL)
return NULL;
#ifdef STREAM_DEBUG
- printf("udp_rawastream %s %s\n", hostname, name);
+ fprintf(stderr, "udp_rawastream %s %s\n", hostname, name);
#endif
s = udp_create(name);
if (s == NULL)
@@ -2121,7 +2121,7 @@ udp_wastream(const char *hostname, int p
if (hostname == NULL || name == NULL)
return NULL;
#ifdef STREAM_DEBUG
- printf("udp_wastream %s %s\n", hostname, name);
+ fprintf(stderr, "udp_wastream %s %s\n", hostname, name);
#endif
s = udp_create(name);
if (s == NULL)
@@ -2163,7 +2163,7 @@ file_rstream(FILE *fp, const char *name)
if (fp == NULL)
return NULL;
#ifdef STREAM_DEBUG
- printf("file_rstream %s\n", name);
+ fprintf(stderr, "file_rstream %s\n", name);
#endif
if ((s = file_stream(name)) == NULL)
return NULL;
@@ -2188,7 +2188,7 @@ file_wstream(FILE *fp, const char *name)
if (fp == NULL)
return NULL;
#ifdef STREAM_DEBUG
- printf("file_wstream %s\n", name);
+ fprintf(stderr, "file_wstream %s\n", name);
#endif
if ((s = file_stream(name)) == NULL)
return NULL;
@@ -2214,7 +2214,7 @@ file_rastream(FILE *fp, const char *name
if (fp == NULL)
return NULL;
#ifdef STREAM_DEBUG
- printf("file_rastream %s\n", name);
+ fprintf(stderr, "file_rastream %s\n", name);
#endif
if ((s = file_stream(name)) == NULL)
return NULL;
@@ -2231,7 +2231,7 @@ file_wastream(FILE *fp, const char *name
if (fp == NULL)
return NULL;
#ifdef STREAM_DEBUG
- printf("file_wastream %s\n", name);
+ fprintf(stderr, "file_wastream %s\n", name);
#endif
if ((s = file_stream(name)) == NULL)
return NULL;
@@ -2521,7 +2521,7 @@ iconv_rstream(stream *ss, const char *ch
if (ss == NULL || charset == NULL || name == NULL)
return NULL;
#ifdef STREAM_DEBUG
- printf("iconv_rstream %s %s\n", charset, name);
+ fprintf(stderr, "iconv_rstream %s %s\n", charset, name);
#endif
cd = iconv_open("utf-8", charset);
if (cd == (iconv_t) - 1)
@@ -2545,7 +2545,7 @@ iconv_wstream(stream *ss, const char *ch
if (ss == NULL || charset == NULL || name == NULL)
return NULL;
#ifdef STREAM_DEBUG
- printf("iconv_wstream %s %s\n", charset, name);
+ fprintf(stderr, "iconv_wstream %s %s\n", charset, name);
#endif
cd = iconv_open(charset, "utf-8");
if (cd == (iconv_t) - 1)
@@ -2722,7 +2722,7 @@ buffer_rastream(buffer *b, const char *n
if (b == NULL || name == NULL)
return NULL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
