On Sat, Mar 13, 2010 at 11:05:37PM +0100, Sjoerd Mullender wrote:
How backward and forward compatible is this? You should probably also change the GDKLIBRARY value and take care of reading older versions. should be backward compatible, ie if its not there, we have the old situation (at least that was the intention)
On 2010-03-13 22:48, Niels Nes wrote:
Update of /cvsroot/monetdb/MonetDB/src/gdk In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19213/src/gdk
Modified Files: gdk.mx gdk_atoms.mx gdk_bbp.mx Log Message: LLONG_MAX should be defined before compiling BUNlast (needs this because of BUN_NONE)
(keep extra string with options in the BBP.dir, for dynamic storage options)
Index: gdk_bbp.mx =================================================================== RCS file: /cvsroot/monetdb/MonetDB/src/gdk/gdk_bbp.mx,v retrieving revision 1.275 retrieving revision 1.276 diff -u -d -r1.275 -r1.276 --- gdk_bbp.mx 7 Mar 2010 19:00:40 -0000 1.275 +++ gdk_bbp.mx 13 Mar 2010 21:48:43 -0000 1.276 @@ -701,7 +701,7 @@ int lastused; int nread; BATstore *bs; - char *s; + char *s, *options = NULL; char logical[1024]; lng inserted, deleted, first, count, capacity; unsigned short map_head, map_tail, map_hheap, map_theap; @@ -848,8 +848,10 @@ @:vheapinit(H)@ @:vheapinit(T)@
- if (buf[nread] != '\n') + if (buf[nread] != '\n' && buf[nread] != ' ') GDKfatal("BBPinit: invalid format for BBP.dir\n%s", buf); + if (buf[nread] == ' ') + options = buf+nread+1;
BBP[bid].cache = bs; BBP[bid].status = BBPEXISTING; /* do we need other status bits? */ @@ -867,6 +869,9 @@ else BBP[bid].nme[1] = GDKstrdup(BBPtmpname(tailname, sizeof(tailname), -bid)); BBP[bid].path = GDKstrdup(filename); + BBP[bid].options = NULL; + if (options) + BBP[bid].options = GDKstrdup(options); BBP[bid].lastused = lastused; if (lastused > max_stamp) max_stamp = lastused; @@ -1052,6 +1057,9 @@ @:vheapprint(H)@ @:vheapprint(T)@
+ if (BBP[i].options) + stream_printf(s, " %s", BBP[i].options); + return stream_printf(s, "\n"); }
Index: gdk.mx =================================================================== RCS file: /cvsroot/monetdb/MonetDB/src/gdk/gdk.mx,v retrieving revision 1.310 retrieving revision 1.311 diff -u -d -r1.310 -r1.311 --- gdk.mx 10 Mar 2010 22:17:11 -0000 1.310 +++ gdk.mx 13 Mar 2010 21:48:38 -0000 1.311 @@ -389,6 +389,17 @@ # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif
+#include
/* for *_MIN and *_MAX */ +#include /* for FLT_MAX and DBL_MAX */ +#ifndef LLONG_MAX +#ifdef LONGLONG_MAX +#define LLONG_MAX LONGLONG_MAX +#define LLONG_MIN LONGLONG_MIN +#else +#define LLONG_MAX LL_CONSTANT(9223372036854775807) +#define LLONG_MIN (-LL_CONSTANT(9223372036854775807) - LL_CONSTANT(1)) +#endif +#endif #ifdef __cplusplus extern "C" { @@ -2037,6 +2048,7 @@ bat next[2]; /* next BBP slot in link list */ BATstore *cache; /* cached header info */ str path; /* dir + basename for storage */ + str options; /* A string list of options */ int refs; /* in-memory references on which the loaded status of a BAT relies */ int lrefs; /* logical references on which the existence of a BAT relies */ int lastused; /* BBP LRU stamp */ @@ -2054,6 +2066,7 @@ #define BBP_logical(i) BBP[ABS(i)].nme[(i)<0] #define BBP_next(i) BBP[ABS(i)].next[(i)<0] #define BBP_physical(i) BBP[ABS(i)].path +#define BBP_options(i) BBP[ABS(i)].options #define BBP_desc(i) BBP[ABS(i)].cache #define BBP_refs(i) BBP[ABS(i)].refs #define BBP_lrefs(i) BBP[ABS(i)].lrefs
Index: gdk_atoms.mx =================================================================== RCS file: /cvsroot/monetdb/MonetDB/src/gdk/gdk_atoms.mx,v retrieving revision 1.176 retrieving revision 1.177 diff -u -d -r1.176 -r1.177 --- gdk_atoms.mx 12 Feb 2010 08:58:35 -0000 1.176 +++ gdk_atoms.mx 13 Mar 2010 21:48:42 -0000 1.177 @@ -718,17 +718,6 @@ The routine atomnil returns a pointer to the nil value representation. @{ @h -#include
/* for *_MIN and *_MAX */ -#include /* for FLT_MAX and DBL_MAX */ -#ifndef LLONG_MAX -#ifdef LONGLONG_MAX -#define LLONG_MAX LONGLONG_MAX -#define LLONG_MIN LONGLONG_MIN -#else -#define LLONG_MAX LL_CONSTANT(9223372036854775807) -#define LLONG_MIN (-LL_CONSTANT(9223372036854775807) - LL_CONSTANT(1)) -#endif -#endif #define GDK_bit_max ((bit) 1) #define GDK_bit_min ((bit) 0) #define GDK_chr_max ((chr) SCHAR_MAX) ------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Monetdb-checkins mailing list Monetdb-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
-- Sjoerd Mullender
------------------------------------------------------------------------------ Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev _______________________________________________ Monetdb-checkins mailing list Monetdb-checkins@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
-- Niels Nes, Centrum Wiskunde & Informatica (CWI) Science Park 123, 1098 XG Amsterdam, The Netherlands room L3.14, phone ++31 20 592-4098 sip:4098@sip.cwi.nl url: http://www.cwi.nl/~niels e-mail: Niels.Nes@cwi.nl