- developers-list - monetdb.org

[Monetdb-developers] New stable branch created
by Sjoerd Mullender 04 Nov '08

04 Nov '08

I have created new stable branches for the upcoming release. From now on *all* bug fixes and *only* bug fixes *must* go to this new stable branch. I reserve the right to undo any changes that do not comply with this rule. Unlike previous stable branches, this time all packages use the same name for the branch: Nov2008. So in each of your stable checkout directories you can do cvs update -rNov2008 to update to the new branch. I have created branches for the following packages: MonetDB MonetDB4 MonetDB5 TestTools buildtools clients geom pathfinder sql template. Note that java and datacell are missing from this list. Java has its own release schedule, and datacell is not yet released and will not be released in this round. -- Sjoerd Mullender

1 0

Re: [Monetdb-developers] [Monetdb-sql-checkins] sql/src/backends/monet5 sql_gencode.mx, , 1.291, 1.292
by Stefan Manegold 04 Nov '08

04 Nov '08

What about solving the actual problem and fixing the code properly instead of just curing/patching symptoms? In MonetDB type long is not supposed to be used at all as it is not portable. What is wrong with using the standard MonetDB type system? E.g., ======== $ cvs diff MonetDB5/src/mal/mal_builder.mx sql/src/backends/monet5/sql_gencode.mx Index: MonetDB5/src/mal/mal_builder.mx =================================================================== RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_builder.mx,v retrieving revision 1.36 diff -u -r1.36 mal_builder.mx --- MonetDB5/src/mal/mal_builder.mx 30 Oct 2008 07:28:42 -0000 1.36 +++ MonetDB5/src/mal/mal_builder.mx 4 Nov 2008 07:33:47 -0000 @@ -47,7 +47,7 @@ mal_export InstrPtr pushChr(MalBlkPtr mb, InstrPtr q, char val); mal_export InstrPtr pushOid(MalBlkPtr mb, InstrPtr q, oid val); mal_export InstrPtr pushVoid(MalBlkPtr mb, InstrPtr q); -mal_export InstrPtr pushLng(MalBlkPtr mb, InstrPtr q, long val); +mal_export InstrPtr pushLng(MalBlkPtr mb, InstrPtr q, lng val); mal_export InstrPtr pushDbl(MalBlkPtr mb, InstrPtr q, double val); mal_export InstrPtr pushFlt(MalBlkPtr mb, InstrPtr q, float val); mal_export InstrPtr pushStr(MalBlkPtr mb, InstrPtr q, const char *val); @@ -232,7 +232,7 @@ } InstrPtr -pushLng(MalBlkPtr mb, InstrPtr q, long val) +pushLng(MalBlkPtr mb, InstrPtr q, lng val) { int _t; ValRecord cst; Index: sql/src/backends/monet5/sql_gencode.mx =================================================================== RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v retrieving revision 1.292 diff -u -r1.292 sql_gencode.mx --- sql/src/backends/monet5/sql_gencode.mx 4 Nov 2008 06:55:24 -0000 1.292 +++ sql/src/backends/monet5/sql_gencode.mx 4 Nov 2008 07:33:47 -0000 @@ -1929,8 +1929,8 @@ q = newStmt(mb,sqlRef,"keepquery"); q= pushInt(mb,q,c->history); q= pushStr(mb,q,t); - q= pushLng(mb,q, (long) (GDKusec() - be->mvc->Tparse) ); - q= pushLng(mb,q, (long) GDKusec()); + q= pushLng(mb,q, GDKusec() - be->mvc->Tparse); + q= pushLng(mb,q, GDKusec()); c->Tparse = 0; } ======== or even better ======== $ cvs diff MonetDB5/src/mal/mal_builder.mx sql/src/backends/monet5/sql_gencode.mx Index: MonetDB5/src/mal/mal_builder.mx =================================================================== RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_builder.mx,v retrieving revision 1.36 diff -u -r1.36 mal_builder.mx --- MonetDB5/src/mal/mal_builder.mx 30 Oct 2008 07:28:42 -0000 1.36 +++ MonetDB5/src/mal/mal_builder.mx 4 Nov 2008 07:35:53 -0000 @@ -44,14 +44,14 @@ mal_export InstrPtr pushInt(MalBlkPtr mb, InstrPtr q, int val); mal_export InstrPtr pushWrd(MalBlkPtr mb, InstrPtr q, wrd val); mal_export InstrPtr pushBte(MalBlkPtr mb, InstrPtr q, bte val); -mal_export InstrPtr pushChr(MalBlkPtr mb, InstrPtr q, char val); +mal_export InstrPtr pushChr(MalBlkPtr mb, InstrPtr q, chr val); mal_export InstrPtr pushOid(MalBlkPtr mb, InstrPtr q, oid val); mal_export InstrPtr pushVoid(MalBlkPtr mb, InstrPtr q); -mal_export InstrPtr pushLng(MalBlkPtr mb, InstrPtr q, long val); -mal_export InstrPtr pushDbl(MalBlkPtr mb, InstrPtr q, double val); -mal_export InstrPtr pushFlt(MalBlkPtr mb, InstrPtr q, float val); +mal_export InstrPtr pushLng(MalBlkPtr mb, InstrPtr q, lng val); +mal_export InstrPtr pushDbl(MalBlkPtr mb, InstrPtr q, dbl val); +mal_export InstrPtr pushFlt(MalBlkPtr mb, InstrPtr q, flt val); mal_export InstrPtr pushStr(MalBlkPtr mb, InstrPtr q, const char *val); -mal_export InstrPtr pushBit(MalBlkPtr mb, InstrPtr q, int val); +mal_export InstrPtr pushBit(MalBlkPtr mb, InstrPtr q, bit val); mal_export InstrPtr pushNil(MalBlkPtr mb, InstrPtr q, int tpe); mal_export InstrPtr pushNilType(MalBlkPtr mb, InstrPtr q, char *tpe); mal_export InstrPtr pushZero(MalBlkPtr mb, InstrPtr q, int tpe); @@ -193,7 +193,7 @@ } InstrPtr -pushChr(MalBlkPtr mb, InstrPtr q, char val) +pushChr(MalBlkPtr mb, InstrPtr q, chr val) { int _t; ValRecord cst; @@ -232,7 +232,7 @@ } InstrPtr -pushLng(MalBlkPtr mb, InstrPtr q, long val) +pushLng(MalBlkPtr mb, InstrPtr q, lng val) { int _t; ValRecord cst; @@ -244,7 +244,7 @@ } InstrPtr -pushDbl(MalBlkPtr mb, InstrPtr q, double val) +pushDbl(MalBlkPtr mb, InstrPtr q, dbl val) { int _t; ValRecord cst; @@ -256,7 +256,7 @@ } InstrPtr -pushFlt(MalBlkPtr mb, InstrPtr q, float val) +pushFlt(MalBlkPtr mb, InstrPtr q, flt val) { ValRecord cst; @@ -281,7 +281,7 @@ } InstrPtr -pushBit(MalBlkPtr mb, InstrPtr q, int val) +pushBit(MalBlkPtr mb, InstrPtr q, bit val) { int _t; ValRecord cst; Index: sql/src/backends/monet5/sql_gencode.mx =================================================================== RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v retrieving revision 1.292 diff -u -r1.292 sql_gencode.mx --- sql/src/backends/monet5/sql_gencode.mx 4 Nov 2008 06:55:24 -0000 1.292 +++ sql/src/backends/monet5/sql_gencode.mx 4 Nov 2008 07:35:53 -0000 @@ -1929,8 +1929,8 @@ q = newStmt(mb,sqlRef,"keepquery"); q= pushInt(mb,q,c->history); q= pushStr(mb,q,t); - q= pushLng(mb,q, (long) (GDKusec() - be->mvc->Tparse) ); - q= pushLng(mb,q, (long) GDKusec()); + q= pushLng(mb,q, GDKusec() - be->mvc->Tparse); + q= pushLng(mb,q, GDKusec()); c->Tparse = 0; } ======== Stefan On Tue, Nov 04, 2008 at 06:55:26AM +0000, Martin Kersten wrote: > Update of /cvsroot/monetdb/sql/src/backends/monet5 > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13501 > > Modified Files: > sql_gencode.mx > Log Message: > Silence compiler > > > U sql_gencode.mx > Index: sql_gencode.mx > =================================================================== > RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql_gencode.mx,v > retrieving revision 1.291 > retrieving revision 1.292 > diff -u -d -r1.291 -r1.292 > --- sql_gencode.mx 3 Nov 2008 15:32:04 -0000 1.291 > +++ sql_gencode.mx 4 Nov 2008 06:55:24 -0000 1.292 > @@ -1929,8 +1929,8 @@ > q = newStmt(mb,sqlRef,"keepquery"); > q= pushInt(mb,q,c->history); > q= pushStr(mb,q,t); > - q= pushLng(mb,q,GDKusec() - be->mvc->Tparse); > - q= pushLng(mb,q, GDKusec()); > + q= pushLng(mb,q, (long) (GDKusec() - be->mvc->Tparse) ); > + q= pushLng(mb,q, (long) GDKusec()); > c->Tparse = 0; > } > > > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Monetdb-sql-checkins mailing list > Monetdb-sql-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins > -- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4312 |

