Changeset: 7b2400744ea1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7b2400744ea1
Added Files:
monetdb5/optimizer/Tests/flowgraph.malC
monetdb5/optimizer/Tests/flowgraph.stable.err
monetdb5/optimizer/Tests/flowgraph.stable.out
Modified Files:
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_function.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/mdb.h
monetdb5/modules/mal/mdb.mal
monetdb5/optimizer/Tests/All
monetdb5/optimizer/optimizer.c
monetdb5/optimizer/optimizer.h
monetdb5/optimizer/optimizer.mal
Branch: default
Log Message:
Remove some old stuff
Old 1st generation stethoscoop support functions.
diffs (truncated from 358 to 300 lines):
diff --git a/monetdb5/mal/mal_debugger.c b/monetdb5/mal/mal_debugger.c
--- a/monetdb5/mal/mal_debugger.c
+++ b/monetdb5/mal/mal_debugger.c
@@ -913,8 +913,7 @@ partial:
continue;
}
case 'h':
- if (strncmp("help", b, 2) == 0)
- mdbHelp(out);
+ mdbHelp(out);
continue;
case 'o':
case 'O': /* optimizer and scheduler steps */
@@ -1114,7 +1113,7 @@ mdbTrapClient(Client cntxt, MalBlkPtr mb
(void) cntxt;
(void) mb;
if (id < 0 || id >= MAL_MAXCLIENTS || mal_clients[id].mode == 0)
- throw(INVCRED, "mdb.grab", INVCRED_WRONG_ID);
+ throw(INVCRED, "mdb.trap", INVCRED_WRONG_ID);
c = mal_clients + id;
c->itrace = 'S';
diff --git a/monetdb5/mal/mal_function.c b/monetdb5/mal/mal_function.c
--- a/monetdb5/mal/mal_function.c
+++ b/monetdb5/mal/mal_function.c
@@ -927,14 +927,11 @@ showFlowDetails(MalBlkPtr mb, MalStkPtr
mnstr_printf(f, "n%d [fontsize=8, shape=box, label=\"%s\"]\n", pc,
getFunctionId(p));
}
-/* the stethoscope needs dot files for its graphical interface.
- * They are produced whenever a main() is called.
- * In all cases a single dot file is produced.
+/* Produce a file with the flow graph in dot format.
*/
#define MAXFLOWGRAPHS 128
-int getFlowGraphs(MalBlkPtr mb, MalStkPtr stk, MalBlkPtr *mblist, MalStkPtr
*stklist,int top);
-int getFlowGraphs(MalBlkPtr mb, MalStkPtr stk, MalBlkPtr *mblist, MalStkPtr
*stklist,int top){
+static int getFlowGraphs(MalBlkPtr mb, MalStkPtr stk, MalBlkPtr *mblist,
MalStkPtr *stklist,int top){
int i;
InstrPtr p;
@@ -959,7 +956,7 @@ showFlowGraph(MalBlkPtr mb, MalStkPtr st
{
stream *f;
InstrPtr p;
- int i, j,k, stethoscope=0;
+ int i, j,k;
char mapimode = 0;
buffer *bufstr = NULL;
MalBlkPtr mblist[MAXFLOWGRAPHS];
@@ -984,12 +981,10 @@ showFlowGraph(MalBlkPtr mb, MalStkPtr st
return;
top = getFlowGraphs(mb,stk,mblist,stklist,0);
- if ( stethoscope == 0)
- top =1;
for( j=0; j< top; j++){
mb = mblist[j];
stk = stklist[j];
- if (mb == 0 || (mb->dotfile && stethoscope))
+ if (mb == 0 )
continue; /* already sent */
p = getInstrPtr(mb, 0);
mnstr_printf(f, "digraph %s {\n", getFunctionId(p));
@@ -1055,11 +1050,7 @@ showFlowGraph(MalBlkPtr mb, MalStkPtr st
}
free(buf);
}
- if (f != GDKout) {
- if (!stethoscope ) {
- MT_sleep_ms(4000); /* delay for stethoscope */
+ if (f != GDKout)
close_stream(f);
- }
- }
}
diff --git a/monetdb5/modules/mal/mdb.c b/monetdb5/modules/mal/mdb.c
--- a/monetdb5/modules/mal/mdb.c
+++ b/monetdb5/modules/mal/mdb.c
@@ -614,19 +614,6 @@ MDBdummy(int *ret)
throw(MAL, "mdb.dummy", OPERATION_FAILED);
}
-str
-MDBtrapFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
-{
- str modnme = *getArgReference_str(stk, pci, 1);
- str fcnnme = *getArgReference_str(stk, pci, 2);
- bit b= *getArgReference_bit(stk,pci,3);
- (void) cntxt;
- (void) mb;
- if ( mdbSetTrap(cntxt,modnme,fcnnme,b) )
- throw(MAL,"mdb.trap", RUNTIME_SIGNATURE_MISSING);
- return MAL_SUCCEED;
-}
-
/*
* CMDmodules
* Obtains a list of modules by looking at what files are present in the
diff --git a/monetdb5/modules/mal/mdb.h b/monetdb5/modules/mal/mdb.h
--- a/monetdb5/modules/mal/mdb.h
+++ b/monetdb5/modules/mal/mdb.h
@@ -51,8 +51,6 @@ mal_export str MDBgetStackFrameN(Client
mal_export str MDBgetStackFrame(Client cntxt, MalBlkPtr m, MalStkPtr s,
InstrPtr p);
mal_export str MDBStkTrace(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p);
mal_export str MDBgetDefinition(Client cntxt, MalBlkPtr m, MalStkPtr stk,
InstrPtr p);
-mal_export str MDBgrapTrappedProcess(Client cntxt, MalBlkPtr mb, MalStkPtr
stk, InstrPtr pci);
-mal_export str MDBtrapFunction(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
mal_export str MDBdump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
mal_export str MDBdummy(int *ret);
diff --git a/monetdb5/modules/mal/mdb.mal b/monetdb5/modules/mal/mdb.mal
--- a/monetdb5/modules/mal/mdb.mal
+++ b/monetdb5/modules/mal/mdb.mal
@@ -28,14 +28,6 @@ command modules():bat[:str]
address CMDmodules
comment "List available modules";
-pattern setTrap(mod:str, fcn:str, b:bit):void
-address MDBtrapFunction
-comment "Suspend upon a call to the MAL function.";
-
-pattern setTrap(idx:int):void
-address mdbTrapClient
-comment "Call debugger for a specific process.";
-
pattern setTrace(b:bit):void
address MDBsetTrace
comment "Turn on/off tracing of current routine";
@@ -94,13 +86,6 @@ pattern var(M:str,F:str):void
address MDBvar3
comment "Dump the symboltable of routine M.F on standard out.";
-pattern grab():void
-address mdbGrab
-comment "Call debugger for a suspended process.";
-pattern trap():void
-address mdbTrap
-comment "A suspended process for debugging.";
-
pattern dot(s:str):void
address MDBshowFlowGraph
comment "Dump the data flow of the current routine in a format recognizable by
the command 'dot' to the file s";
diff --git a/monetdb5/optimizer/Tests/All b/monetdb5/optimizer/Tests/All
--- a/monetdb5/optimizer/Tests/All
+++ b/monetdb5/optimizer/Tests/All
@@ -74,3 +74,5 @@ THREADS>=2?dataflow
THREADS>=2?dataflow3
THREADS>=2?dataflow4
THREADS>=2?dataflow5
+
+flowgraph
diff --git a/monetdb5/optimizer/Tests/flowgraph.malC
b/monetdb5/optimizer/Tests/flowgraph.malC
new file mode 100644
--- /dev/null
+++ b/monetdb5/optimizer/Tests/flowgraph.malC
@@ -0,0 +1,23 @@
+function f():void;
+
+ b0 := bat.new(nil:oid);
+ b0f := bat.append(b0, 0:oid);
+
+ b1 := bat.new(nil:oid);
+ bat.append(b1, 0:oid);
+ b1f := bat.append(b1, 1:oid);
+
+ b2 := bat.new(nil:int);
+ bat.append(b2, 42:int);
+ bat.append(b2, 23:int);
+ b2f := bat.append(b2, 0:int);
+
+ r1 := algebra.projection(b1f, b2f);
+ r2 := algebra.projection(b0f, r1);
+ io.print(r2);
+end f;
+
+optimizer.projectionpath("user", "f");
+# hangs
+mdb.dot("user", "f", "test-file");
+
diff --git a/monetdb5/optimizer/Tests/flowgraph.stable.err
b/monetdb5/optimizer/Tests/flowgraph.stable.err
new file mode 100644
--- /dev/null
+++ b/monetdb5/optimizer/Tests/flowgraph.stable.err
@@ -0,0 +1,34 @@
+stderr of test 'flowgraph` in directory 'monetdb5/optimizer` itself:
+
+
+# 23:08:39 >
+# 23:08:39 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35414" "--set"
"mapi_usock=/var/tmp/mtest-7802/.s.monetdb.35414" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_optimizer"
+# 23:08:39 >
+
+# builtin opt gdk_dbpath =
/export/scratch1/mk/default//Linux/var/monetdb5/dbfarm/demo
+# builtin opt gdk_debug = 0
+# builtin opt gdk_vmtrim = no
+# builtin opt monet_prompt = >
+# builtin opt monet_daemon = no
+# builtin opt mapi_port = 50000
+# builtin opt mapi_open = false
+# builtin opt mapi_autosense = false
+# builtin opt sql_optimizer = default_pipe
+# builtin opt sql_debug = 0
+# cmdline opt gdk_nr_threads = 0
+# cmdline opt mapi_open = true
+# cmdline opt mapi_port = 35414
+# cmdline opt mapi_usock = /var/tmp/mtest-7802/.s.monetdb.35414
+# cmdline opt monet_prompt =
+# cmdline opt gdk_dbpath =
/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_optimizer
+# cmdline opt gdk_debug = 536870922
+
+# 23:08:39 >
+# 23:08:39 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-7802" "--port=35414"
+# 23:08:39 >
+
+
+# 23:08:39 >
+# 23:08:39 > "Done."
+# 23:08:39 >
+
diff --git a/monetdb5/optimizer/Tests/flowgraph.stable.out
b/monetdb5/optimizer/Tests/flowgraph.stable.out
new file mode 100644
--- /dev/null
+++ b/monetdb5/optimizer/Tests/flowgraph.stable.out
@@ -0,0 +1,31 @@
+stdout of test 'flowgraph` in directory 'monetdb5/optimizer` itself:
+
+
+# 23:08:39 >
+# 23:08:39 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35414" "--set"
"mapi_usock=/var/tmp/mtest-7802/.s.monetdb.35414" "--set" "monet_prompt="
"--forcemito"
"--dbpath=/export/scratch1/mk/default//Linux/var/MonetDB/mTests_monetdb5_optimizer"
+# 23:08:39 >
+
+# MonetDB 5 server v11.26.0
+# This is an unreleased version
+# Serving database 'mTests_monetdb5_optimizer', using 8 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 128bit integers
+# Found 15.589 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2016 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on mapi:monetdb://vienna.da.cwi.nl:35414/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-7802/.s.monetdb.35414
+# MonetDB/GIS module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 23:08:39 >
+# 23:08:39 > "mclient" "-lmal" "-ftest" "-Eutf-8"
"--host=/var/tmp/mtest-7802" "--port=35414"
+# 23:08:39 >
+
+
+# 23:08:39 >
+# 23:08:39 > "Done."
+# 23:08:39 >
+
diff --git a/monetdb5/optimizer/optimizer.c b/monetdb5/optimizer/optimizer.c
--- a/monetdb5/optimizer/optimizer.c
+++ b/monetdb5/optimizer/optimizer.c
@@ -71,64 +71,3 @@ QOToptimize(Client cntxt, MalBlkPtr mb,
return optimizeMALBlock(cntxt, s->def);
}
-str
-QOTshowFlowGraph(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
-{
- str fname;
- str modnme;
- str fcnnme;
- Symbol s = NULL;
-
- (void) cntxt;
- if (stk != 0) {
- modnme = *getArgReference_str(stk, p, 1);
- fcnnme = *getArgReference_str(stk, p, 2);
- fname = *getArgReference_str(stk, p, 3);
- } else {
- modnme = getArgDefault(mb, p, 1);
- fcnnme = getArgDefault(mb, p, 2);
- fname = getArgDefault(mb, p, 3);
- }
-
-
- s = findSymbol(cntxt->nspace,putName(modnme), putName(fcnnme));
-
- if (s == NULL) {
- char buf[1024];
- snprintf(buf,1024, "%s.%s", modnme, fcnnme);
- throw(MAL, "optimizer.showFlowGraph", RUNTIME_OBJECT_UNDEFINED
":%s", buf);
- }
- showFlowGraph(s->def, stk, fname);
- return MAL_SUCCEED;
-}
-
-str
-QOTshowPlan(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p)
-{
- str modnme;
- str fcnnme;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
