- developers-list - monetdb.org

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB4/tests/BugDay_2005-10-06_4.8/Tests multiple_servers.SF-914113.MIL.bat, MonetDB_4-20, NONE, 1.1.2.1
by Sjoerd Mullender 05 Oct '07

05 Oct '07

Stefan Manegold wrote: > Update of /cvsroot/monetdb/MonetDB4/tests/BugDay_2005-10-06_4.8/Tests > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15739/MonetDB4/tests/BugDay_2005-10-06_4.8/Tests > > Added Files: > Tag: MonetDB_4-20 > multiple_servers.SF-914113.MIL.bat > Log Message: > > added Windows version --- still needs to be tested/checked! > > > --- NEW FILE: multiple_servers.SF-914113.MIL.bat --- > @call @MSERVER@ --dbname=@TSTDB@ I can tell you right away that this won't fly. Either it has to be a .in file so that the @...@ stuff gets expanded, or if they are supposed to be environment variables, they should be %...%. -- Sjoerd Mullender

1 0

Re: [Monetdb-developers] [Monetdb-pf-checkins] pathfinder/modules/pftijah nexi_generate_mil.c, XQuery_0-18, 1.33.2.3, 1.33.2.4
by Sjoerd Mullender 05 Oct '07

05 Oct '07

Djoerd Hiemstra wrote: > Update of /cvsroot/monetdb/pathfinder/modules/pftijah > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1427 > > Modified Files: > Tag: XQuery_0-18 > nexi_generate_mil.c > Log Message: > The ir-model="LM" option was translated to "LMs" in the algebra. You do realize that the XQuery_0-18 branch is the *old* stable branch and that we're now using XQuery_0-20? > > Index: nexi_generate_mil.c > =================================================================== > RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/nexi_generate_mil.c,v > retrieving revision 1.33.2.3 > retrieving revision 1.33.2.4 > diff -u -d -r1.33.2.3 -r1.33.2.4 > --- nexi_generate_mil.c 15 Jun 2007 08:53:00 -0000 1.33.2.3 > +++ nexi_generate_mil.c 4 Oct 2007 13:11:35 -0000 1.33.2.4 > @@ -711,7 +711,7 @@ > case MODEL_LM : > > // MILPRINTF(MILOUT, "R%d := R%d.p_containing_q_LM(terms, qenv);\n", com_num, com_nr_left); > - MILPRINTF(MILOUT, "R%d := R%d.p_containing_q_LMs%s(terms%s,qenv);\n", com_num, com_nr_left, parserCtx->ffPfx, parserCtx->flastPfx); > + MILPRINTF(MILOUT, "R%d := R%d.p_containing_q_LM%s(terms%s,qenv);\n", com_num, com_nr_left, parserCtx->ffPfx, parserCtx->flastPfx); > > break; > > > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Splunk Inc. > Still grepping through log files to find problems? Stop. > Now Search log events and configuration files using AJAX and a browser. > Download your FREE copy of Splunk now >> http://get.splunk.com/ > _______________________________________________ > Monetdb-pf-checkins mailing list > Monetdb-pf-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins -- Sjoerd Mullender

5 5

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/tests/gdkTests/Tests casts.mal, MonetDB_5-0, 1.4, 1.4.4.1
by Stefan Manegold 02 Oct '07

02 Oct '07

On Sat, Sep 29, 2007 at 09:07:39PM +0000, Martin Kersten wrote: > Update of /cvsroot/monetdb/MonetDB5/tests/gdkTests/Tests > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20428/Tests > > Modified Files: > Tag: MonetDB_5-0 > casts.mal > Log Message: > Better handle to detect the differences. > No need to roll forward. Since this checkin was to the abondoned MonetDB_5-0 branch, there will not even be any attempts to propagate it. For info: Since Sep 18 2007, we have and use release branch MonetDB_5-2 for MonetDB5; see also http://sourceforge.net/mailarchive/forum.php?thread_name=20070918223806.GA2… Stefan -- | 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

[Monetdb-developers] Mserver is aborting
by Riham Abdel Kader 02 Oct '07

02 Oct '07