1 0

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB4/src/modules/contrib malalgebra.mx, MonetDB_4-24, 1.8.2.2, 1.8.2.3
by Sjoerd Mullender 03 Nov '08

03 Nov '08

Did you see what I had done on the head branch for this problem? On 2008-11-03 22:51, Stefan Manegold wrote: > Update of /cvsroot/monetdb/MonetDB4/src/modules/contrib > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv6583/MonetDB4/src/modules/contrib > > Modified Files: > Tag: MonetDB_4-24 > malalgebra.mx > Log Message: > > attempt to fix bug in Peter's new {band,left}mergejoin_limit() functions > that was reported by Riham: > > While {band,left}mergejoin_limit() internally use a limit of type size_t, > the MIL level uses type lng; hence, we need to properly convert the types > back and forth (and check for potential under-/overflows). > > (For now, I did not dare to change the MIL interface to use the more suitable > type wrd that (unlike lng) grows with system word size just like size_t.) > > Riham, > > could you please check, whether this fixes your problem? > Thanks! > > > > U malalgebra.mx > Index: malalgebra.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB4/src/modules/contrib/malalgebra.mx,v > retrieving revision 1.8.2.2 > retrieving revision 1.8.2.3 > diff -u -d -r1.8.2.2 -r1.8.2.3 > --- malalgebra.mx 28 Oct 2008 17:49:34 -0000 1.8.2.2 > +++ malalgebra.mx 3 Nov 2008 21:51:09 -0000 1.8.2.3 > @@ -263,28 +263,50 @@ > } > > int > -CMDbandmergejoin_limit(BAT **result, BAT *left, BAT *right, ptr minus, ptr plus, bit *li, bit *hi, lng* limit) > +CMDbandmergejoin_limit(BAT **result, BAT *left, BAT *right, ptr minus, ptr plus, bit *li, bit *hi, lng* _limit) > { > - size_t cutoff = *limit; > + lng limit = *_limit; > + size_t cutoff = (size_t) limit; > + assert(limit >= 0); > +#if SIZEOF_SIZE_T == SIZEOF_INT > + assert(limit <= GDK_int_max); > +#endif > *result = BATbandmergejoin_limit(left, right, minus, plus, *li, *hi, &cutoff); > if (*result) { > bat bid = (*result)->batCacheid; > *result = BATnew(TYPE_lng, TYPE_bat, 1); > - if (*result) BUNins(*result, &cutoff, &bid, FALSE); > + if (*result) { > +#if SIZEOF_SIZE_T == SIZEOF_LNG > + assert(cutoff <= (size_t) GDK_lng_max); > +#endif > + limit = (lng) cutoff; > + BUNins(*result, &limit, &bid, FALSE); > + } > BBPunfix(bid); > } > return (*result)?GDK_SUCCEED:GDK_FAIL; > } > > int > -CMDleftmergejoin_limit(BAT **result, BAT *left, BAT *right, lng* limit) > +CMDleftmergejoin_limit(BAT **result, BAT *left, BAT *right, lng* _limit) > { > - size_t cutoff = *limit; > + lng limit = *_limit; > + size_t cutoff = (size_t) limit; > + assert(limit >= 0); > +#if SIZEOF_SIZE_T == SIZEOF_INT > + assert(limit <= GDK_int_max); > +#endif > *result = BATleftmergejoin_limit(left, right, cutoff, &cutoff); > if (*result) { > bat bid = (*result)->batCacheid; > *result = BATnew(TYPE_lng, TYPE_bat, 1); > - if (*result) BUNins(*result, &cutoff, &bid, FALSE); > + if (*result) { > +#if SIZEOF_SIZE_T == SIZEOF_LNG > + assert(cutoff <= (size_t) GDK_lng_max); > +#endif > + limit = (lng) cutoff; > + BUNins(*result, &limit, &bid, FALSE); > + } > BBPunfix(bid); > } > return (*result)?GDK_SUCCEED:GDK_FAIL; > > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins -- Sjoerd Mullender

