Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/mal mal_client.mx, , 1.156, 1.157 mal_scenario.mx, , 1.111, 1.112
Martin Kersten wrote:
> Update of /cvsroot/monetdb/MonetDB5/src/mal
> In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv18380/mal
>
> Modified Files:
> mal_client.mx mal_scenario.mx
> Log Message:
> Add a few statistics for tracking client behavior.
>
>
> Index: mal_client.mx
> ===
> RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_client.mx,v
> retrieving revision 1.156
> retrieving revision 1.157
> diff -u -d -r1.156 -r1.157
> --- mal_client.mx 30 Aug 2007 07:18:54 - 1.156
> +++ mal_client.mx 5 Sep 2007 18:13:16 - 1.157
> @@ -89,6 +89,10 @@
> # include
> #endif
>
> +#ifdef HAVE_SYS_TIMES_H
> +# include
> +#endif
> +
> @-
> The prompt structure is designed to simplify recognition
> of the language framework for interaction. For direct console
> @@ -226,6 +230,18 @@
> Symbol curprg; /* focus of parser */
> Symbol backup; /* save parsing context */
> MalStkPtr glb;/* global variable stack */
> [EMAIL PROTECTED]
> +Some statistics on client behavior becomes relevant
> +for server maintenance. The scenario loop is used as
> +a frame of reference. We measure the elapsed time after
> +a request has been received and we have to wait for
> +the next one.
> [EMAIL PROTECTED]
> + int actions;
> + lng totaltime; /* sum of elapsed processing
> times */
> +#ifdef HAVE_TIMES
> + struct tms workload;
> +#endif
> } *Client, ClientRec;
>
> mal_export ClientRec mal_clients[MAL_MAXCLIENTS+1];
> @@ -446,6 +462,9 @@
> prompt = !fin? GDKgetenv("monet_prompt"): PROMPT1;
> c->prompt= GDKstrdup(prompt);
> c->promptlength= strlen(prompt);
> +
> + c->actions =0;
> + c->totaltime= 0;
> return c;
> }
> @-
>
> Index: mal_scenario.mx
> ===
> RCS file: /cvsroot/monetdb/MonetDB5/src/mal/mal_scenario.mx,v
> retrieving revision 1.111
> retrieving revision 1.112
> diff -u -d -r1.111 -r1.112
> --- mal_scenario.mx 30 Aug 2007 07:18:54 - 1.111
> +++ mal_scenario.mx 5 Sep 2007 18:13:16 - 1.112
> @@ -183,6 +183,10 @@
> #include "mal_authorize.h"
> #include "mal_exception.h"
>
> +#ifdef HAVE_SYS_TIMES_H
> +# include
> +#endif
> +
> struct SCENARIO scenarioRec[MAXSCEN] = {
> {"mal", "mal",
>0, 0, /* hardwired MALinit*/
> @@ -576,15 +580,31 @@
> runScenarioBody(Client c)
> {
> str msg= MAL_SUCCEED;
> + lng start;
> + struct tms t0,t1;
I think here you need to do like this:
> #ifdef HAVE_TIMES
> struct tms t0,t1;
> #endif
If not the windows compilation does not work. I tried and now it
compiles on windows. To checkin I am just waiting for green light
because I am not really sure of the impact of my change in your semantics.
Regards,
Romulo
>
> while (c->mode > FINISHING) {
> msg = MAL_SUCCEED;
> @:runPhase(MAL_SCENARIO_READER)@
> c->lastcmd= time(0);
> + start= GDKusec();
> +#ifdef HAVE_TIMES
> + times(&t0);
> +#endif
> @:runPhase(MAL_SCENARIO_PARSER)@
> @:runPhase(MAL_SCENARIO_OPTIMIZE)@
> @:runPhase(MAL_SCENARIO_SCHEDULER)@
> @:runPhase(MAL_SCENARIO_ENGINE)@
> + start= GDKusec()-start;
> + c->actions++;
> + c->totaltime += start;
> +#ifdef HAVE_TIMES
> + times(&t1);
> + c->workload.tms_utime += t1.tms_utime-t0.tms_utime;
> + c->workload.tms_cutime += t1.tms_cutime-t0.tms_cutime;
> + c->workload.tms_stime += t1.tms_stime-t0.tms_stime;
> + c->workload.tms_cstime += t1.tms_cstime-t0.tms_cstime;
> +#endif
> }
> return msg;
> }
>
>
> -
> 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-checkins mailing list
> [EMAIL PROTECTED]
> https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
-
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-developers mailing list
Monetdb-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/monetdb-developers
Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/modules/mal batxml.mx, GDK-2, 1.4.2.2, 1.4.2.3
Sjoerd Mullender wrote:
> Update of /cvsroot/monetdb/MonetDB5/src/modules/mal
> In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15018/src/modules/mal
>
> Modified Files:
> Tag: GDK-2
> batxml.mx
> Log Message:
> propagated changes of Friday Aug 24 2007 - Tuesday Aug 28 2007
> from the development trunk to the GDK-2 branch
>
> There were inexplicable conflicts in src/modules/mal/batxml.mx and
> src/modules/mal/Tests/inspect05.stable.out, neither of which had been
> changed on the branch. I just copied the HEAD version to the branch
> to resolve the conflicts.
>
..
> str
> -BATXMLagg(MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
> +BATXMLagg(int *ret, int *grp,int *bid)
> {
> - (void) mb;
> - (void) stk;
> - (void) p;
> - throw(MAL,"xml.agg","Not yet implemented");
> + BAT *j, *r, *g, *b, *bn;
> + BUN p,q;
> + int xx;
> + oid gid,o=0;
The variable is not initialized. I will take the freedom to initialize
it with value 0;
Do I have green light or the values should be another one?
Note: this is a propagation and the this code comes from the Martin
checking on 08/25/2007 9:48 am
> + int first= 1;
> + str t;
> + str buf= GDKmalloc(BUFSIZ);
> + int len, size=BUFSIZ,offset;
> +
> + @:getBATdescriptor(grp,g,"xml.agg")@
> + @:getBATdescriptor(bid,b,"xml.agg",BBPunfix(g->batCacheid))@
> +
> + bn= BATnew(g->htype, b->ttype,BATcount(g));
> + if( bn== NULL){
> + BBPunfix(b->batCacheid);
> + BBPunfix(g->batCacheid);
> + throw(MAL,"xml.agg","Could not create BAT");
> + }
> +
> + j= BATjoin(g,b,oid_nil);
> +r= BATsort(j);
> + /* now we can perform a simple scan and emit the group*/
> +
> + buf[0]=0;
> + offset=0;
> + first=1;
> + BATloopFast(r,p,q,xx){
> + o= *(oid*) BUNhead(r,p);
> + t= (str) BUNtail(r,p);
> + if( gid != o && first==0){
It is used here for the first time without being initialized.
Regards,
Romulo
> + /* flush */
> + bunfastins(bn,&gid,buf);
> + buf[0]=0;
> + offset =0;
> + }
> + gid=o;
> + first=0;
...
-
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-developers mailing list
Monetdb-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/monetdb-developers
Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/modules/mal batxml.mx, GDK-2, 1.4.2.2, 1.4.2.3
On Thu, Sep 06, 2007 at 11:49:57AM +0200, Romulo Goncalves wrote:
> Sjoerd Mullender wrote:
> > Update of /cvsroot/monetdb/MonetDB5/src/modules/mal
> > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15018/src/modules/mal
> >
> > Modified Files:
> > Tag: GDK-2
> > batxml.mx
> > Log Message:
> > propagated changes of Friday Aug 24 2007 - Tuesday Aug 28 2007
> > from the development trunk to the GDK-2 branch
> >
> > There were inexplicable conflicts in src/modules/mal/batxml.mx and
> > src/modules/mal/Tests/inspect05.stable.out, neither of which had been
> > changed on the branch. I just copied the HEAD version to the branch
> > to resolve the conflicts.
> >
> ..
>
> > str
> > -BATXMLagg(MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
> > +BATXMLagg(int *ret, int *grp,int *bid)
> > {
> > - (void) mb;
> > - (void) stk;
> > - (void) p;
> > - throw(MAL,"xml.agg","Not yet implemented");
> > + BAT *j, *r, *g, *b, *bn;
> > + BUN p,q;
> > + int xx;
> > + oid gid,o=0;
> The variable is not initialized. I will take the freedom to initialize
> it with value 0;
>
> Do I have green light or the values should be another one?
>
> Note: this is a propagation and the this code comes from the Martin
> checking on 08/25/2007 9:48 am
do NOT fix any bugs on the GDK-2 branch that also exist in the development
trunk (HEAD). if at all, fix them in the development trunk (HEAD); usual
propagation wiil get them into the GDK-2 branch.
Stefan
> > + int first= 1;
> > + str t;
> > + str buf= GDKmalloc(BUFSIZ);
> > + int len, size=BUFSIZ,offset;
> > +
> > + @:getBATdescriptor(grp,g,"xml.agg")@
> > + @:getBATdescriptor(bid,b,"xml.agg",BBPunfix(g->batCacheid))@
> > +
> > + bn= BATnew(g->htype, b->ttype,BATcount(g));
> > + if( bn== NULL){
> > + BBPunfix(b->batCacheid);
> > + BBPunfix(g->batCacheid);
> > + throw(MAL,"xml.agg","Could not create BAT");
> > + }
> > +
> > + j= BATjoin(g,b,oid_nil);
> > +r= BATsort(j);
> > + /* now we can perform a simple scan and emit the group*/
> > +
> > + buf[0]=0;
> > + offset=0;
> > + first=1;
> > + BATloopFast(r,p,q,xx){
> > + o= *(oid*) BUNhead(r,p);
> > + t= (str) BUNtail(r,p);
> > + if( gid != o && first==0){
> It is used here for the first time without being initialized.
>
> Regards,
> Romulo
> > + /* flush */
> > + bunfastins(bn,&gid,buf);
> > + buf[0]=0;
> > + offset =0;
> > + }
> > + gid=o;
> > + first=0;
> ...
>
> -
> 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-developers mailing list
> Monetdb-developers@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/monetdb-developers
>
--
| Dr. Stefan Manegold | mailto:[EMAIL PROTECTED] |
| 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 |
-
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-developers mailing list
Monetdb-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/monetdb-developers
Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/modules/mal batxml.mx, GDK-2, 1.4.2.2, 1.4.2.3
Stefan Manegold wrote:
> On Thu, Sep 06, 2007 at 11:49:57AM +0200, Romulo Goncalves wrote:
>> Sjoerd Mullender wrote:
>>> Update of /cvsroot/monetdb/MonetDB5/src/modules/mal
>>> In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv15018/src/modules/mal
>>>
>>> Modified Files:
>>> Tag: GDK-2
>>> batxml.mx
>>> Log Message:
>>> propagated changes of Friday Aug 24 2007 - Tuesday Aug 28 2007
>>> from the development trunk to the GDK-2 branch
>>>
>>> There were inexplicable conflicts in src/modules/mal/batxml.mx and
>>> src/modules/mal/Tests/inspect05.stable.out, neither of which had been
>>> changed on the branch. I just copied the HEAD version to the branch
>>> to resolve the conflicts.
>>>
>> ..
>>
>>> str
>>> -BATXMLagg(MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
>>> +BATXMLagg(int *ret, int *grp,int *bid)
>>> {
>>> - (void) mb;
>>> - (void) stk;
>>> - (void) p;
>>> - throw(MAL,"xml.agg","Not yet implemented");
>>> + BAT *j, *r, *g, *b, *bn;
>>> + BUN p,q;
>>> + int xx;
>>> + oid gid,o=0;
>> The variable is not initialized. I will take the freedom to initialize
>> it with value 0;
>>
>> Do I have green light or the values should be another one?
>>
>> Note: this is a propagation and the this code comes from the Martin
>> checking on 08/25/2007 9:48 am
>
> do NOT fix any bugs on the GDK-2 branch that also exist in the development
> trunk (HEAD). if at all, fix them in the development trunk (HEAD); usual
> propagation wiil get them into the GDK-2 branch.
Yes I know that. If not I will create conflicts ;)
Regards,
Romulo
>
> Stefan
>
>>> + int first= 1;
>>> + str t;
>>> + str buf= GDKmalloc(BUFSIZ);
>>> + int len, size=BUFSIZ,offset;
>>> +
>>> + @:getBATdescriptor(grp,g,"xml.agg")@
>>> + @:getBATdescriptor(bid,b,"xml.agg",BBPunfix(g->batCacheid))@
>>> +
>>> + bn= BATnew(g->htype, b->ttype,BATcount(g));
>>> + if( bn== NULL){
>>> + BBPunfix(b->batCacheid);
>>> + BBPunfix(g->batCacheid);
>>> + throw(MAL,"xml.agg","Could not create BAT");
>>> + }
>>> +
>>> + j= BATjoin(g,b,oid_nil);
>>> +r= BATsort(j);
>>> + /* now we can perform a simple scan and emit the group*/
>>> +
>>> + buf[0]=0;
>>> + offset=0;
>>> + first=1;
>>> + BATloopFast(r,p,q,xx){
>>> + o= *(oid*) BUNhead(r,p);
>>> + t= (str) BUNtail(r,p);
>>> + if( gid != o && first==0){
>> It is used here for the first time without being initialized.
>>
>> Regards,
>> Romulo
>>> + /* flush */
>>> + bunfastins(bn,&gid,buf);
>>> + buf[0]=0;
>>> + offset =0;
>>> + }
>>> + gid=o;
>>> + first=0;
>> ...
>>
>> -
>> 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-developers mailing list
>> Monetdb-developers@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/monetdb-developers
>>
>
-
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-developers mailing list
Monetdb-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/monetdb-developers
Re: [Monetdb-developers] [Monetdb-checkins] MonetDB5/src/modules/mal Makefile.ag, , 1.103, 1.104 batxml.mx, , 1.14, 1.15
Romulo Goncalves wrote: > Update of /cvsroot/monetdb/MonetDB5/src/modules/mal > In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29918/mal > > Modified Files: > Makefile.ag batxml.mx > Log Message: > Initialize variable to resolve problems on windows (32bit with VS) compilation Add a missing lib (lib_xml.lib) to be able to compile batxml.mx > > > > Index: Makefile.ag > === > RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/Makefile.ag,v > retrieving revision 1.103 > retrieving revision 1.104 > diff -u -d -r1.103 -r1.104 > --- Makefile.ag 21 Aug 2007 20:54:59 - 1.103 > +++ Makefile.ag 6 Sep 2007 11:04:32 - 1.104 > @@ -35,7 +35,7 @@ > #datacell.mx > > HEADERS = h > - LIBS = ../../mal/libmal $(MONETDB_LIBS) -lbat -lstream $(MATH_LIBS) \ > + LIBS = ../../mal/libmal ../atoms/lib_xml $(MONETDB_LIBS) -lbat -lstream > $(MATH_LIBS) \ > $(CLIENTS_LIBS) -lMapi \ > $(SOCKET_LIBS) $(Z_LIBS) $(BZ_LIBS) \ > $(MALLOC_LIBS) $(PTHREAD_LIBS) $(DL_LIBS) > > Index: batxml.mx > === > RCS file: /cvsroot/monetdb/MonetDB5/src/modules/mal/batxml.mx,v > retrieving revision 1.14 > retrieving revision 1.15 > diff -u -d -r1.14 -r1.15 > --- batxml.mx 1 Sep 2007 12:11:12 - 1.14 > +++ batxml.mx 6 Sep 2007 11:04:32 - 1.15 > @@ -729,7 +729,7 @@ > BAT *j, *r, *g, *b, *bn; > BUN p,q; > int xx; > - oid gid,o=0; > + oid gid = 0,o=0; > int first= 1; > str t; > str buf= GDKmalloc(BUFSIZ); > > > - > 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-checkins mailing list > [EMAIL PROTECTED] > https://lists.sourceforge.net/lists/listinfo/monetdb-checkins - 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-developers mailing list Monetdb-developers@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/monetdb-developers