Forgot the attachments! --------------------------------------------------------------------------- Hi all, I checked out today the MonetDB/XQuery code and Mserver is crashing whenever I try to execute MIL statements using the mclient command. More details follow. I first compile an XQuery to MIL statements using the command "pf -A" Then I execute the MIL statements with "mclient -t -l" Whenever I do so, I get the correct results but Mserver aborts after giving the following error message: Mserver: monet_tbl.mx:1743: TBL_M_decref: Assertion `p' failed. Aborted I have attached the XQuery file and the generated MIL file. Thank you and best regards, Riham -- Address: Database Group, Dept of EEMCS, University of Twente, POBox 217, 7500 AE Enschede, The Netherlands Phone: +31 (0)53 489 4628 Fax: +31 (0)53 489 2927 Email: r.abdelkader(a)ewi.utwente.nl for $p in doc("doc_100000_10ab_1000pr.xml")//a/p, $r in doc("doc_100000_10ab_1000pr.xml")//b/r where $p/text() = $r/text() return $r module ("pathfinder"); module ("mkey"); var time_load; var time_query; var time_print; var a0000; var a0001; var a0002; var a0003; var a0004; var a0005; var a0006; var a0007; var a0008; var a0009; var a0010; var a0011; var a0012; var a0013; var a0014; var unused; var ws; unused := nil; # trace structure var trace_outer; var trace_inner; var trace_iter; var trace_msg; var trace_item; var trace_type; var trace_rel; # Begin rule: "Query: serialize(FragList, Rel)" a0001 := CATCH ({ ws := ws_create (); # Begin rule: "Rel: lit_tbl" # a0000: iter(nat) a0000 := new (void, oid).seqbase (0@0); a0000.append (1@0); a0000.access (BAT_READ); # a0001: item(str) a0001 := new (void, str).seqbase (0@0); a0001.append ("doc_100000_10ab_1000pr.xml"); a0001.access (BAT_READ); # End rule: "Rel: lit_tbl" # Begin rule: "FragRel: doc_tbl(Rel)" # a0000: iter(nat) # a0005: item(pre) # a0004: item(pfrag) a0003 := doc_tbl (ws, a0001); a0005 := a0003.fetch (1); a0004 := a0003.fetch (2); ws := a0003.fetch (0); a0003 := unused; a0002 := unused; a0001 := unused; # End rule: "FragRel: doc_tbl(Rel)" # Begin rule: "Rel: roots(FragRel)" # a0000: iter(nat) # a0005: item(pre) # a0004: item(pfrag) # End rule: "Rel: roots(FragRel)" # Begin rule: "Frag: fragment(FragRel)" # End rule: "Frag: fragment(FragRel)" # Begin rule: "FragList: empty_frag" # End rule: "FragList: empty_frag" # Begin rule: "FragList: frag_union(FragList, Frag)" # End rule: "FragList: frag_union(FragList, Frag)" # Begin rule: "Rel: llscj_desc(FragList, Rel)" a0001 := loop_lifted_descendant_step_with_nsloc_test (a0000, a0005, a0004, ws, 2, "", "b"); a0002 := a0001.fetch (1); a0003 := a0001.fetch (2).materialize (a0002); # a0002: item(pre) # a0003: item(pfrag) a0006 := a0001.fetch (0).materialize (a0001.fetch (1)); # a0006: iter(nat) a0001 := unused; # End rule: "Rel: llscj_desc(FragList, Rel)" # Begin rule: "Rel: llscj_child(FragList, Rel)" a0001 := loop_lifted_child_step_with_nsloc_test (a0006, a0002, a0003, ws, 3, "", "r"); a0007 := a0001.fetch (1); a0008 := a0001.fetch (2).materialize (a0007); # a0007: item(pre) # a0008: item(pfrag) # a0009: iter(nat) a0001 := unused; a0002 := unused; a0003 := unused; a0006 := unused; # End rule: "Rel: llscj_child(FragList, Rel)" # Begin rule: "Rel: project(Rel)" # a0008: item(pfrag) # a0007: item(pre) a0009 := unused; # End rule: "Rel: project(Rel)" # Begin rule: "Rel: number(Rel)" # a0008: item(pfrag) # a0007: item(pre) a0001 := a0007.mark (1@0); # a0001: iter1(nat) # End rule: "Rel: number(Rel)" # Begin rule: "Rel: project(Rel)" # a0008: item(pfrag) # a0007: item(pre) # a0001: iter(nat) # End rule: "Rel: project(Rel)" # Begin rule: "Rel: llscj_child(FragList, Rel)" a0002 := loop_lifted_child_step_with_kind_test (a0001, a0007, a0008, ws, 3, TEXT); a0003 := a0002.fetch (1); a0006 := a0002.fetch (2); # a0003: item(pre) # a0006: item(pfrag) a0009 := a0002.fetch (0).materialize (a0002.fetch (1)); # a0009: iter(nat) a0002 := unused; # End rule: "Rel: llscj_child(FragList, Rel)" # Begin rule: "Rel: doc_access(FragList, Rel)" # a0003: item(pre) # a0006: item(pfrag) # a0009: iter(nat) a0002 := mposjoin (mposjoin (a0003, a0006, ws.fetch (PRE_PROP)), mposjoin (a0003, a0006, ws.fetch (PRE_CONT)), ws.fetch (PROP_TEXT)); # a0002: item1(str) # End rule: "Rel: doc_access(FragList, Rel)" # Begin rule: "Rel: project(Rel)" # a0009: iter(nat) # a0002: item1(str) a0003 := unused; a0006 := unused; # End rule: "Rel: project(Rel)" # Begin rule: "Rel: project(Rel)" # a0000: iter(nat) # a0004: item1(pfrag) # a0005: item1(pre) # End rule: "Rel: project(Rel)" # Begin rule: "Rel: llscj_desc(FragList, Rel)" a0003 := loop_lifted_descendant_step_with_nsloc_test (a0000, a0005, a0004, ws, 2, "", "a"); a0006 := a0003.fetch (1); a0010 := a0003.fetch (2).materialize (a0006); # a0006: item1(pre) # a0010: item1(pfrag) a0011 := a0003.fetch (0).materialize (a0003.fetch (1)); # a0011: iter(nat) a0003 := unused; a0000 := unused; a0004 := unused; a0005 := unused; # End rule: "Rel: llscj_desc(FragList, Rel)" # Begin rule: "Rel: llscj_child(FragList, Rel)" a0000 := loop_lifted_child_step_with_nsloc_test (a0011, a0006, a0010, ws, 3, "", "p"); a0003 := a0000.fetch (1); a0004 := a0000.fetch (2).materialize (a0003); # a0003: item1(pre) # a0004: item1(pfrag) # a0005: iter(nat) a0000 := unused; a0006 := unused; a0010 := unused; a0011 := unused; # End rule: "Rel: llscj_child(FragList, Rel)" # Begin rule: "Rel: project(Rel)" # a0004: item1(pfrag) # a0003: item1(pre) a0005 := unused; # End rule: "Rel: project(Rel)" # Begin rule: "Rel: number(Rel)" # a0004: item1(pfrag) # a0003: item1(pre) a0000 := a0003.mark (1@0); # a0000: iter2(nat) # End rule: "Rel: number(Rel)" # Begin rule: "Rel: llscj_child(FragList, Rel)" a0005 := loop_lifted_child_step_with_kind_test (a0000, a0003, a0004, ws, 3, TEXT); a0006 := a0005.fetch (1); a0010 := a0005.fetch (2); # a0006: item1(pre) # a0010: item1(pfrag) a0011 := a0005.fetch (0).materialize (a0005.fetch (1)); # a0011: iter2(nat) a0005 := unused; # End rule: "Rel: llscj_child(FragList, Rel)" # Begin rule: "Rel: doc_access(FragList, Rel)" # a0006: item1(pre) # a0010: item1(pfrag) # a0011: iter2(nat) a0005 := mposjoin (mposjoin (a0006, a0010, ws.fetch (PRE_PROP)), mposjoin (a0006, a0010, ws.fetch (PRE_CONT)), ws.fetch (PROP_TEXT)); # a0005: item(str) # End rule: "Rel: doc_access(FragList, Rel)" # Begin rule: "Rel: project(Rel)" # a0011: iter2(nat) # a0005: item(str) a0006 := unused; a0010 := unused; # End rule: "Rel: project(Rel)" # Begin rule: "Rel: unq2_thetajoin(Rel, Rel)" # a0010: iter2(nat) # a0012: iter(nat) a0006 := htordered_unique_thetajoin (EQ, a0011.reverse ().leftjoin (a0005), a0009.reverse ().leftjoin (a0002), nil, nil); a0010 := a0006.mark (0(a)0).reverse (); a0010 := a0010.assert_order (); a0012 := a0006.reverse ().mark (0(a)0).reverse (); a0006 := unused; a0011 := unused; a0005 := unused; a0009 := unused; a0002 := unused; # End rule: "Rel: unq2_thetajoin(Rel, Rel)" # Begin rule: "Rel: project(Rel)" # a0010: iter2(nat) # a0012: iter(nat) # End rule: "Rel: project(Rel)" # Begin rule: "Rel: leftjoin(Rel, Rel)" a0002 := a0012.leftjoin (a0001.reverse ()); a0005 := a0002.mark (0(a)0).reverse (); a0006 := a0002.reverse ().mark (0(a)0).reverse (); a0002 := unused; a0002 := a0005.leftjoin (a0010); a0002 := a0002.reverse ().mark (0(a)0).reverse (); # a0002: iter2(nat) # a0009: iter(nat) a0011 := a0006.leftjoin (a0008); a0011 := a0011.reverse ().mark (0(a)0).reverse (); # a0011: item(pfrag) a0013 := a0006.leftjoin (a0007); a0013 := a0013.reverse ().mark (0(a)0).reverse (); # a0013: item(pre) # a0014: iter1(nat) a0005 := unused; a0006 := unused; a0010 := unused; a0012 := unused; a0008 := unused; a0007 := unused; a0001 := unused; # End rule: "Rel: leftjoin(Rel, Rel)" # Begin rule: "Rel: project(Rel)" # a0011: item(pfrag) # a0013: item(pre) # a0002: iter2(nat) a0009 := unused; a0014 := unused; # End rule: "Rel: project(Rel)" # Begin rule: "Rel: project(Rel)" # a0004: item1(pfrag) # a0003: item1(pre) # a0000: iter(nat) # End rule: "Rel: project(Rel)" # Begin rule: "Rel: leftjoin(Rel, Rel)" a0001 := a0000.leftjoin (a0002.reverse ()); a0005 := a0001.mark (0(a)0).reverse (); a0006 := a0001.reverse ().mark (0(a)0).reverse (); a0001 := unused; a0001 := a0005.leftjoin (a0004); a0001 := a0001.reverse ().mark (0(a)0).reverse (); # a0001: item1(pfrag) a0007 := a0005.leftjoin (a0003); a0007 := a0007.reverse ().mark (0(a)0).reverse (); # a0007: item1(pre) # a0008: iter(nat) a0009 := a0006.leftjoin (a0011); a0009 := a0009.reverse ().mark (0(a)0).reverse (); # a0009: item(pfrag) a0010 := a0006.leftjoin (a0013); a0010 := a0010.reverse ().mark (0(a)0).reverse (); # a0010: item(pre) # a0012: iter2(nat) a0005 := unused; a0006 := unused; a0004 := unused; a0003 := unused; a0000 := unused; a0011 := unused; a0013 := unused; a0002 := unused; # End rule: "Rel: leftjoin(Rel, Rel)" # Begin rule: "Rel: project(Rel)" # a0009: item(pfrag) # a0010: item(pre) # a0001: item1(pfrag) # a0007: item1(pre) a0008 := unused; a0012 := unused; # End rule: "Rel: project(Rel)" # Begin rule: "Rel: refine_sort(Rel)" a0000 := a0001; a0000 := a0000.CTrefine (a0007); a0000 := a0000.CTrefine (a0009); a0000 := a0000.CTrefine (a0010); a0000 := a0000.mark (0(a)0).reverse (); a0002 := a0000.leftjoin (a0009); a0002 := a0002.reverse ().mark (0(a)0).reverse (); # a0002: item(pfrag) a0003 := a0000.leftjoin (a0010); a0003 := a0003.reverse ().mark (0(a)0).reverse (); # a0003: item(pre) # a0001: item1(pfrag) # a0007: item1(pre) a0000 := unused; a0009 := unused; a0010 := unused; # End rule: "Rel: refine_sort(Rel)" # Begin rule: "Rel: number(Rel)" # a0002: item(pfrag) # a0003: item(pre) # a0001: item1(pfrag) # a0007: item1(pre) # a0000: pos(nat) # End rule: "Rel: number(Rel)" # Begin rule: "Rel: project(Rel)" # a0002: item(pfrag) # a0003: item(pre) # a0000: pos(nat) a0001 := unused; a0007 := unused; # End rule: "Rel: project(Rel)" a0004 := new (lng, void).key (true).reverse ().seqbase (0@0); a0005 := new (dbl, void).key (true).reverse ().seqbase (0@0); a0006 := new (str, void).key (true).reverse ().seqbase (0@0); a0007 := a0003; a0008 := a0002.set_kind (ELEM); a0007 := a0007.reverse ().mark (0(a)0).reverse (); a0008 := a0008.reverse ().mark (0(a)0).reverse (); print_result ("xml", ws, a0007, a0008, a0004, a0005, a0005, a0006); a0004 := unused; a0005 := unused; a0006 := unused; a0007 := unused; a0008 := unused; a0001 := unused; }); if (not(isnil(ws))) { ws_destroy (ws); } else { } if (not(isnil(a0001))) { ERROR (a0001); } else { } a0001 := unused; a0002 := unused; a0003 := unused; a0000 := unused; # End rule: "Query: serialize(FragList, Rel)"

2 2

[Monetdb-developers] Mserver is aborting
by Riham Abdel Kader 02 Oct '07

02 Oct '07

Hi all, I checked out today the MonetDB/XQuery code and Mserver is crashing whenever I try to execute MIL statements using the mclient command. More details follow. I first compile an XQuery to MIL statements using the command "pf -A" Then I execute the MIL statements with "mclient -t -l" Whenever I do so, I get the correct results but Mserver aborts after giving the following error message: Mserver: monet_tbl.mx:1743: TBL_M_decref: Assertion `p' failed. Aborted I have attached the XQuery file and the generated MIL file. Thank you and best regards, Riham -- Address: Database Group, Dept of EEMCS, University of Twente, POBox 217, 7500 AE Enschede, The Netherlands Phone: +31 (0)53 489 4628 Fax: +31 (0)53 489 2927 Email: r.abdelkader(a)ewi.utwente.nl