2 1

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/optimizer opt_history.mx, , 1.1, 1.2
by Romulo Goncalves 03 Nov '08

03 Nov '08

Martin Kersten wrote: > Update of /cvsroot/monetdb/MonetDB5/src/optimizer > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv32362 > > Modified Files: > opt_history.mx > Log Message: > Added the missing information. > > > U opt_history.mx > Index: opt_history.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/optimizer/opt_history.mx,v > retrieving revision 1.1 > retrieving revision 1.2 > diff -u -d -r1.1 -r1.2 > --- opt_history.mx 3 Nov 2008 06:35:34 -0000 1.1 > +++ opt_history.mx 3 Nov 2008 12:36:44 -0000 1.2 > @@ -32,7 +32,7 @@ > time you use the history without initialization. > The keepcall can be used to check for initialization of the cache. > @mal > -module user; > +module sql; > function keepquery{unsafe}(qid:int,qry:str,parse:lng,optimize:lng):void; > raise SQLexception:= "SQL history script should be run first"; > end keepquery; > @@ -44,6 +44,10 @@ > function queryId{unsafe}(qid:int):void; > end queryId; > > +pattern forgetPrevious():void > +address OPTforgetPrevious > +comment "invalidate the previous instruction from future execution"; > + > pattern optimizer.history():str > address OPThistory; > pattern optimizer.history(mod:str, fcn:str):str > @@ -61,6 +65,7 @@ > #include "mal_instruction.h" > #include "mal_function.h" > > +opt_export str OPTforgetPrevious(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); > /* #define _DEBUG_OPT_QUERYHISTORY_ trace its behavior */ > > @- > @@ -79,12 +84,23 @@ > @c > #include "opt_history.h" > > +str > +OPTforgetPrevious(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci){ > + int pc; > + (void) cntxt; > + (void) stk; > + pc= getPC(mb,pci); > + assert ( pc > 0 && pc < mb->stop); > + mb->stmt[pc-1]->token = REMsymbol; > + return MAL_SUCCEED; > +} > + > static int > OPThistoryImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci) > { > int i, limit,slimit; > InstrPtr p=0, *old= mb->stmt, q,r; > - int qid, argc, elaps, inblock, oublock, arg, ctime; > + int qid=0, argc, elaps, inblock, oublock, arg, ctime; > int returnseen=0; > > > @@ -97,6 +113,17 @@ > #else > (void) cntxt; > #endif > + if ( findSymbol(userRef,"keepQuery") == 0){ > + /* initialization script has not been ran */ > + return 0; > + } > + /* gather information and recast the call handel*/ > + for (i = 1; i < limit; i++) { Using limit here and... > + p= getInstrPtr(mb,i); > + if ( getModuleId(p)== sqlRef && idcmp(getFunctionId(p),"queryId")==0){ > + qid= getArg(p,1); > + } > + } > > limit= mb->stop; You initialize it here :S Romulo > slimit= mb->ssize; > @@ -109,6 +136,11 @@ > for (i = 1; i < limit; i++) { > p= old[i]; > > + if ( getModuleId(p)== sqlRef && idcmp(getFunctionId(p),"keepQuery")==0){ > + getModuleId(p) = userRef; > + pushInstruction(mb,p); > + q= newStmt(mb,sqlRef,"forgetPrevious"); > + } > if ( p->token== ENDsymbol || p->barrier == RETURNsymbol || p->barrier == YIELDsymbol){ > if (returnseen && p->token == ENDsymbol) { > pushInstruction(mb,p); > > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

1 0

[Monetdb-developers] mserver5 does not terminated
by Romulo Goncalves 03 Nov '08

03 Nov '08

If I start a mserver5 with a corrupted (old) dbfarm I get: # MonetDB server v5.7.0, based on kernel v1.25.0 # Serving database 'rdf_current', using 4 threads # Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically linked # Copyright (c) 1993-July 2008 CWI. # Copyright (c) August 2008- MonetDB B.V., all rights reserved # Visit http://monetdb.cwi.nl/ for further information #warning: please don't forget to set your vault key! #(see /scratch/romulo/build/MonetDB/current/optimized/MonetDB5//etc/monetdb5.conf) # Listening for connection requests on mapi:monetdb://127.0.0.1:50000/ # MonetDB/SQL module v2.25.0 loaded >!ERROR: Incompatible database version 040000, this server supports version 050000 !ERROR: Please move away /scratch/romulo/var/dblogs/rdf_current/sql/ and its corresponding dbfarm. !mvc_init: unable to create system tables > >\q Which is correct. However, I am only able to close (I should more say kill it) with kill -9 <mserver5_pid> I could open a bug, but it is not easy to create a test for this problem... Romulo

