Changeset: 18e5cfdcb9cf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=18e5cfdcb9cf
Modified Files:
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_profiler.c
Branch: compactprofiler
Log Message:
Revert keeping the uuid in the client record.
diffs (55 lines):
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -213,7 +213,6 @@ MCinitClientRecord(Client c, oid user, b
c->user = user;
c->username = 0;
- c->uuid = NULL;
c->scenario = NULL;
c->oldscenario = NULL;
c->srcFile = NULL;
@@ -432,8 +431,6 @@ MCfreeClient(Client c)
GDKfree(c->username);
c->username = 0;
}
- GDKfree(c->uuid);
- c->uuid = NULL;
c->mythread = 0;
if (c->glb) {
freeStack(c->glb);
diff --git a/monetdb5/mal/mal_client.h b/monetdb5/mal/mal_client.h
--- a/monetdb5/mal/mal_client.h
+++ b/monetdb5/mal/mal_client.h
@@ -47,7 +47,6 @@ typedef struct CLIENT {
int idx; /* entry in mal_clients */
oid user; /* user id in the auth administration */
str username; /* for event processor */
- str uuid; /* unique session marker */
/*
* The actions for a client is separated into several stages:
* parsing, strategic optimization, tactical optimization, and
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
@@ -174,15 +174,11 @@ renderProfilerEvent(Client cntxt, MalBlk
if (!GDKinmemory()) {
char *uuid;
str c;
- if( cntxt->uuid)
- logadd("\"session\":\"%s\","PRETTIFY,
cntxt->uuid);
- else{
- if ((c = msab_getUUID(&uuid)) == NULL) {
- logadd("\"session\":\"%s\","PRETTIFY, uuid);
- cntxt->uuid = uuid;
- } else
- free(c);
- }
+ if ((c = msab_getUUID(&uuid)) == NULL) {
+ logadd("\"session\":\"%s\","PRETTIFY, uuid);
+ free(uuid);
+ } else
+ free(c);
}
logadd("\"state\":\"%s\","PRETTIFY, start?"start":"done");
logadd("\"usec\":"LLFMT","PRETTIFY, pci->ticks);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