1 0

[Monetdb-developers] sourceforge outage
by Sjoerd Mullender 01 Oct '07

01 Oct '07

To forestall any questions, the Sourceforge stite status has this today: ( 2007-09-30 14:42:31 - Project CVS Service ) As of 2007-09-29 at 10:00PM Pacific, we have a CVS outage due to unplanned maintenance. This affects developer CVS access (including ViewVC) for projects starting with the letters m, n and q. Site status will be updated when the system becomes available again. -- Sjoerd Mullender

1 0

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/mal mal_interpreter.mx, , 1.198, 1.199
by Stefan Manegold 28 Sep '07

28 Sep '07

On Fri, Sep 28, 2007 at 08:10:06PM +0000, Martin Kersten wrote: > Update of /cvsroot/monetdb/MonetDB5/src/mal > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18777 > > Modified Files: > mal_interpreter.mx > Log Message: > Avoid complaints by compilers by switching to the preprocessor. Martin, before you wonder why the SLOW ans FAST cases don't show any differences any more --- neither performance nor in speed ---: Since your code defines both macros SLOW (as 1) and FAST (as 0), directives #ifdef @1 with @1 being substituted with either SLOW or FAST by Mx, always evaluate to true, regardsless of whether @1 is SLOW (== 1) or FAST (== 0). As initially suggested by both Sjoerd and me, you might want to use #if @1 directives, instead, to re-establish your (supposely) intended behaviour. Stefan > Index: mal_interpreter.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_interpreter.mx,v > retrieving revision 1.198 > retrieving revision 1.199 > diff -u -d -r1.198 -r1.199 > --- mal_interpreter.mx 28 Sep 2007 16:00:57 -0000 1.198 > +++ mal_interpreter.mx 28 Sep 2007 20:10:04 -0000 1.199 > @@ -743,13 +743,15 @@ > case ENDsymbol: > if( getInstrPtr(mb,0)->token == FACTORYsymbol) > ret= shutdownFactory(mb); > - if( @1 && oldtimer) > +#ifdef @1 > + if( oldtimer) > cntxt->timer= oldtimer; > +#endif > if( pcicaller && garbageControl(getInstrPtr(mb,0)) ) > garbageCollector(mb, stk, TRUE); > - if(@1){ > - @:endProfile@ > - } > +#ifdef @1 > + @:endProfile@ > +#endif > stkpc= mb->stop; > continue; > default: > @@ -759,9 +761,9 @@ > } > ret = createScriptException(mb, stkpc,MAL, > NULL, "unkown operation"); > - if( @1){ > - @:endProfile@ > - } > +#ifdef @1 > + @:endProfile@ > +#endif > stkpc= mb->stop; > continue; > } > @@ -1027,7 +1029,8 @@ > } > } > /* Provide debugging support */ > - if( @1 && (GDKdebug & 10) ){ > +#ifdef @1 > + if( GDKdebug & 10 ){ > BAT *b; > str oldmsg =0; > > @@ -1061,6 +1064,7 @@ > } > } > } > +#endif > @- > @= commandcall > { > @@ -1599,7 +1603,8 @@ > #endif > > @= timingHndlr > -if( @1 && cntxt->flags && stk->cmd != 't' && stk->cmd != 'C'){ > +#ifdef @1 > +if( cntxt->flags && stk->cmd != 't' && stk->cmd != 'C'){ > if( cntxt->flags & timerFlag) > stream_printf(cntxt->fdout,"[%6d usec ",GDKusec()-cntxt->timer); > #ifdef HAVE_SYS_RESOURCE_H > @@ -1641,6 +1646,7 @@ > if( cntxt->flags & timerFlag) > cntxt->timer = GDKusec(); > } > +#endif > @- > The bigfoot memory tracker keeps track on the space > occupancy of BATs. It ignores for the time being the heaps. > > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Microsoft > Defy all challenges. Microsoft(R) Visual Studio 2005. > http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ > _______________________________________________ > 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] MonetDB5/src/mal mal_interpreter.mx, , 1.197, 1.198
by Sjoerd Mullender 28 Sep '07

