Changeset: 5529afb141e0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5529afb141e0
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk.h
gdk/gdk_bbp.c
gdk/gdk_heap.c
gdk/gdk_posix.c
gdk/gdk_posix.h
gdk/gdk_utils.c
monetdb5/modules/kernel/status.c
monetdb5/optimizer/opt_prejoin.c
Branch: default
Log Message:
Removed some unneeded stuff.
diffs (193 lines):
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
@@ -279,7 +279,6 @@ ATOMIC_TYPE volatile GDKlocksleepcnt;
void GDKlockstatistics(int);
void *GDKmalloc(size_t size);
size_t GDKmem_cursize(void);
-size_t GDKmem_inuse(void);
void *GDKmmap(const char *path, int mode, size_t len);
int GDKms(void);
int GDKnr_threads;
@@ -319,7 +318,6 @@ MT_Id MT_getpid(void);
size_t MT_getrss(void);
void MT_global_exit(int status) __attribute__((__noreturn__));
char *MT_heapbase;
-char *MT_heapcur(void);
void MT_init(void);
int MT_join_thread(MT_Id t);
int MT_kill_thread(MT_Id t);
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1593,8 +1593,6 @@ gdk_export gdk_return BATgroup(BAT **gro
gdk_export int GDK_mem_pagebits; /* page size for non-linear mmaps */
#define REMAP_PAGE_BITS GDK_mem_pagebits
-#define REMAP_PAGE_SIZE ((size_t) 1 << REMAP_PAGE_BITS)
-#define REMAP_PAGE_MASK (REMAP_PAGE_SIZE - 1)
#define REMAP_PAGE_MAXBITS (REMAP_PAGE_BITS+3)
#define REMAP_PAGE_MAXSIZE ((size_t) 1 << REMAP_PAGE_MAXBITS) /* max page
bytesize of unary BUN heap (8-byte atom) */
@@ -2196,7 +2194,6 @@ gdk_export size_t GDK_mem_maxsize; /* ma
gdk_export size_t GDK_vm_maxsize; /* max allowed size of reserved vm */
gdk_export int GDK_vm_trim; /* allow trimming */
-gdk_export size_t GDKmem_inuse(void); /* RAM/swapmem that MonetDB is really
using now */
gdk_export size_t GDKmem_cursize(void); /* RAM/swapmem that MonetDB has
claimed from OS */
gdk_export size_t GDKvm_cursize(void); /* current MonetDB VM address space
usage */
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -2805,7 +2805,7 @@ BBPtrim(size_t target)
}
MEMDEBUG THRprintf(GDKstdout,
"#BBPTRIM_ENTER: memsize=" SZFMT ",vmsize=" SZFMT
"\n",
- GDKmem_inuse(), GDKvm_cursize());
+ GDKmem_cursize(), GDKvm_cursize());
MEMDEBUG THRprintf(GDKstdout, "#BBPTRIM: target=" SZFMT "\n", target);
PERFDEBUG THRprintf(GDKstdout, "#BBPtrim(mem=%d)\n", target > 0);
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -227,7 +227,7 @@ HEAPextend(Heap *h, size_t size)
/* extend a malloced heap, possibly switching over to
* file-mapped storage */
Heap bak = *h;
- size_t cur = GDKmem_inuse(), tot = GDK_mem_maxsize;
+ size_t cur = GDKmem_cursize(), tot = GDK_mem_maxsize;
int exceeds_swap = size > (tot + tot - MIN(tot + tot, cur));
int can_mmap = h->filename && (size >= GDK_mem_bigsize ||
h->newstorage != STORE_MEM);
int small_cpy = (h->size * 4 < size) && (size >=
GDK_mmap_minsize);
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -355,12 +355,6 @@ MT_getrss(void)
}
-char *
-MT_heapcur(void)
-{
- return 0;
-}
-
void *
MT_mmap(const char *path, int mode, size_t len)
{
@@ -680,12 +674,6 @@ MT_getrss(void)
return 0;
}
-char *
-MT_heapcur(void)
-{
- return (char *) 0;
-}
-
/* Windows mmap keeps a global list of base addresses for complex
* (remapped) memory maps the reason is that each remapped segment
* needs to be unmapped separately in the end. */
diff --git a/gdk/gdk_posix.h b/gdk/gdk_posix.h
--- a/gdk/gdk_posix.h
+++ b/gdk/gdk_posix.h
@@ -190,7 +190,6 @@ gdk_export void MT_sleep_ms(unsigned int
/* a hook function to add any initialization required for the MT_
* functionality */
gdk_export char *MT_heapbase;
-gdk_export char *MT_heapcur(void);
gdk_export size_t MT_getrss(void);
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -433,21 +433,15 @@ MT_init(void)
size_t
GDKmem_cursize(void)
{
- return GDKmem_inuse();
-}
-
-size_t
-GDKmem_inuse(void)
-{
/* RAM/swapmem that Monet is really using now */
- return (size_t) ATOMIC_GET(GDK_mallocedbytes_estimate, mbyteslock,
"GDKmem_inuse");
+ return (size_t) ATOMIC_GET(GDK_mallocedbytes_estimate, mbyteslock,
"GDKmem_cursize");
}
size_t
GDKvm_cursize(void)
{
/* current Monet VM address space usage */
- return (size_t) ATOMIC_GET(GDK_vm_cursize, mbyteslock, "GDKvm_cursize")
+ GDKmem_inuse();
+ return (size_t) ATOMIC_GET(GDK_vm_cursize, mbyteslock, "GDKvm_cursize")
+ GDKmem_cursize();
}
#ifdef GDK_MEM_KEEPHISTO
@@ -597,8 +591,8 @@ GDKmemfail(str s, size_t len)
/* bumped your nose against the wall; try to prevent
* repetition by adjusting maxsizes
- if (memtarget < 0.3 * GDKmem_inuse()) {
- size_t newmax = (size_t) (0.7 * (double) GDKmem_inuse());
+ if (memtarget < 0.3 * GDKmem_cursize()) {
+ size_t newmax = (size_t) (0.7 * (double) GDKmem_cursize());
if (newmax < GDK_mem_maxsize)
GDK_mem_maxsize = newmax;
@@ -611,14 +605,14 @@ GDKmemfail(str s, size_t len)
}
*/
- THRprintf(GDKstdout, "#%s(" SZFMT ") fails, try to free up space
[memory in use=" SZFMT ",virtual memory in use=" SZFMT "]\n", s, len,
GDKmem_inuse(), GDKvm_cursize());
+ THRprintf(GDKstdout, "#%s(" SZFMT ") fails, try to free up space
[memory in use=" SZFMT ",virtual memory in use=" SZFMT "]\n", s, len,
GDKmem_cursize(), GDKvm_cursize());
GDKmemdump();
/* GDKdebug |= MEMMASK; avoid debugging output */
BBPtrim(BBPTRIM_ALL);
GDKdebug = MIN(GDKdebug, bak);
- THRprintf(GDKstdout, "#%s(" SZFMT ") result [mem=" SZFMT ",vm=" SZFMT
"]\n", s, len, GDKmem_inuse(), GDKvm_cursize());
+ THRprintf(GDKstdout, "#%s(" SZFMT ") result [mem=" SZFMT ",vm=" SZFMT
"]\n", s, len, GDKmem_cursize(), GDKvm_cursize());
GDKmemdump();
}
diff --git a/monetdb5/modules/kernel/status.c b/monetdb5/modules/kernel/status.c
--- a/monetdb5/modules/kernel/status.c
+++ b/monetdb5/modules/kernel/status.c
@@ -227,8 +227,8 @@ SYSmemStatistics(int *ret, int *ret2)
BATseqbase(bn,0);
/* store counters, ignore errors */
- i = (wrd) (GDKmem_inuse() - memincr);
- memincr = GDKmem_inuse();
+ i = (wrd) (GDKmem_cursize() - memincr);
+ memincr = GDKmem_cursize();
bn = BUNappend(bn, "memincr", FALSE);
b = BUNappend(b, &i, FALSE);
i = (wrd) m.arena;
@@ -376,7 +376,7 @@ SYSmem_usage(int *ret, int *ret2, lng *m
BUNappend(b, &sz, FALSE);
/* measure actual heap size, includes wasted fragmented space and anon
mmap space used by malloc() */
- sz = GDKmem_inuse();
+ sz = GDKmem_cursize();
BUNappend(bn, "_tot/heap", FALSE);
BUNappend(b, &sz, FALSE);
diff --git a/monetdb5/optimizer/opt_prejoin.c b/monetdb5/optimizer/opt_prejoin.c
--- a/monetdb5/optimizer/opt_prejoin.c
+++ b/monetdb5/optimizer/opt_prejoin.c
@@ -43,7 +43,7 @@ ALGprejoin(int *rl, int *rr, int *l, int
if( bl->batPersistence != TRANSIENT || /* no change in persistent */
BATtordered(bl) || /* ordered tails are fine */
bl->batSharecnt || /* avoid dependent views */
- rpages + lpages <= GDKmem_inuse()/MT_pagesize() || /*
small operands are ok*/
+ rpages + lpages <= GDKmem_cursize()/MT_pagesize() || /*
small operands are ok*/
(dbl)BATcount(bl) < ( 2* rpages * log((dbl)rpages)) ){
BBPkeepref(*rl = bl->batCacheid);
BBPkeepref(*rr = br->batCacheid);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
