Changeset: fd99589cc77e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd99589cc77e
Modified Files:
gdk/gdk.mx
gdk/gdk_heap.mx
Branch: default
Log Message:
Remove some old stuff
Place debugging for heap better.
Remove a few definitions that are not used in the code base anymore.
diffs (71 lines):
diff --git a/gdk/gdk.mx b/gdk/gdk.mx
--- a/gdk/gdk.mx
+++ b/gdk/gdk.mx
@@ -442,7 +442,6 @@
#define LEFTDIR "bat\\LEFTOVERS"
#define HCDIR "bat\\HC"
#endif
-#define DBLOGFILE "MonetLog"
#ifdef MAXPATHLEN
#define PATHLENGTH MAXPATHLEN
@@ -485,7 +484,6 @@
#define BOUND2BTRUE 2 /* TRUE, and bound to be so */
#define IDLENGTH 64 /* maximum BAT id length */
-#define OLDLENGTH 32 /* old max BAT id length */
#define BATMARGIN 1.2 /* extra free margin for new heaps */
#define BATTINY_BITS 8
#define BATTINY ((BUN)1<<BATTINY_BITS) /* minimum allocation
buncnt for a BAT */
@@ -548,29 +546,7 @@
# define LL_CONSTANT(val) (val##i64)
#endif
-/* Base types for all architectures. These types work on IRIX (64 & 32)
- and for gcc on Linux. */
-typedef unsigned char gdk_uint8;
-typedef char gdk_int8;
-
-typedef unsigned short gdk_uint16;
-typedef short gdk_int16;
-
-typedef unsigned int gdk_uint32;
-typedef int gdk_int32;
-
-#ifdef HAVE_LONG_LONG
-typedef unsigned long long gdk_uint64;
-typedef long long gdk_int64;
-#else
-#ifdef HAVE___INT64
-typedef unsigned __int64 gdk_uint64;
-typedef __int64 gdk_int64;
-#endif
-#endif
-
typedef char long_str[IDLENGTH]; /* standard GDK static string */
-typedef char short_str[OLDLENGTH]; /* old GDK small static string */
typedef oid var_t; /* type used for heap index of var-sized BAT */
#define SIZEOF_VAR_T SIZEOF_OID
@@ -619,7 +595,6 @@
return 0; \
}
-/* needed for mel */
#define ATOMextern(t) (ATOMstorage(t) >= TYPE_str)
#define TYPEcastable(t1,t2) (ATOMtype(t1)==ATOMtype(t2))
diff --git a/gdk/gdk_heap.mx b/gdk/gdk_heap.mx
--- a/gdk/gdk_heap.mx
+++ b/gdk/gdk_heap.mx
@@ -134,9 +134,9 @@
{
void *base = NULL;
- ALLOCDEBUG fprintf(stderr, "#HEAPcacheAdd (%s)" SZFMT " %d %d\n", fn,
*maxsz, mode, hc->used);
*maxsz = (1 + (*maxsz >> 16)) << 16; /* round up to 64K */
if (hc && mode == STORE_MMAP && hc->used < hc->sz) {
+ ALLOCDEBUG fprintf(stderr, "#HEAPcacheFind (%s)" SZFMT " %d
%d\n", fn, *maxsz, mode, hc->used);
gdk_set_lock(HEAPcacheLock, "HEAPcache_init");
if (hc->used) {
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