28 Sep '07

On 2007-09-28 18:01, Martin Kersten wrote: > Update of /cvsroot/monetdb/MonetDB5/src/mal > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5547 > > Modified Files: > mal_interpreter.mx > Log Message: > Split the interpreter in two versions. A FAST and SLOW version. > If there is no request for debugging or performance measurement > outstanding, we can go the fast path. However, given the fact > that at any time we may enter the debugger, a jump to the slow > line is always possible. > The code relies on compiler optimization to get rid of blocks > with constant arguments. Unclear if all compilers are that smart. This may fail for some compilers. Some compilers warn about constant expressions in conditionals, and we turn warnings into errors. Be prepared to fix this if there are compilers that have a problem with this usage. One way to solve the problem is to use the preprocessor: #if @1 ... #endif instead of if (@1) { ... } > > Index: mal_interpreter.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_interpreter.mx,v > retrieving revision 1.197 > retrieving revision 1.198 > diff -u -d -r1.197 -r1.198 > --- mal_interpreter.mx 24 Sep 2007 08:24:22 -0000 1.197 > +++ mal_interpreter.mx 28 Sep 2007 16:00:57 -0000 1.198 > @@ -70,6 +70,9 @@ > #include "mal_debugger.h" /* for mdbStep() */ > #include "mal_type.h" > > +#define SLOW 1 > +#define FAST 0 > + > static str runMALsequence( Client cntxt, MalBlkPtr mb, int startpc, > int stoppc, MalStkPtr stk, MalStkPtr env, InstrPtr pcicaller); > static str setDynamicType(MalBlkPtr mb, VarPtr v, int tpe, int pc); > @@ -421,8 +424,27 @@ > stkpc = startpc; > exceptionVar = exceptionPC = -1; > (void)exceptionPC; /* TODO maybe we should use this variable somewhere*/ > +@- > +From this point onwards we should differentiate fast processing > +against monitored processing. Fast processing is possible if there is > +no call to the debugger statically/dynamically set. Same holds for > +performance control statements. > +The code currently does not statically checks the mode change. > +Preferrably we should introduce a itrace flag PROFILE > +We rely on optimizing compilers to remove the redundant code. > +@c > + if( malProfileMode == 0 && cntxt->itrace==0){ > + while(stkpc < mb->stop && stkpc != stoppc ){ > + pci = getInstrPtr(mb,stkpc); > + if( malProfileMode + cntxt->itrace) > + goto workslow; > + @:MALinterpret(FAST)@ > + @:MALflowofcontrol(FAST)@ > + } > + } else > while(stkpc < mb->stop && stkpc != stoppc ){ > pci = getInstrPtr(mb,stkpc); > +workslow: > if( cntxt->itrace ) { > lng t=0; > if( stk->cmd== 0) stk->cmd= cntxt->itrace; > @@ -445,8 +467,8 @@ > } > > @:beginProfile@ > - @:MALinterpret@ > - @:MALflowofcontrol@ > + @:MALinterpret(SLOW)@ > + @:MALflowofcontrol(SLOW)@ > @:endProfile@ > } > @:MALwrapup@ > @@ -639,11 +661,11 @@ > limited. > @c > switch( pci->token){ > - case ASSIGNsymbol: @:assignStmt@ break; > - case PATcall: @:patterncall@ break; > - case CMDcall: @:commandcall@ break; > - case FACcall: @:factorycall@ break; > - case FCNcall: @:functioncall@ break; > + case ASSIGNsymbol: @:assignStmt(SLOW)@ break; > + case PATcall: @:patterncall(SLOW)@ break; > + case CMDcall: @:commandcall(SLOW)@ break; > + case FACcall: @:factorycall(SLOW)@ break; > + case FCNcall: @:functioncall(SLOW)@ break; > } > /* we don't allow sequential flow control here */ > dropMALflowStep(flow,stkpc,n,pending,mb,stk); > @@ -710,22 +732,24 @@ > @= MALinterpret > ret = 0; > switch( pci->token){ > - case ASSIGNsymbol: @:assignStmt@ break; > - case PATcall: @:patterncall@ break; > - case CMDcall: @:commandcall@ break; > - case FACcall: @:factorycall@ break; > - case FCNcall: @:functioncall@ break; > + case ASSIGNsymbol: @:assignStmt(@1)@ break; > + case PATcall: @:patterncall(@1)@ break; > + case CMDcall: @:commandcall(@1)@ break; > + case FACcall: @:factorycall(@1)@ break; > + case FCNcall: @:functioncall(@1)@ break; > case NOOPsymbol: > case REMsymbol: > break; > case ENDsymbol: > if( getInstrPtr(mb,0)->token == FACTORYsymbol) > ret= shutdownFactory(mb); > - if( oldtimer) > + if( @1 && oldtimer) > cntxt->timer= oldtimer; > if( pcicaller && garbageControl(getInstrPtr(mb,0)) ) > garbageCollector(mb, stk, TRUE); > - @:endProfile@ > + if(@1){ > + @:endProfile@ > + } > stkpc= mb->stop; > continue; > default: > @@ -735,7 +759,9 @@ > } > ret = createScriptException(mb, stkpc,MAL, > NULL, "unkown operation"); > - @:endProfile@ > + if( @1){ > + @:endProfile@ > + } > stkpc= mb->stop; > continue; > } > @@ -886,9 +912,10 @@ > if( lhs->vtype == TYPE_bat) > BBPincref(lhs->val.br.id, TRUE); > } > - @:restoreTarget@ > + @:restoreTarget(@1)@ > ret = 0; > - @:exceptionHndlr@ > + @:exceptionHndlr(@1)@ > + @:timingHndlr(@1)@ > } > @} > @- > @@ -1000,7 +1027,7 @@ > } > } > /* Provide debugging support */ > - if( GDKdebug & 10 ){ > + if( @1 && (GDKdebug & 10) ){ > BAT *b; > str oldmsg =0; > > @@ -1146,8 +1173,9 @@ > ret = createScriptException(mb, stkpc, MAL, NULL, > "too many arguments for command call"); > } > - @:restoreTarget@ > - @:exceptionHndlr@ > + @:restoreTarget(@1)@ > + @:exceptionHndlr(@1)@ > + @:timingHndlr(@1)@ > } > @- > @= patterncall > @@ -1157,8 +1185,9 @@ > else { > @:safeTarget@ > ret = (str) (*pci->fcn)(mb,stk,pci); > - @:restoreTarget@ > - @:exceptionHndlr@ > + @:restoreTarget(@1)@ > + @:exceptionHndlr(@1)@ > + @:timingHndlr(@1)@ > } > @- > MAL function calls are relatively expensive, because they have to assemble > @@ -1171,8 +1200,9 @@ > stk->pcup = stkpc; > @:safeTarget@ > ret= runMAL(cntxt,pci->blk,1,mb,stk,pci); > - @:restoreTarget@ > - @:exceptionHndlr@ > + @:restoreTarget(@1)@ > + @:exceptionHndlr(@1)@ > + @:timingHndlr(@1)@ > } > @- > Factory calls are more involved. At this stage it is a synchrononous > @@ -1184,7 +1214,8 @@ > "reference to MAL function missing"); > else > ret= runFactory(cntxt,pci->blk,mb,stk,pci); > - @:exceptionHndlr@ > + @:exceptionHndlr(@1)@ > + @:timingHndlr(SLOW)@ > @- > The type dispatching table in getArgValue can be removed if we > determine at compile time the address offset within a ValRecord. > @@ -1323,7 +1354,6 @@ > @{ > > @= exceptionHndlr > - @:timingHndlr@ > if( ret != MAL_SUCCEED ) { > str msg = 0, nxt; > if( stk->cmd ) { > @@ -1569,7 +1599,7 @@ > #endif > > @= timingHndlr > -if( cntxt->flags && stk->cmd != 't' && stk->cmd != 'C'){ > +if( @1 && cntxt->flags && stk->cmd != 't' && stk->cmd != 'C'){ > if( cntxt->flags & timerFlag) > stream_printf(cntxt->fdout,"[%6d usec ",GDKusec()-cntxt->timer); > #ifdef HAVE_SYS_RESOURCE_H > > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Microsoft > Defy all challenges. Microsoft(R) Visual Studio 2005. > http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ > _______________________________________________ > Monetdb-checkins mailing list > Monetdb-checkins(a)lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins -- Sjoerd Mullender

