Changeset: c9538e344d06 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c9538e344d06
Branch: alloc-less-str
Log Message:
Merged with default
diffs (168 lines):
diff --git a/common/stream/stream_internal.h b/common/stream/stream_internal.h
--- a/common/stream/stream_internal.h
+++ b/common/stream/stream_internal.h
@@ -173,56 +173,84 @@ struct stream {
char errmsg[1024]; // avoid allocation on error. We don't have THAT
many streams..
};
-void mnstr_va_set_error(stream *s, mnstr_error_kind kind, const char *fmt,
va_list ap);
+void mnstr_va_set_error(stream *s, mnstr_error_kind kind, const char *fmt,
va_list ap)
+ __attribute__((__visibility__("hidden")));
void mnstr_set_error(stream *s, mnstr_error_kind kind, const char *fmt, ...)
- __attribute__((__format__(__printf__, 3, 4)));
+ __attribute__((__format__(__printf__, 3, 4)))
+ __attribute__((__visibility__("hidden")));
void mnstr_set_error_errno(stream *s, mnstr_error_kind kind, const char *fmt,
...)
- __attribute__((__format__(__printf__, 3, 4)));
+ __attribute__((__format__(__printf__, 3, 4)))
+ __attribute__((__visibility__("hidden")));
-void mnstr_copy_error(stream *dst, stream *src);
+void mnstr_copy_error(stream *dst, stream *src)
+ __attribute__((__visibility__("hidden")));
void mnstr_set_open_error(const char *name, int errnr, const char *fmt, ...)
- __attribute__((__format__(__printf__, 3, 4)));
+ __attribute__((__format__(__printf__, 3, 4)))
+ __attribute__((__visibility__("hidden")));
/* used to be static: */
-stream *create_stream(const char *name);
-stream *create_wrapper_stream(const char *name, stream *inner);
-void destroy_stream(stream *s);
-stream *open_stream(const char *restrict filename, const char *restrict flags);
+stream *create_stream(const char *name)
+ __attribute__((__visibility__("hidden")));
-stream *file_stream(const char *name);
+stream *create_wrapper_stream(const char *name, stream *inner)
+ __attribute__((__visibility__("hidden")));
+void destroy_stream(stream *s)
+ __attribute__((__visibility__("hidden")));
+stream *open_stream(const char *restrict filename, const char *restrict flags)
+ __attribute__((__visibility__("hidden")));
+
+stream *file_stream(const char *name)
+ __attribute__((__visibility__("hidden")));
/* implementation detail of stdio_stream.c which must be public because
* for example bstream() special cases on it to provide a fast path for file
* i/o.
*/
-ssize_t file_read(stream *restrict s, void *restrict buf, size_t elmsize,
size_t cnt);
+ssize_t file_read(stream *restrict s, void *restrict buf, size_t elmsize,
size_t cnt)
+ __attribute__((__visibility__("hidden")));
-stream *open_gzrstream(const char *filename);
-stream *open_gzwstream(const char *restrict filename, const char *restrict
mode);
-stream *open_gzrastream(const char *filename);
-stream *open_gzwastream(const char *restrict filename, const char *restrict
mode);
+stream *open_gzrstream(const char *filename)
+ __attribute__((__visibility__("hidden")));
+stream *open_gzwstream(const char *restrict filename, const char *restrict
mode)
+ __attribute__((__visibility__("hidden")));
+stream *open_gzrastream(const char *filename)
+ __attribute__((__visibility__("hidden")));
+stream *open_gzwastream(const char *restrict filename, const char *restrict
mode)
+ __attribute__((__visibility__("hidden")));
-stream *open_bzrstream(const char *filename);
-stream *open_bzwstream(const char *restrict filename, const char *restrict
mode);
-stream *open_bzrastream(const char *filename);
-stream *open_bzwastream(const char *restrict filename, const char *restrict
mode);
+stream *open_bzrstream(const char *filename)
+ __attribute__((__visibility__("hidden")));
+stream *open_bzwstream(const char *restrict filename, const char *restrict
mode)
+ __attribute__((__visibility__("hidden")));
+stream *open_bzrastream(const char *filename)
+ __attribute__((__visibility__("hidden")));
+stream *open_bzwastream(const char *restrict filename, const char *restrict
mode)
+ __attribute__((__visibility__("hidden")));
-stream *open_xzrstream(const char *filename);
-stream *open_xzwstream(const char *restrict filename, const char *restrict
mode);
-stream *open_xzrastream(const char *filename);
-stream *open_xzwastream(const char *restrict filename, const char *restrict
mode);
+stream *open_xzrstream(const char *filename)
+ __attribute__((__visibility__("hidden")));
+stream *open_xzwstream(const char *restrict filename, const char *restrict
mode)
+ __attribute__((__visibility__("hidden")));
+stream *open_xzrastream(const char *filename)
+ __attribute__((__visibility__("hidden")));
+stream *open_xzwastream(const char *restrict filename, const char *restrict
mode)
+ __attribute__((__visibility__("hidden")));
-stream *open_lz4rstream(const char *filename);
-stream *open_lz4wstream(const char *restrict filename, const char *restrict
mode);
-stream *open_lz4rastream(const char *filename);
-stream *open_lz4wastream(const char *restrict filename, const char *restrict
mode);
+stream *open_lz4rstream(const char *filename)
+ __attribute__((__visibility__("hidden")));
+stream *open_lz4wstream(const char *restrict filename, const char *restrict
mode)
+ __attribute__((__visibility__("hidden")));
+stream *open_lz4rastream(const char *filename)
+ __attribute__((__visibility__("hidden")));
+stream *open_lz4wastream(const char *restrict filename, const char *restrict
mode)
+ __attribute__((__visibility__("hidden")));
/* Shared between bs2.c, bs.c and stream.c.
@@ -237,13 +265,19 @@ struct bs {
char buf[BLOCK]; /* the buffered data (minus the size of
* size-short */
};
-ssize_t bs_read(stream *restrict ss, void *restrict buf, size_t elmsize,
size_t cnt);
-ssize_t bs_write(stream *restrict ss, const void *restrict buf, size_t
elmsize, size_t cnt);
-void bs_clrerr(stream *s);
-void bs_destroy(stream *ss);
+ssize_t bs_read(stream *restrict ss, void *restrict buf, size_t elmsize,
size_t cnt)
+ __attribute__((__visibility__("hidden")));
+ssize_t bs_write(stream *restrict ss, const void *restrict buf, size_t
elmsize, size_t cnt)
+ __attribute__((__visibility__("hidden")));
+void bs_clrerr(stream *s)
+ __attribute__((__visibility__("hidden")));
+void bs_destroy(stream *ss)
+ __attribute__((__visibility__("hidden")));
-ssize_t bs2_read(stream *restrict ss, void *restrict buf, size_t elmsize,
size_t cnt);
-ssize_t bs2_write(stream *restrict ss, const void *restrict buf, size_t
elmsize, size_t cnt);
+ssize_t bs2_read(stream *restrict ss, void *restrict buf, size_t elmsize,
size_t cnt)
+ __attribute__((__visibility__("hidden")));
+ssize_t bs2_write(stream *restrict ss, const void *restrict buf, size_t
elmsize, size_t cnt)
+ __attribute__((__visibility__("hidden")));
#ifdef _MSC_VER
diff --git a/sql/backends/monet5/UDF/capi/capi.c
b/sql/backends/monet5/UDF/capi/capi.c
--- a/sql/backends/monet5/UDF/capi/capi.c
+++ b/sql/backends/monet5/UDF/capi/capi.c
@@ -686,6 +686,7 @@ static str CUDFeval(Client cntxt, MalBlk
// include some standard C headers first
ATTEMPT_TO_WRITE_TO_FILE(f, "#include <stdio.h>\n");
ATTEMPT_TO_WRITE_TO_FILE(f, "#include <stdlib.h>\n");
+ ATTEMPT_TO_WRITE_TO_FILE(f, "#include <string.h>\n");
// we include "cheader.h", but not directly to avoid having to
deal with
// headers, etc...
// Instead it is embedded in a string (loaded from
"cheader.text.h")
diff --git a/tools/merovingian/daemon/config/CMakeLists.txt
b/tools/merovingian/daemon/config/CMakeLists.txt
--- a/tools/merovingian/daemon/config/CMakeLists.txt
+++ b/tools/merovingian/daemon/config/CMakeLists.txt
@@ -34,4 +34,12 @@ install(FILES
DESTINATION ${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/monetdb5/dbfarm
COMPONENT sql)
+install(DIRECTORY
+ DESTINATION ${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/monetdb
+ COMPONENT sql)
+
+install(DIRECTORY
+ DESTINATION ${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/run/monetdb
+ COMPONENT sql)
+
# vim: set ts=2:sw=2:et
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