1 0

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/optimizer opt_history.mx, , NONE, 1.1 Makefile.ag, , 1.62, 1.63 opt_prelude.mx, , 1.49, 1.50
by Romulo Goncalves 03 Nov '08

03 Nov '08

Martin Kersten wrote: > Update of /cvsroot/monetdb/MonetDB5/src/optimizer > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv21452 > > Modified Files: > Makefile.ag opt_prelude.mx > Added Files: > opt_history.mx > Log Message: > include the SQL history code optimizer > > > U opt_prelude.mx > --- NEW FILE: opt_history.mx --- ............... > > static int > OPThistoryImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci) > { > int i, limit,slimit; > InstrPtr p=0, *old= mb->stmt, q,r; > int qid, argc, elaps, inblock, oublock, arg, ctime; You need to initialize it before you use it.... qid = 0 ? Regards, Romulo > int returnseen=0; > > > (void) pci; > (void) stk; /* to fool compilers */ > > #ifdef _DEBUG_OPT_QUERYHISTORY_ > stream_printf(cntxt->fdout,"ENTERING TRACE CODE \n"); > printFunction(cntxt->fdout,mb,0,LIST_MAL_ALL); > #else > (void) cntxt; > #endif > > limit= mb->stop; > slimit= mb->ssize; > newMalBlkStmt(mb, mb->ssize+20); /* a new statement stack */ > > pushInstruction(mb, old[0]); > /* collect the statistics */ > @:initCounters@ > > for (i = 1; i < limit; i++) { > p= old[i]; > > if ( p->token== ENDsymbol || p->barrier == RETURNsymbol || p->barrier == YIELDsymbol){ > if (returnseen && p->token == ENDsymbol) { > pushInstruction(mb,p); > continue; > } > returnseen++; > q = newStmt(mb,"alarm","usec"); > setVarType(mb,getArg(q,0), TYPE_lng); > r = newStmt(mb,"calc","-"); > r = pushArgument(mb,r, getArg(q,0)); > r = pushArgument(mb,r, elaps); > elaps= getArg(r,0); > > q = newStmt(mb,"bbp","getDiskReads"); > setVarType(mb,getArg(q,0), TYPE_lng); > r = newStmt(mb,"calc","-"); > r = pushArgument(mb,r, getArg(q,0)); > r = pushArgument(mb,r, inblock); > inblock= getArg(r,0); > > q = newStmt(mb,"bbp","getDiskWrites"); > setVarType(mb,getArg(q,0), TYPE_lng); > r = newStmt(mb,"calc","-"); > r = pushArgument(mb,r, getArg(q,0)); > r = pushArgument(mb,r, oublock); > oublock= getArg(r,0); > > /* prepare the call to the history manager */ > q = newStmt(mb,"sql","argRecord"); > setVarType(mb,getArg(q,0), TYPE_str); > for ( argc=0; argc < old[0]->argc; argc++) > q = pushArgument(mb, q, getArg(old[0],argc)); > > arg= getArg(q,0); > > q = newStmt(mb,"user","keepcall"); > q = pushInt(mb, q, qid); /* query identifier */ > q = pushArgument(mb, q, ctime); /* arguments */ > q = pushArgument(mb, q, arg); /* arguments */ > q = pushArgument(mb, q, elaps); /* elaps */ > q = pushArgument(mb, q, inblock);/* inblock */ > q = pushArgument(mb, q, oublock);/* oublock */ > } > > pushInstruction(mb,p); > if (p->barrier == YIELDsymbol){ > /* the factory yield may return */ > @:initCounters@ > } > } > > #ifdef _DEBUG_OPT_QUERYHISTORY_ > stream_printf(cntxt->fdout,"LEAVING QUERYHISTORY CODE INJECTION\n"); > printFunction(cntxt->fdout,mb,LIST_MAL_ALL); > #endif > for( ; i<slimit; i++) > if(old[i]) > freeInstruction(old[i]); > GDKfree(old); > return 1; > } > @include optimizerWrapper.mx > @h > @:exportOptimizer(history)@ > #endif > @c > #include "opt_statistics.h" > @:wrapOptimizer(history,OPT_CHECK_ALL)@ > @} > > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

1 0

[Monetdb-developers] communication problem between Mserver and mclient on OS X
by Jan Rittinger 31 Oct '08

31 Oct '08

Hi all, can you tell me what I need to change to make Mserver communicate with mclient on OS X. All I get is silence... $ Mserver --dbinit='module(pathfinder); mil_start();' # MonetDB Server v4.25.0 # based on GDK v1.25.0 # Copyright (c) 1993-July 2008, CWI. All rights reserved. # Copyright (c) August 2008-, MonetDB B.V.. All rights reserved. # Compiled for i686-apple-darwin9.5.0/32bit with 32bit OIDs; dynamically linked. # Visit http://monetdb.cwi.nl/ for further information. # PF/Tijah module v0.9.0 loaded. http://dbappl.cs.utwente.nl/pftijah # MonetDB/XQuery module v0.25.0 loaded (default back-end is 'algebra') # XRPC administrative console at http://127.0.0.1:50001/admin MonetDB> $ mclient -lx q01.xq ^C (after 2 minutes) $ mclient -lmil q01.mil ^C (after 2 minutes) Running the same query through Mserver directly completes in under a second. $ pf q01.xq > q01.mil $ Mserver q01.mil # MonetDB Server v4.25.0 # based on GDK v1.25.0 # Copyright (c) 1993-July 2008, CWI. All rights reserved. # Copyright (c) August 2008-, MonetDB B.V.. All rights reserved. # Compiled for i686-apple-darwin9.5.0/32bit with 32bit OIDs; dynamically linked. # Visit http://monetdb.cwi.nl/ for further information. # PF/Tijah module v0.9.0 loaded. http://dbappl.cs.utwente.nl/pftijah # MonetDB/XQuery module v0.25.0 loaded (default back-end is 'algebra') # XRPC administrative console at http://127.0.0.1:50001/admin <?xml version="1.0" encoding="utf-8"?> <XQueryResult>Ayonca Vijaykrishnan</XQueryResult> MonetDB> Thanks, Jan -- Jan Rittinger Lehrstuhl Datenbanken und Informationssysteme Wilhelm-Schickard-Institut für Informatik Eberhard-Karls-Universität Tübingen http://www-db.informatik.uni-tuebingen.de/team/rittinger

2 4

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB4/src/modules/contrib malalgebra.mx, MonetDB_4-24, 1.8.2.1, 1.8.2.2
by Sjoerd Mullender 29 Oct '08

29 Oct '08

This type of change is not allowed on a stable branch. Changes of API are *not* allowed. Since we're going to abandon this stable branch soon, I'll let it pass. On 2008-10-28 18:49, Peter Boncz wrote: > Update of /cvsroot/monetdb/MonetDB4/src/modules/contrib > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv901/src/modules/contrib > > Modified Files: > Tag: MonetDB_4-24 > malalgebra.mx > Log Message: > changes to minimize sampling overhead (mostly in XML text index) > > - introduce bandmergejoin(), and leftmergejoin()/bandmergejoin() with a cutoff > > > > U malalgebra.mx > Index: malalgebra.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB4/src/modules/contrib/malalgebra.mx,v > retrieving revision 1.8.2.1 > retrieving revision 1.8.2.2 > diff -u -d -r1.8.2.1 -r1.8.2.2 > --- malalgebra.mx 10 Oct 2008 08:42:22 -0000 1.8.2.1 > +++ malalgebra.mx 28 Oct 2008 17:49:34 -0000 1.8.2.2 > @@ -43,7 +43,6 @@ > @:leftjoin(fetch,\nCAUTION: positional matches are assumed not to be out-of-bounds!!)@ > @:leftjoin(merge)@ > @:leftjoin(hash)@ > - > .COMMAND leftthetajoin ( BAT[any::1,any::2] left, BAT[any::2,any::3] right, int mode) : > BAT[any::1,any::3] = CMDleftthetajoin; > "Hook directly into the 'leftthetajoin' implementation of the join. > @@ -58,6 +57,22 @@ > Also, for each left tuple, all matching right tuples will appear in their order > of appearrance in the right BAT. This property is handy for XQuery processing." > > + .COMMAND bandmergejoin ( BAT[any::1,any::2] outer, BAT[any::2,any::3] inner, > + any::2 minus, any::2 plus, bit l_in, bit h_in) : > + BAT[any::1,any::3] = CMDbandmergejoin; > + "The bandjoin algorithm, but forced to use (left) mergejoin rather than nested loop" > + > + .COMMAND bandmergejoin ( BAT[any::1,any::2] outer, BAT[any::2,any::3] inner, > + any::2 minus, any::2 plus, bit l_in, bit h_in, lng limit) : > + BAT[lng,BAT] = CMDbandmergejoin_limit; > + "A bandjoin that uses the merge algorithm and limits the result size. > + Result generation is cut off after this point and the > + result [lng,BAT] holds [estimated_full_resultsize,limited_result]" > + > + .COMMAND leftmergejoin ( BAT[any::1,any::2] left, BAT[any::2,any::3] right, lng limit) : > + BAT[lng,BAT] = CMDleftmergejoin_limit; > + "leftmergejoin, but limit the result (by cutting off result generation) > + return a BAT[lng,BAT] containing [full_result_estimate,limited_result]" > > @= select > .COMMAND ord_@1select ( BAT[any::1,any::2] b, any::2 low, any::2 high) : > @@ -119,6 +134,7 @@ > #ifndef __MALALGEBRA_H__ > #define __MALALGEBRA_H__ > #include "gdk.h" > +#include "gdk_rangejoin.h" > > /* nothing much */ > > @@ -240,6 +256,40 @@ > return (*result = BATnlthetajoin(l, r, *mode, (size_t) * estimate)) ? GDK_SUCCEED : GDK_FAIL; > } > > +int > +CMDbandmergejoin(BAT **result, BAT *left, BAT *right, ptr minus, ptr plus, bit *li, bit *hi) > +{ > + return (*result = BATbandmergejoin(left, right, minus, plus, *li, *hi)) ? GDK_SUCCEED : GDK_FAIL; > +} > + > +int > +CMDbandmergejoin_limit(BAT **result, BAT *left, BAT *right, ptr minus, ptr plus, bit *li, bit *hi, lng* limit) > +{ > + size_t cutoff = *limit; > + *result = BATbandmergejoin_limit(left, right, minus, plus, *li, *hi, &cutoff); > + if (*result) { > + bat bid = (*result)->batCacheid; > + *result = BATnew(TYPE_lng, TYPE_bat, 1); > + if (*result) BUNins(*result, &cutoff, &bid, FALSE); > + BBPunfix(bid); > + } > + return (*result)?GDK_SUCCEED:GDK_FAIL; > +} > + > +int > +CMDleftmergejoin_limit(BAT **result, BAT *left, BAT *right, lng* limit) > +{ > + size_t cutoff = *limit; > + *result = BATleftmergejoin_limit(left, right, cutoff, &cutoff); > + if (*result) { > + bat bid = (*result)->batCacheid; > + *result = BATnew(TYPE_lng, TYPE_bat, 1); > + if (*result) BUNins(*result, &cutoff, &bid, FALSE); > + BBPunfix(bid); > + } > + return (*result)?GDK_SUCCEED:GDK_FAIL; > +} > + > @= selectcmd > int CMDord_@1select1(BAT **result, BAT* b, ptr value) { > return (*result = BAT_select_(b, value, 0, TRUE, TRUE, @2, FALSE, TRUE))?GDK_SUCCEED:GDK_FAIL; > > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins -- Sjoerd Mullender

4 11

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/modules/mal bbp.mx, , 1.127, 1.128
by Stefan Manegold 27 Oct '08

27 Oct '08

On Mon, Oct 27, 2008 at 06:35:34AM +0000, Martin Kersten wrote: > Update of /cvsroot/monetdb/MonetDB5/src/modules/mal > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv4663 > > Modified Files: > bbp.mx > Log Message: > Silence compilers > > > U bbp.mx > Index: bbp.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/bbp.mx,v > retrieving revision 1.127 > retrieving revision 1.128 > diff -u -d -r1.127 -r1.128 > --- bbp.mx 25 Oct 2008 22:08:09 -0000 1.127 > +++ bbp.mx 27 Oct 2008 06:35:32 -0000 1.128 > @@ -867,7 +867,7 @@ > int i; > char buf[MAXPATHLEN]; > char cwd[MAXPATHLEN]; > - getcwd(cwd, MAXPATHLEN); > + (void) getcwd(cwd, MAXPATHLEN); This is not "sufficient". With optimization enabled, gcc still (correctly) complains as follows: ======== gcc -DHAVE_CONFIG_H -I. -I../../.. -I/ufs/manegold/_/scratch0/Monet/Testing/Current/source/MonetDB5/src/modules/mal -I/ufs/manegold/_/scratch0/Monet/Testing/Current/source/MonetDB5/src/modules/mal -I../atoms -I/ufs/manegold/_/scratch0/Monet/Testing/Current/source/MonetDB5/src/modules/mal/../atoms -I../kernel -I/ufs/manegold/_/scratch0/Monet/Testing/Current/source/MonetDB5/src/modules/mal/../kernel -I../../mal -I/ufs/manegold/_/scratch0/Monet/Testing/Current/source/MonetDB5/src/modules/mal/../../mal -I/ufs/manegold/_/scratch0/Monet/Testing/Current/prefix.--enable-strict_--disable-optimize_--disable-debug_--disable-assert/include/MonetDB -I/ufs/manegold/_/scratch0/Monet/Testing/Current/prefix.--enable-strict_--disable-optimize_--disable-debug_--disable-assert/include/MonetDB/mapilib -I/ufs/manegold/_/scratch0/Monet/Testing/Current/prefix.--enable-strict_--disable-optimize_--disable-debug_--disable-assert/include/MonetDB -I/ufs/manegold/_/scratch0/Monet/Testing/Current/prefix.--enable-strict_--disable-optimize_--disable-debug_--disable-assert/include/MonetDB/common -I/ufs/manegold/_/scratch0/Monet/Testing/Current/prefix.--enable-strict_--disable-optimize_--disable-debug_--disable-assert/include/MonetDB/gdk -I/usr/include/libxml2 -DLIBBBP -O2 -Wall -Wextra -std=c99 -Werror-implicit-function-declaration -Werror -Wpointer-arith -Wdeclaration-after-statement -Wundef -Wp,-D_FORTIFY_SOURCE=2 -D_REENTRANT -c bbp.c -fPIC -DPIC -o .libs/lib_bbp_la-bbp.o cc1: warnings being treated as errors /ufs/manegold/_/scratch0/Monet/Testing/Current/source/MonetDB5/src/modules/mal/bbp.mx: In function 'CMDbbpLocation': /ufs/manegold/_/scratch0/Monet/Testing/Current/source/MonetDB5/src/modules/mal/bbp.mx:874: warning: ignoring return value of 'getcwd', declared with attribute warn_unused_result make[8]: *** [lib_bbp_la-bbp.lo] Error 1 ======== getcwd() can fail (e.g., incase the current directpry is not readable for the user; see `man getcwd` for details), and hence, the return value needs to be checked, and proper measures need to be taken in case getcwd() does fail (e.g., have default fall-back or trigger warning or error). Stefan > b = BATnew(TYPE_int, TYPE_str, BBPsize); > if (b == 0) > > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins > > -- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4312 |

1 0

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB/src/gdk gdk_posix.mx, , 1.157, 1.158
by Stefan Manegold 25 Oct '08

25 Oct '08

On Sat, Oct 25, 2008 at 07:30:50AM +0000, Martin Kersten wrote: > Update of /cvsroot/monetdb/MonetDB/src/gdk > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv30373 > > Modified Files: > gdk_posix.mx > Log Message: > The memory map table maintained for the vmtrim > should be aligned to the number of mapped files. > In more recent applications, such as the SkyServer > this may be around 2000 BATs easily. > For the time being the limit of 100 is increased to 4096 > > The remainder are additions of '#' in error messages > to prepare for problems in the API. just an idea (without background knowledge): shouldn't we introduce a new symbol/chracter in the protocol to indicate warnings and informative message? '!' indicates errors (obviously never to be ignored) '#' indicates (usually to be ignored) comments '?' to be added to indicate warnings (and "informative messages)? '?' to be added for ... ?? Stefan > > > > U gdk_posix.mx > Index: gdk_posix.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB/src/gdk/gdk_posix.mx,v > retrieving revision 1.157 > retrieving revision 1.158 > diff -u -d -r1.157 -r1.158 > --- gdk_posix.mx 10 Oct 2008 08:50:35 -0000 1.157 > +++ gdk_posix.mx 25 Oct 2008 07:30:48 -0000 1.158 > @@ -389,7 +389,7 @@ > * hope the VM paging algorithm behaves better than Linux which just runs off > * the cliff and if MonetDB does not prevent RSS from being too high, enters coma. > * > - * We will only eb able to sensibly test this on Windows64. On Windows32, mmap sizes > + * We will only be able to sensibly test this on Windows64. On Windows32, mmap sizes > * do not significantly exceed RAM sizes so MonetDB swapping actually will not happen > * (of course, you've got this nasty problem of VM fragemntation and failing mmaps instead). > * > @@ -488,6 +488,10 @@ > * to the cursors (i.e. pointers to b->batBuns->free or the cursors > * in radix-cluster), which an enhanced version of this thread might > * take into account. > + * > + * [Kersten] The memory map table should be aligned to the number of > + * mapped files. In more recent applications, such as the SkyServer > + * this may be around 2000 BATs easily. > */ > > #ifdef HAVE_PTHREAD_H > @@ -519,7 +523,7 @@ > #endif > > #define MT_MMAP_TILE (1<<27) > -#define MT_MMAP_BUFSIZE 100 > +#define MT_MMAP_BUFSIZE 4096 > MT_mmap_t MT_mmap_tab[MT_MMAP_BUFSIZE]; > int MT_mmap_cur = -1, MT_mmap_first = -1, MT_mmap_free = 0; > > @@ -598,7 +602,7 @@ > if (MT_mmap_cur == -1) > MT_mmap_cur = i; > #ifdef MMAP_DEBUG > - stream_printf(GDKerr, "MT_mmap_new: %s fd=%d\n", path, fd); > + stream_printf(GDKerr, "#MT_mmap_new: %s fd=%d\n", path, fd); > #endif > strncpy(MT_mmap_tab[i].path, path, 128); > MT_mmap_tab[i].base = base; > @@ -642,13 +646,13 @@ > /* tell the OS quite clearly that you want to drop this */ > ret = posix_fadvise(MT_mmap_tab[victim].fd, 0LL, MT_mmap_tab[victim].len, POSIX_FADV_DONTNEED); > #ifdef MMAP_DEBUG > - stream_printf(GDKerr, "MT_mmap_del: posix_fadvise(%s,fd=%d,%uMB,POSIX_FADV_DONTNEED) = %d\n", MT_mmap_tab[victim].path, MT_mmap_tab[victim].fd, (unsigned int) (MT_mmap_tab[victim].len >> 20), ret); > + stream_printf(GDKerr, "#MT_mmap_del: posix_fadvise(%s,fd=%d,%uMB,POSIX_FADV_DONTNEED) = %d\n", MT_mmap_tab[victim].path, MT_mmap_tab[victim].fd, (unsigned int) (MT_mmap_tab[victim].len >> 20), ret); > #endif > } > #endif > ret = close(MT_mmap_tab[victim].fd); > #ifdef MMAP_DEBUG > - stream_printf(GDKerr, "MT_mmap_del: close(%s fd=%d) = %d\n", MT_mmap_tab[victim].path, MT_mmap_tab[victim].fd, ret); > + stream_printf(GDKerr, "#MT_mmap_del: close(%s fd=%d) = %d\n", MT_mmap_tab[victim].path, MT_mmap_tab[victim].fd, ret); > #endif > MT_mmap_tab[victim].next = MT_mmap_free; > MT_mmap_empty(victim); > @@ -674,7 +678,7 @@ > if (MT_mmap_tab[i].fd >= 0) { > ret = posix_fadvise(MT_mmap_tab[i].fd, 0, len, advice); > #ifdef MMAP_DEBUG > - stream_printf(GDKerr, "MT_fadvise: posix_fadvise(%s,fd=%d,%uMB,%d) = %d\n", MT_mmap_tab[i].path, MT_mmap_tab[i].fd, (unsigned int) (len >> 20), advice, ret); > + stream_printf(GDKerr, "#MT_fadvise: posix_fadvise(%s,fd=%d,%uMB,%d) = %d\n", MT_mmap_tab[i].path, MT_mmap_tab[i].fd, (unsigned int) (len >> 20), advice, ret); > #endif > } > } > @@ -697,7 +701,7 @@ > int ret = posix_madvise(MT_mmap_tab[i].base + off, MT_MMAP_TILE, POSIX_MADV_DONTNEED); > > if (err) { > - stream_printf(err, "MT_mmap_unload_tile: posix_madvise(%s,off=%uMB,%uMB,fd=%d,POSIX_MADV_DONTNEED) = %d\n", > + stream_printf(err, "#MT_mmap_unload_tile: posix_madvise(%s,off=%uMB,%uMB,fd=%d,POSIX_MADV_DONTNEED) = %d\n", > MT_mmap_tab[i].path, (unsigned int) (off >> 20), > (unsigned int) (MT_MMAP_TILE >> 20), MT_mmap_tab[i].fd, ret); > } > @@ -706,7 +710,7 @@ > /* tell the OS quite clearly that you want to drop this */ > ret = posix_fadvise(MT_mmap_tab[i].fd, off, MT_MMAP_TILE, POSIX_FADV_DONTNEED); > if (err) { > - stream_printf(err, "MT_mmap_unload_tile: posix_fadvise(%s,off=%uMB,%uMB,fd=%d,POSIX_MADV_DONTNEED) = %d\n", > + stream_printf(err, "#MT_mmap_unload_tile: posix_fadvise(%s,off=%uMB,%uMB,fd=%d,POSIX_MADV_DONTNEED) = %d\n", > MT_mmap_tab[i].path, (unsigned int) (off >> 20), > (unsigned int) (MT_MMAP_TILE >> 20), MT_mmap_tab[i].fd, ret); > } > @@ -721,7 +725,7 @@ > > /* save to disk an 128MB tile, and observe how long this takes */ > if (err) { > - stream_printf(err, "MT_mmap_save_tile: msync(%s,off=%uM,%u,SYNC)...\n", > + stream_printf(err, "#MT_mmap_save_tile: msync(%s,off=%uM,%u,SYNC)...\n", > MT_mmap_tab[i].path, (unsigned int) (tile >> 20), > (unsigned int) (MT_MMAP_TILE >> 20)); > } > @@ -729,7 +733,7 @@ > ret = MT_msync(MT_mmap_tab[i].base, tile, MT_MMAP_TILE, MMAP_SYNC); > t = GDKms() - t; > if (err) { > - stream_printf(err, "MT_mmap_save_tile: msync(%s,tile=%uM,%uM,SYNC) = %d (%dms)\n", > + stream_printf(err, "#MT_mmap_save_tile: msync(%s,tile=%uM,%uM,SYNC) = %d (%dms)\n", > MT_mmap_tab[i].path, (unsigned int) (tile >> 20), > (unsigned int) (MT_MMAP_TILE >> 20), ret, t); > } > @@ -768,7 +772,7 @@ > > (void) pthread_mutex_lock(&MT_mmap_lock); > if (err) { > - stream_printf(err, "MT_mmap_trim(%u MB): rss = %u MB\n", (unsigned int) ((target) >> 20), (unsigned int) (rss >> 20)); > + stream_printf(err, "#MT_mmap_trim(%u MB): rss = %u MB\n", (unsigned int) ((target) >> 20), (unsigned int) (rss >> 20)); > } > if (rss > target) { > /* try to selectively unload pages from the writable regions */ > @@ -1085,7 +1089,7 @@ > int ret = munmap(p, len); > > #ifdef MMAP_DEBUG > - stream_printf(GDKerr, "munmap(" LLFMT "," LLFMT ",%d) = %d\n", (long long) p, (long long) len, ret); > + stream_printf(GDKerr, "#munmap(" LLFMT "," LLFMT ",%d) = %d\n", (long long) p, (long long) len, ret); > #endif > MT_mmap_del(p, len); > return ret; > @@ -1097,7 +1101,7 @@ > int ret = msync(((char*) p)+off, len, (mode & MMAP_SYNC) ? MS_SYNC : ((mode & MMAP_ASYNC) ? MS_ASYNC : MS_INVALIDATE)); > > #ifdef MMAP_DEBUG > - stream_printf(GDKerr, "msync(" LLFMT "," LLFMT ",%s) = %d\n", (long long) p, (long long) len, (mode & MMAP_SYNC) ? "MS_SYNC" : ((mode & MMAP_ASYNC) ? "MS_ASYNC" : "MS_INVALIDATE"), ret); > + stream_printf(GDKerr, "#msync(" LLFMT "," LLFMT ",%s) = %d\n", (long long) p, (long long) len, (mode & MMAP_SYNC) ? "MS_SYNC" : ((mode & MMAP_ASYNC) ? "MS_ASYNC" : "MS_INVALIDATE"), ret); > #endif > if (ret < 0) > return errno; > @@ -1110,7 +1114,7 @@ > int ret = posix_madvise(p, len, advise); > > #ifdef MMAP_DEBUG > - stream_printf(GDKerr, "posix_madvise(" PTRFMT "," SZFMT ",%d) = %d\n", PTRFMTCAST p, len, advise, ret); > + stream_printf(GDKerr, "#posix_madvise(" PTRFMT "," SZFMT ",%d) = %d\n", PTRFMTCAST p, len, advise, ret); > #endif > if (MT_fadvise(p, len, advise)) > ret = -1; > @@ -1468,7 +1472,7 @@ > } > if (heapstatus == _HEAPBADPTR || heapstatus == _HEAPBADBEGIN || heapstatus == _HEAPBADNODE) { > > - stream_printf(GDKerr, "mallinfo(): heap is corrupt."); > + stream_printf(GDKerr, "#mallinfo(): heap is corrupt."); > } > _heapmin(); > return _ret; > @@ -1604,7 +1608,7 @@ > return; > > if (!FindClose(dir->find_file_handle)) > - stream_printf(GDKerr, "rewinddir(): FindClose() failed\n"); > + stream_printf(GDKerr, "#rewinddir(): FindClose() failed\n"); > > mask = malloc(strlen(dir->dir_name) + 3); > sprintf(mask, "%s\\*", dir->dir_name); > @@ -2116,7 +2120,7 @@ > p = (void *) VirtualAlloc(a, size, MEM_COMMIT | mode, PAGE_READWRITE); > (void) pthread_mutex_unlock(&MT_mmap_lock); > if (p == NULL) { > - stream_printf(GDKerr, "VirtualAlloc(" PTRFMT "," SZFMT ",MEM_COMMIT,PAGE_READWRITE): failed\n", PTRFMTCAST a, size); > + stream_printf(GDKerr, "#VirtualAlloc(" PTRFMT "," SZFMT ",MEM_COMMIT,PAGE_READWRITE): failed\n", PTRFMTCAST a, size); > } > return p; > } > @@ -2126,9 +2130,9 @@ > MT_vmfree(void *p, size_t size) > { > if (VirtualFree(p, size, MEM_DECOMMIT) == 0) > - stream_printf(GDKerr, "VirtualFree(" PTRFMT "," SZFMT ",MEM_DECOMMIT): failed\n", PTRFMTCAST p, size); > + stream_printf(GDKerr, "#VirtualFree(" PTRFMT "," SZFMT ",MEM_DECOMMIT): failed\n", PTRFMTCAST p, size); > if (VirtualFree(p, 0, MEM_RELEASE) == 0) > - stream_printf(GDKerr, "VirtualFree(" PTRFMT ",0,MEM_RELEASE): failed\n", PTRFMTCAST p); > + stream_printf(GDKerr, "#VirtualFree(" PTRFMT ",0,MEM_RELEASE): failed\n", PTRFMTCAST p); > } > > void * > @@ -2149,7 +2153,7 @@ > size_t ret = VirtualFree(p + newsize, oldsize - newsize, MEM_DECOMMIT); > > if (ret == 0) > - stream_printf(GDKerr, "VirtualFree(" PTRFMT "," SSZFMT ",MEM_DECOMMIT): failed\n", PTRFMTCAST(p + newsize), (ssize_t) (oldsize - newsize)); > + stream_printf(GDKerr, "#VirtualFree(" PTRFMT "," SSZFMT ",MEM_DECOMMIT): failed\n", PTRFMTCAST(p + newsize), (ssize_t) (oldsize - newsize)); > } else if (oldsize < newsize) { > (void) pthread_mutex_lock(&MT_mmap_lock); > a = (char *) VirtualAlloc(p, newsize, MEM_COMMIT, PAGE_READWRITE); > > > ------------------------------------------------------------------------- > This SF.Net email is sponsored by the Moblin Your Move Developer's challenge > Build the coolest Linux based applications with Moblin SDK & win great prizes > Grand prize is a trip for two to an Open Source event anywhere in the world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins > > -- | Dr. Stefan Manegold | mailto:Stefan.Manegold@cwi.nl | | CWI, P.O.Box 94079 | http://www.cwi.nl/~manegold/ | | 1090 GB Amsterdam | Tel.: +31 (20) 592-4212 | | The Netherlands | Fax : +31 (20) 592-4312 |

3 2