Changeset: c09a68d9b203 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c09a68d9b203
Modified Files:
monetdb5/mal/mal_profiler.c
sql/backends/monet5/sql_scenario.c
Branch: default
Log Message:
Fix SQL trace control
All columns of the tracelog table can be individually selected as part of
the SQL TRACE option. Fix their naming.
diffs (109 lines):
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -429,8 +429,8 @@ static BAT *TRACE_id_time = 0;
static BAT *TRACE_id_pc = 0;
static BAT *TRACE_id_thread = 0;
static BAT *TRACE_id_ticks = 0;
-static BAT *TRACE_id_reads = 0;
-static BAT *TRACE_id_writes = 0;
+static BAT *TRACE_id_inblock = 0;
+static BAT *TRACE_id_oublock = 0;
static BAT *TRACE_id_rssMB = 0;
static BAT *TRACE_id_tmpspace = 0;
static BAT *TRACE_id_minflt = 0;
@@ -451,8 +451,8 @@ TRACEtable(BAT **r)
r[4] = BATcopy(TRACE_id_ticks, TRACE_id_ticks->htype,
TRACE_id_ticks->ttype, 0, TRANSIENT);
r[5] = BATcopy(TRACE_id_rssMB, TRACE_id_rssMB->htype,
TRACE_id_rssMB->ttype, 0, TRANSIENT);
r[6] = BATcopy(TRACE_id_tmpspace, TRACE_id_tmpspace->htype,
TRACE_id_tmpspace->ttype, 0, TRANSIENT);
- r[7] = BATcopy(TRACE_id_reads, TRACE_id_reads->htype,
TRACE_id_reads->ttype, 0, TRANSIENT);
- r[8] = BATcopy(TRACE_id_writes, TRACE_id_writes->htype,
TRACE_id_writes->ttype, 0, TRANSIENT);
+ r[7] = BATcopy(TRACE_id_inblock, TRACE_id_inblock->htype,
TRACE_id_inblock->ttype, 0, TRANSIENT);
+ r[8] = BATcopy(TRACE_id_oublock, TRACE_id_oublock->htype,
TRACE_id_oublock->ttype, 0, TRANSIENT);
r[9] = BATcopy(TRACE_id_minflt, TRACE_id_minflt->htype,
TRACE_id_minflt->ttype, 0, TRANSIENT);
r[10] = BATcopy(TRACE_id_majflt, TRACE_id_majflt->htype,
TRACE_id_majflt->ttype, 0, TRANSIENT);
r[11] = BATcopy(TRACE_id_nvcsw, TRACE_id_nvcsw->htype,
TRACE_id_nvcsw->ttype, 0, TRANSIENT);
@@ -496,8 +496,8 @@ static void
CLEANUPprofile(TRACE_id_pc);
CLEANUPprofile(TRACE_id_rssMB);
CLEANUPprofile(TRACE_id_tmpspace);
- CLEANUPprofile(TRACE_id_reads);
- CLEANUPprofile(TRACE_id_writes);
+ CLEANUPprofile(TRACE_id_inblock);
+ CLEANUPprofile(TRACE_id_oublock);
CLEANUPprofile(TRACE_id_minflt);
CLEANUPprofile(TRACE_id_majflt);
CLEANUPprofile(TRACE_id_nvcsw);
@@ -516,8 +516,8 @@ void
TRACE_id_ticks = TRACEcreate("id", "ticks", TYPE_lng);
TRACE_id_rssMB = TRACEcreate("id", "rssMB", TYPE_lng);
TRACE_id_tmpspace = TRACEcreate("id", "tmpspace", TYPE_lng);
- TRACE_id_reads = TRACEcreate("id", "read", TYPE_lng);
- TRACE_id_writes = TRACEcreate("id", "write", TYPE_lng);
+ TRACE_id_inblock = TRACEcreate("id", "read", TYPE_lng);
+ TRACE_id_oublock = TRACEcreate("id", "write", TYPE_lng);
TRACE_id_minflt = TRACEcreate("id", "minflt", TYPE_lng);
TRACE_id_majflt = TRACEcreate("id", "majflt", TYPE_lng);
TRACE_id_nvcsw = TRACEcreate("id", "nvcsw", TYPE_lng);
@@ -529,8 +529,8 @@ void
TRACE_id_stmt == NULL ||
TRACE_id_rssMB == NULL ||
TRACE_id_tmpspace == NULL ||
- TRACE_id_reads == NULL ||
- TRACE_id_writes == NULL ||
+ TRACE_id_inblock == NULL ||
+ TRACE_id_oublock == NULL ||
TRACE_id_minflt == NULL ||
TRACE_id_majflt == NULL ||
TRACE_id_nvcsw == NULL ||
@@ -576,8 +576,8 @@ clearTrace(void)
BBPclear(TRACE_id_ticks->batCacheid);
BBPclear(TRACE_id_rssMB->batCacheid);
BBPclear(TRACE_id_tmpspace->batCacheid);
- BBPclear(TRACE_id_reads->batCacheid);
- BBPclear(TRACE_id_writes->batCacheid);
+ BBPclear(TRACE_id_inblock->batCacheid);
+ BBPclear(TRACE_id_oublock->batCacheid);
BBPclear(TRACE_id_minflt->batCacheid);
BBPclear(TRACE_id_majflt->batCacheid);
BBPclear(TRACE_id_nvcsw->batCacheid);
@@ -607,9 +607,9 @@ getTrace(const char *nme)
if (strcmp(nme, "tmpspace") == 0)
return BATcopy(TRACE_id_tmpspace, TRACE_id_tmpspace->htype,
TRACE_id_tmpspace->ttype, 0, TRANSIENT);
if (strcmp(nme, "reads") == 0)
- return BATcopy(TRACE_id_reads, TRACE_id_reads->htype,
TRACE_id_reads->ttype, 0, TRANSIENT);
+ return BATcopy(TRACE_id_inblock, TRACE_id_inblock->htype,
TRACE_id_inblock->ttype, 0, TRANSIENT);
if (strcmp(nme, "writes") == 0)
- return BATcopy(TRACE_id_writes, TRACE_id_writes->htype,
TRACE_id_writes->ttype, 0, TRANSIENT);
+ return BATcopy(TRACE_id_oublock, TRACE_id_oublock->htype,
TRACE_id_oublock->ttype, 0, TRANSIENT);
if (strcmp(nme, "minflt") == 0)
return BATcopy(TRACE_id_minflt, TRACE_id_minflt->htype,
TRACE_id_minflt->ttype, 0, TRANSIENT);
if (strcmp(nme, "majflt") == 0)
@@ -729,8 +729,8 @@ cachedProfilerEvent(MalBlkPtr mb, MalStk
errors += BUNappend(TRACE_id_ticks, &pci->ticks, FALSE) == GDK_FAIL;
errors += BUNappend(TRACE_id_rssMB, &rssMB, FALSE) == GDK_FAIL;
errors += BUNappend(TRACE_id_tmpspace, &tmpspace, FALSE) == GDK_FAIL;
- errors += BUNappend(TRACE_id_reads, &v1, FALSE) == GDK_FAIL;
- errors += BUNappend(TRACE_id_writes, &v2, FALSE) == GDK_FAIL;
+ errors += BUNappend(TRACE_id_inblock, &v1, FALSE) == GDK_FAIL;
+ errors += BUNappend(TRACE_id_oublock, &v2, FALSE) == GDK_FAIL;
errors += BUNappend(TRACE_id_minflt, &v3, FALSE) == GDK_FAIL;
errors += BUNappend(TRACE_id_majflt, &v4, FALSE) == GDK_FAIL;
errors += BUNappend(TRACE_id_nvcsw, &v5, FALSE) == GDK_FAIL;
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -869,9 +869,11 @@ SQLsetTrace(backend *be, Client c, bit o
* supplied values */
if (strcmp(s, "time") == 0 || strcmp(s, "pc")
== 0 || strcmp(s, "stmt") == 0) {
coltype[i] = TYPE_str;
- } else if (strcmp(s, "ticks") == 0 || strcmp(s,
"rssMB") == 0 || strcmp(s, "vmMB") == 0 || strcmp(s, "reads") == 0 || strcmp(s,
"writes") == 0) {
+ } else if (strcmp(s, "ticks") == 0 || strcmp(s,
"rssMB") == 0 || strcmp(s, "tmpspace") == 0 ||
+ strcmp(s, "inblock") == 0 ||
strcmp(s, "oublock") == 0 || strcmp(s,"minflt") == 0 ||
+ strcmp(s,"majflt") ==0 ||
strcmp(s,"nvcsw") == 0) {
coltype[i] = TYPE_lng;
- } else if (strcmp(s, "thread") == 0) {
+ } else if ( strcmp(s,"event") == 0 || strcmp(s,
"thread") == 0) {
coltype[i] = TYPE_int;
}
i++;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