1 0

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/mal mal_interpreter.mx, , 1.197, 1.198
by Stefan Manegold 28 Sep '07

28 Sep '07

On Fri, Sep 28, 2007 at 04:01:00PM +0000, Martin Kersten wrote: > Update of /cvsroot/monetdb/MonetDB5/src/mal > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv5547 > > Modified Files: > mal_interpreter.mx > Log Message: > Split the interpreter in two versions. A FAST and SLOW version. > If there is no request for debugging or performance measurement > outstanding, we can go the fast path. However, given the fact > that at any time we may enter the debugger, a jump to the slow > line is always possible. > The code relies on compiler optimization to get rid of blocks > with constant arguments. Unclear if all compilers are that smart. All C-compilers (respetively their C preprocessors) are expected to respect C preprocessor directives (e.g., #if ... #endif), "even" with optimization disabled. Hence, why not use those compile-time conditionals instead "pseudo"-runtime conditionals with constant conditions? (Would also speed-up the compilation process...) Stefan > > > Index: mal_interpreter.mx > =================================================================== > RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_interpreter.mx,v > retrieving revision 1.197 > retrieving revision 1.198 > diff -u -d -r1.197 -r1.198 > --- mal_interpreter.mx 24 Sep 2007 08:24:22 -0000 1.197 > +++ mal_interpreter.mx 28 Sep 2007 16:00:57 -0000 1.198 > @@ -70,6 +70,9 @@ > #include "mal_debugger.h" /* for mdbStep() */ > #include "mal_type.h" > > +#define SLOW 1 > +#define FAST 0 > + > static str runMALsequence( Client cntxt, MalBlkPtr mb, int startpc, > int stoppc, MalStkPtr stk, MalStkPtr env, InstrPtr pcicaller); > static str setDynamicType(MalBlkPtr mb, VarPtr v, int tpe, int pc); > @@ -421,8 +424,27 @@ > stkpc = startpc; > exceptionVar = exceptionPC = -1; > (void)exceptionPC; /* TODO maybe we should use this variable somewhere*/ > +@- > +From this point onwards we should differentiate fast processing > +against monitored processing. Fast processing is possible if there is > +no call to the debugger statically/dynamically set. Same holds for > +performance control statements. > +The code currently does not statically checks the mode change. > +Preferrably we should introduce a itrace flag PROFILE > +We rely on optimizing compilers to remove the redundant code. > +@c > + if( malProfileMode == 0 && cntxt->itrace==0){ > + while(stkpc < mb->stop && stkpc != stoppc ){ > + pci = getInstrPtr(mb,stkpc); > + if( malProfileMode + cntxt->itrace) > + goto workslow; > + @:MALinterpret(FAST)@ > + @:MALflowofcontrol(FAST)@ > + } > + } else > while(stkpc < mb->stop && stkpc != stoppc ){ > pci = getInstrPtr(mb,stkpc); > +workslow: > if( cntxt->itrace ) { > lng t=0; > if( stk->cmd== 0) stk->cmd= cntxt->itrace; > @@ -445,8 +467,8 @@ > } > > @:beginProfile@ > - @:MALinterpret@ > - @:MALflowofcontrol@ > + @:MALinterpret(SLOW)@ > + @:MALflowofcontrol(SLOW)@ > @:endProfile@ > } > @:MALwrapup@ > @@ -639,11 +661,11 @@ > limited. > @c > switch( pci->token){ > - case ASSIGNsymbol: @:assignStmt@ break; > - case PATcall: @:patterncall@ break; > - case CMDcall: @:commandcall@ break; > - case FACcall: @:factorycall@ break; > - case FCNcall: @:functioncall@ break; > + case ASSIGNsymbol: @:assignStmt(SLOW)@ break; > + case PATcall: @:patterncall(SLOW)@ break; > + case CMDcall: @:commandcall(SLOW)@ break; > + case FACcall: @:factorycall(SLOW)@ break; > + case FCNcall: @:functioncall(SLOW)@ break; > } > /* we don't allow sequential flow control here */ > dropMALflowStep(flow,stkpc,n,pending,mb,stk); > @@ -710,22 +732,24 @@ > @= MALinterpret > ret = 0; > switch( pci->token){ > - case ASSIGNsymbol: @:assignStmt@ break; > - case PATcall: @:patterncall@ break; > - case CMDcall: @:commandcall@ break; > - case FACcall: @:factorycall@ break; > - case FCNcall: @:functioncall@ break; > + case ASSIGNsymbol: @:assignStmt(@1)@ break; > + case PATcall: @:patterncall(@1)@ break; > + case CMDcall: @:commandcall(@1)@ break; > + case FACcall: @:factorycall(@1)@ break; > + case FCNcall: @:functioncall(@1)@ break; > case NOOPsymbol: > case REMsymbol: > break; > case ENDsymbol: > if( getInstrPtr(mb,0)->token == FACTORYsymbol) > ret= shutdownFactory(mb); > - if( oldtimer) > + if( @1 && oldtimer) > cntxt->timer= oldtimer; > if( pcicaller && garbageControl(getInstrPtr(mb,0)) ) > garbageCollector(mb, stk, TRUE); > - @:endProfile@ > + if(@1){ > + @:endProfile@ > + } > stkpc= mb->stop; > continue; > default: > @@ -735,7 +759,9 @@ > } > ret = createScriptException(mb, stkpc,MAL, > NULL, "unkown operation"); > - @:endProfile@ > + if( @1){ > + @:endProfile@ > + } > stkpc= mb->stop; > continue; > } > @@ -886,9 +912,10 @@ > if( lhs->vtype == TYPE_bat) > BBPincref(lhs->val.br.id, TRUE); > } > - @:restoreTarget@ > + @:restoreTarget(@1)@ > ret = 0; > - @:exceptionHndlr@ > + @:exceptionHndlr(@1)@ > + @:timingHndlr(@1)@ > } > @} > @- > @@ -1000,7 +1027,7 @@ > } > } > /* Provide debugging support */ > - if( GDKdebug & 10 ){ > + if( @1 && (GDKdebug & 10) ){ > BAT *b; > str oldmsg =0; > > @@ -1146,8 +1173,9 @@ > ret = createScriptException(mb, stkpc, MAL, NULL, > "too many arguments for command call"); > } > - @:restoreTarget@ > - @:exceptionHndlr@ > + @:restoreTarget(@1)@ > + @:exceptionHndlr(@1)@ > + @:timingHndlr(@1)@ > } > @- > @= patterncall > @@ -1157,8 +1185,9 @@ > else { > @:safeTarget@ > ret = (str) (*pci->fcn)(mb,stk,pci); > - @:restoreTarget@ > - @:exceptionHndlr@ > + @:restoreTarget(@1)@ > + @:exceptionHndlr(@1)@ > + @:timingHndlr(@1)@ > } > @- > MAL function calls are relatively expensive, because they have to assemble > @@ -1171,8 +1200,9 @@ > stk->pcup = stkpc; > @:safeTarget@ > ret= runMAL(cntxt,pci->blk,1,mb,stk,pci); > - @:restoreTarget@ > - @:exceptionHndlr@ > + @:restoreTarget(@1)@ > + @:exceptionHndlr(@1)@ > + @:timingHndlr(@1)@ > } > @- > Factory calls are more involved. At this stage it is a synchrononous > @@ -1184,7 +1214,8 @@ > "reference to MAL function missing"); > else > ret= runFactory(cntxt,pci->blk,mb,stk,pci); > - @:exceptionHndlr@ > + @:exceptionHndlr(@1)@ > + @:timingHndlr(SLOW)@ > @- > The type dispatching table in getArgValue can be removed if we > determine at compile time the address offset within a ValRecord. > @@ -1323,7 +1354,6 @@ > @{ > > @= exceptionHndlr > - @:timingHndlr@ > if( ret != MAL_SUCCEED ) { > str msg = 0, nxt; > if( stk->cmd ) { > @@ -1569,7 +1599,7 @@ > #endif > > @= timingHndlr > -if( cntxt->flags && stk->cmd != 't' && stk->cmd != 'C'){ > +if( @1 && cntxt->flags && stk->cmd != 't' && stk->cmd != 'C'){ > if( cntxt->flags & timerFlag) > stream_printf(cntxt->fdout,"[%6d usec ",GDKusec()-cntxt->timer); > #ifdef HAVE_SYS_RESOURCE_H > > > ------------------------------------------------------------------------- > This SF.net email is sponsored by: Microsoft > Defy all challenges. Microsoft(R) Visual Studio 2005. > http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ > _______________________________________________ > 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 |

2 1

Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/mal mal_interpreter.mx, , 1.197, 1.198
by Fabian Groffen 28 Sep '07

28 Sep '07

On 28-09-2007 18:07:48 +0200, Martin Kersten wrote: > Fabian Groffen wrote: >> On 28-09-2007 16:01:00 +0000, Martin Kersten wrote: >> >>> +#define SLOW 1 >>> +#define FAST 0 >>> >> >> How about an enum here? >> > He, ze zijn weer terug ;-) > Niet nodig is allemaal locaal duidelijk. The idea is that the compiler is able to help you (bail out). Local or not is irrellevant IMO.

1 0