Changeset: 7c64f0c7649a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7c64f0c7649a
Modified Files:
monetdb5/mal/mal_debugger.mx
monetdb5/mal/mal_function.mx
monetdb5/mal/mal_instruction.mx
monetdb5/modules/mal/mat.mx
monetdb5/optimizer/opt_pipes.mx
monetdb5/optimizer/opt_support.mx
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (truncated from 6557 to 300 lines):
diff --git a/buildtools/Mx/Io.c b/buildtools/Mx/Io.c
--- a/buildtools/Mx/Io.c
+++ b/buildtools/Mx/Io.c
@@ -270,40 +270,6 @@
}
void
-KillLines(FILE *fp, char *pattern, int killprev)
-{
- long lastpos = 0, curpos = 0;
- size_t patlen = strlen(pattern);
- char line[8192];
-
- fflush(fp);
- fseek(fp, 0, SEEK_SET);
- while (fgets(line, 8192, fp)) {
- long newpos = ftell(fp);
-
- if (strlen(line) == 0)
- continue;
- if (strncmp(line, pattern, patlen) == 0) {
- long killpos = curpos;
- long killen = newpos - curpos;
-
- if (killprev && lastpos) {
- killpos = lastpos;
- killen += curpos - lastpos;
- }
- fseek(fp, killpos, SEEK_SET);
- while (killen--)
- fputc(' ', fp);
- fflush(fp);
- fseek(fp, newpos, SEEK_SET);
- }
- lastpos = curpos;
- curpos = ftell(fp);
- }
- fseek(fp, 0, SEEK_END);
-}
-
-void
UpdateFiles(void)
{
File *f;
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -1273,7 +1273,7 @@
return mid->auto_commit;
}
-long
+static long
usec()
{
#ifdef HAVE_GETTIMEOFDAY
@@ -1292,7 +1292,7 @@
}
-void
+static void
mapi_log_header(Mapi mid, char *mark)
{
static long firstcall = 0;
@@ -1307,7 +1307,7 @@
mnstr_flush(mid->tracelog);
}
-void
+static void
mapi_log_record(Mapi mid, const char *msg)
{
mapi_log_header(mid, "W");
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -1661,7 +1661,7 @@
return s;
}
-int
+static int
udp_socket(udp_stream * udp, char *hostname, int port, int write)
{
struct sockaddr *serv;
diff --git a/gdk/gdk_batop.mx b/gdk/gdk_batop.mx
--- a/gdk/gdk_batop.mx
+++ b/gdk/gdk_batop.mx
@@ -838,7 +838,7 @@
return NULL;
}
-BAT *
+static BAT *
BATslice2(BAT *b, BUN l1, BUN h1, BUN l2, BUN h2)
{
BUN p, q;
diff --git a/gdk/gdk_bbp.mx b/gdk/gdk_bbp.mx
--- a/gdk/gdk_bbp.mx
+++ b/gdk/gdk_bbp.mx
@@ -1746,7 +1746,7 @@
}
void
-BBPdump()
+BBPdump(void)
{
bat i;
size_t mem = 0, vm = 0;
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -233,7 +233,7 @@
* files-with-holes on Unixes (on Windows, it actually always performs I/O
which is not
* nice).
*/
-size_t
+static size_t
HEAPmargin(size_t maxsize)
{
size_t ret;
diff --git a/gdk/gdk_private.h b/gdk/gdk_private.h
--- a/gdk/gdk_private.h
+++ b/gdk/gdk_private.h
@@ -131,6 +131,8 @@
void BBPatom_drop(int atom);
void BBPatom_load(int atom);
int BBPbackup(BAT *b, bit subcommit);
+void BBPdump(void); /* never called: for debugging only */
+void BBPdumpcache(void); /* never called: for debugging only */
int MT_alloc_register(void *p, size_t size, char mode);
int MT_alloc_print(void);
int MT_alloc_table(void);
@@ -145,10 +147,6 @@
BUN HASHmask(BUN cnt);
BAT *HASHprint(BAT *b);
int HASHgonebad(BAT *b, ptr v);
-int MT_alive(int pid); /* OS independent way to check if some process is still
alive. */
-#ifdef HAVE_PTHREAD_SIGMASK
-void MT_thread_sigmask(sigset_t *new_mask, sigset_t *orig_mask);
-#endif
void GDKlog(_In_z_ _Printf_format_string_ const char *format, ...)
__attribute__((__format__(__printf__, 1, 2)));
void GDKunlockHome(void);
diff --git a/gdk/gdk_rangejoin.mx b/gdk/gdk_rangejoin.mx
--- a/gdk/gdk_rangejoin.mx
+++ b/gdk/gdk_rangejoin.mx
@@ -195,7 +195,7 @@
The hash indexing routines have been extended with a Band argument.
@{
@c
-BAT *
+static BAT *
BATbandjoin_nl(BAT *l, BAT *r, ptr c1, ptr c2, bit li, bit hi)
{
BAT *bn;
diff --git a/gdk/gdk_scanselect_defs_bte.mx b/gdk/gdk_scanselect_defs_bte.mx
--- a/gdk/gdk_scanselect_defs_bte.mx
+++ b/gdk/gdk_scanselect_defs_bte.mx
@@ -48,6 +48,7 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
+#include "gdk_scanselect_defs_bte.h"
#if defined(__sgi) && defined(__GNUC__) && (SIZEOF_VOID_P == 8)
#define SKIP_TYPE_EXPANSIONS
diff --git a/gdk/gdk_scanselect_defs_chr.mx b/gdk/gdk_scanselect_defs_chr.mx
--- a/gdk/gdk_scanselect_defs_chr.mx
+++ b/gdk/gdk_scanselect_defs_chr.mx
@@ -48,6 +48,7 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
+#include "gdk_scanselect_defs_chr.h"
#if defined(__sgi) && defined(__GNUC__) && (SIZEOF_VOID_P == 8)
#define SKIP_TYPE_EXPANSIONS
diff --git a/gdk/gdk_scanselect_defs_dbl.mx b/gdk/gdk_scanselect_defs_dbl.mx
--- a/gdk/gdk_scanselect_defs_dbl.mx
+++ b/gdk/gdk_scanselect_defs_dbl.mx
@@ -48,6 +48,7 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
+#include "gdk_scanselect_defs_dbl.h"
#if defined(__sgi) && defined(__GNUC__) && (SIZEOF_VOID_P == 8)
#define SKIP_TYPE_EXPANSIONS
diff --git a/gdk/gdk_scanselect_defs_fix.mx b/gdk/gdk_scanselect_defs_fix.mx
--- a/gdk/gdk_scanselect_defs_fix.mx
+++ b/gdk/gdk_scanselect_defs_fix.mx
@@ -44,6 +44,7 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
+#include "gdk_scanselect_defs_fix.h"
#if defined(__sgi) && defined(__GNUC__) && (SIZEOF_VOID_P == 8)
#define SKIP_TYPE_EXPANSIONS
diff --git a/gdk/gdk_scanselect_defs_flt.mx b/gdk/gdk_scanselect_defs_flt.mx
--- a/gdk/gdk_scanselect_defs_flt.mx
+++ b/gdk/gdk_scanselect_defs_flt.mx
@@ -48,6 +48,7 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
+#include "gdk_scanselect_defs_flt.h"
#if defined(__sgi) && defined(__GNUC__) && (SIZEOF_VOID_P == 8)
#define SKIP_TYPE_EXPANSIONS
diff --git a/gdk/gdk_scanselect_defs_int.mx b/gdk/gdk_scanselect_defs_int.mx
--- a/gdk/gdk_scanselect_defs_int.mx
+++ b/gdk/gdk_scanselect_defs_int.mx
@@ -48,6 +48,7 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
+#include "gdk_scanselect_defs_int.h"
#if defined(__sgi) && defined(__GNUC__) && (SIZEOF_VOID_P == 8)
#define SKIP_TYPE_EXPANSIONS
diff --git a/gdk/gdk_scanselect_defs_lng.mx b/gdk/gdk_scanselect_defs_lng.mx
--- a/gdk/gdk_scanselect_defs_lng.mx
+++ b/gdk/gdk_scanselect_defs_lng.mx
@@ -48,6 +48,7 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
+#include "gdk_scanselect_defs_lng.h"
#if defined(__sgi) && defined(__GNUC__) && (SIZEOF_VOID_P == 8)
#define SKIP_TYPE_EXPANSIONS
diff --git a/gdk/gdk_scanselect_defs_sht.mx b/gdk/gdk_scanselect_defs_sht.mx
--- a/gdk/gdk_scanselect_defs_sht.mx
+++ b/gdk/gdk_scanselect_defs_sht.mx
@@ -48,6 +48,7 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
+#include "gdk_scanselect_defs_sht.h"
#if defined(__sgi) && defined(__GNUC__) && (SIZEOF_VOID_P == 8)
#define SKIP_TYPE_EXPANSIONS
diff --git a/gdk/gdk_scanselect_defs_str.mx b/gdk/gdk_scanselect_defs_str.mx
--- a/gdk/gdk_scanselect_defs_str.mx
+++ b/gdk/gdk_scanselect_defs_str.mx
@@ -44,6 +44,7 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
+#include "gdk_scanselect_defs_str.h"
#if defined(__sgi) && defined(__GNUC__) && (SIZEOF_VOID_P == 8)
#define SKIP_TYPE_EXPANSIONS
diff --git a/gdk/gdk_scanselect_defs_var.mx b/gdk/gdk_scanselect_defs_var.mx
--- a/gdk/gdk_scanselect_defs_var.mx
+++ b/gdk/gdk_scanselect_defs_var.mx
@@ -44,6 +44,7 @@
#include "monetdb_config.h"
#include "gdk.h"
#include "gdk_private.h"
+#include "gdk_scanselect_defs_var.h"
#if defined(__sgi) && defined(__GNUC__) && (SIZEOF_VOID_P == 8)
#define SKIP_TYPE_EXPANSIONS
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -688,7 +688,7 @@
* Of course, it does not make sense to touch more then we can physically
accomodate (budget).
*/
/* quick and probabilistic test for a sequentially correlated heap */
-int
+static int
heap_sequential(BAT *b)
{
BUN n = BATcount(b), skip = n / 100, i = BUNfirst(b);
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -132,7 +132,7 @@
int idx = MT_locktrace_hash(MT_locktrace_nme[i]);
if (my_cnt[idx])
- printf("%s %llu\n", MT_locktrace_nme[i],
my_cnt[idx]);
+ printf("%s " ULLFMT "\n", MT_locktrace_nme[i],
my_cnt[idx]);
my_cnt[idx] = 0;
}
MT_locktrace = 0;
@@ -387,7 +387,7 @@
}
#else /* !defined(HAVE_PTHREAD_H) && defined(_MSC_VER) */
#ifdef HAVE_PTHREAD_SIGMASK
-void
+static void
MT_thread_sigmask(sigset_t * new_mask, sigset_t * orig_mask)
{
(void) sigdelset(new_mask, SIGQUIT);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
