Changeset: e0d5c9894184 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e0d5c9894184
Modified Files:
gdk/gdk_tracer.h
monetdb5/mal/mal_client.c
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_namespace.c
monetdb5/modules/mal/mal_mapi.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/vaults/shp/shp.c
sql/backends/monet5/wlr.c
sql/server/sql_mvc.c
sql/storage/store.c
Branch: gdk_tracer
Log Message:
Renamed macro CRITICAL to TRC_CRITICAL
diffs (truncated from 364 to 300 lines):
diff --git a/gdk/gdk_tracer.h b/gdk/gdk_tracer.h
--- a/gdk/gdk_tracer.h
+++ b/gdk/gdk_tracer.h
@@ -219,7 +219,7 @@ extern LOG_LEVEL LVL_PER_COMPONENT[COMPO
## __VA_ARGS__); \
} \
-#define CRITICAL(COMP, MSG, ...) \
+#define TRC_CRITICAL(COMP, MSG, ...) \
GDK_TRACER_LOG(M_CRITICAL, COMP, MSG, ## __VA_ARGS__) \
#define TRC_ERROR(COMP, MSG, ...) \
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
@@ -70,7 +70,7 @@ MCinit(void)
if (maxclients <= 0) {
maxclients = 64;
if (GDKsetenv("max_clients", "64") != GDK_SUCCEED) {
- CRITICAL(MAL_CLIENT, "GDKsetenv failed\n");
+ TRC_CRITICAL(MAL_CLIENT, "GDKsetenv failed\n");
return false;
}
}
@@ -78,7 +78,7 @@ MCinit(void)
MAL_MAXCLIENTS = /* client connections */ maxclients;
mal_clients = GDKzalloc(sizeof(ClientRec) * MAL_MAXCLIENTS);
if( mal_clients == NULL){
- CRITICAL(MAL_CLIENT, "Initialization failed: " MAL_MALLOC_FAIL
"\n");
+ TRC_CRITICAL(MAL_CLIENT, "Initialization failed: "
MAL_MALLOC_FAIL "\n");
return false;
}
for (int i = 0; i < MAL_MAXCLIENTS; i++)
@@ -222,7 +222,7 @@ MCinitClientRecord(Client c, oid user, b
MT_lock_set(&mal_contextLock);
c->mode = FREECLIENT;
MT_lock_unset(&mal_contextLock);
- CRITICAL(MAL_CLIENT, "Initialization failed: " MAL_MALLOC_FAIL
"\n");
+ TRC_CRITICAL(MAL_CLIENT, "Initialization failed: "
MAL_MALLOC_FAIL "\n");
return NULL;
}
c->yycur = 0;
@@ -259,7 +259,7 @@ MCinitClientRecord(Client c, oid user, b
c->mode = FREECLIENT;
MT_lock_unset(&mal_contextLock);
}
- CRITICAL(MAL_CLIENT, "Initialization failed: " MAL_MALLOC_FAIL
"\n");
+ TRC_CRITICAL(MAL_CLIENT, "Initialization failed: "
MAL_MALLOC_FAIL "\n");
return NULL;
}
c->promptlength = strlen(prompt);
diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -337,7 +337,7 @@ DFLOWworker(void *T)
#endif
GDKsetbuf(GDKmalloc(GDKMAXERRLEN)); /* where to leave errors */
if( GDKerrbuf == 0) {
- CRITICAL(MAL_DATAFLOW, "Could not allocate GDKerrbuf\n");
+ TRC_CRITICAL(MAL_DATAFLOW, "Could not allocate GDKerrbuf\n");
} else {
GDKclrerr();
}
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
@@ -294,7 +294,7 @@ mdbInit(void)
*/
mdbTable = GDKzalloc(sizeof(mdbStateRecord) * MAL_MAXCLIENTS);
if (mdbTable == NULL) {
- CRITICAL(MAL_DEBUGGER, "Initialization failed: "
MAL_MALLOC_FAIL "\n");
+ TRC_CRITICAL(MAL_DEBUGGER, "Initialization failed: "
MAL_MALLOC_FAIL "\n");
return false;
}
return true;
diff --git a/monetdb5/mal/mal_exception.c b/monetdb5/mal/mal_exception.c
--- a/monetdb5/mal/mal_exception.c
+++ b/monetdb5/mal/mal_exception.c
@@ -68,7 +68,7 @@ createExceptionInternal(enum malexceptio
/* Leave a message behind in the logging system */
len = snprintf(local, GDKMAXERRLEN, "%s:%s:",
exceptionNames[type], fcn);
len = vsnprintf(local + len, GDKMAXERRLEN, format, ap);
- CRITICAL(MAL_EXCEPTION, "%s\n", local);
+ TRC_CRITICAL(MAL_EXCEPTION, "%s\n", local);
return M5OutOfMemory; /* last resort */
}
len = snprintf(message, GDKMAXERRLEN, "%s:%s:", exceptionNames[type],
fcn);
diff --git a/monetdb5/mal/mal_namespace.c b/monetdb5/mal/mal_namespace.c
--- a/monetdb5/mal/mal_namespace.c
+++ b/monetdb5/mal/mal_namespace.c
@@ -121,7 +121,7 @@ static str findName(const char *nme, siz
struct namespace *ns = GDKmalloc(sizeof(struct namespace));
if (ns == NULL) {
/* error we cannot recover from */
- CRITICAL(MAL_NAMESPACE, SQLSTATE(HY001) MAL_MALLOC_FAIL
"\n");
+ TRC_CRITICAL(MAL_NAMESPACE, SQLSTATE(HY001)
MAL_MALLOC_FAIL "\n");
mal_exit(1);
}
ns->next = namespace;
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -151,7 +151,7 @@ doChallenge(void *data)
memcpy(challenge, ((struct challengedata *) data)->challenge,
sizeof(challenge));
GDKfree(data);
if (buf == NULL) {
- CRITICAL(MAL_SERVER, MAL_MALLOC_FAIL "\n");
+ TRC_CRITICAL(MAL_SERVER, MAL_MALLOC_FAIL "\n");
close_stream(fdin);
close_stream(fdout);
return;
@@ -471,7 +471,7 @@ SERVERlistenThread(SOCKET *Sock)
data = GDKmalloc(sizeof(*data));
if( data == NULL){
closesocket(msgsock);
- CRITICAL(MAL_SERVER, SQLSTATE(HY001) MAL_MALLOC_FAIL
"\n");
+ TRC_CRITICAL(MAL_SERVER, SQLSTATE(HY001)
MAL_MALLOC_FAIL "\n");
continue;
}
data->in = socket_rstream(msgsock, "Server read");
@@ -482,7 +482,7 @@ SERVERlistenThread(SOCKET *Sock)
mnstr_destroy(data->out);
GDKfree(data);
closesocket(msgsock);
- CRITICAL(MAL_SERVER, "Cannot allocate stream\n");
+ TRC_CRITICAL(MAL_SERVER, "Cannot allocate stream\n");
continue;
}
s = block_stream(data->in);
@@ -507,7 +507,7 @@ SERVERlistenThread(SOCKET *Sock)
mnstr_destroy(data->out);
GDKfree(data);
closesocket(msgsock);
- CRITICAL(MAL_SERVER, "Cannot fork new client thread\n");
+ TRC_CRITICAL(MAL_SERVER, "Cannot fork new client
thread\n");
continue;
}
} while (!ATOMIC_GET(&serverexiting) && !GDKexiting());
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -741,7 +741,7 @@ exp_bin(backend *be, sql_exp *e, stmt *l
if (s && grp)
s = stmt_project(be, ext, s);
if (!s && right) {
- CRITICAL(SQL_RELATION, "Could not find %s.%s\n",
(char*)e->l, (char*)e->r);
+ TRC_CRITICAL(SQL_RELATION, "Could not find %s.%s\n",
(char*)e->l, (char*)e->r);
print_stmtlist(sql->sa, left);
print_stmtlist(sql->sa, right);
if (!s) {
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
@@ -141,10 +141,10 @@ SQLprelude(Client cntxt, MalBlkPtr mb, M
tmp = SQLinit(cntxt);
if (tmp != MAL_SUCCEED) {
- CRITICAL(SQL_SCENARIO, "Fatal error during initialization:
%s\n", tmp);
+ TRC_CRITICAL(SQL_SCENARIO, "Fatal error during initialization:
%s\n", tmp);
freeException(tmp);
if ((tmp = GDKerrbuf) && *tmp)
- CRITICAL(SQL_SCENARIO, SQLSTATE(42000) "GDK reported:
%s\n", tmp);
+ TRC_CRITICAL(SQL_SCENARIO, SQLSTATE(42000) "GDK
reported: %s\n", tmp);
fflush(stderr);
exit(1);
}
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -2481,7 +2481,7 @@ SQLupgrades(Client c, mvc *m)
int res = 0;
if (!prev_schema) {
- CRITICAL(SQL_UPGRADES, "Allocation failure while running SQL
upgrades\n");
+ TRC_CRITICAL(SQL_UPGRADES, "Allocation failure while running
SQL upgrades\n");
res = -1;
}
diff --git a/sql/backends/monet5/sql_user.c b/sql/backends/monet5/sql_user.c
--- a/sql/backends/monet5/sql_user.c
+++ b/sql/backends/monet5/sql_user.c
@@ -233,7 +233,7 @@ monet5_create_privileges(ptr _mvc, sql_s
"\"sys\".\"db_user_info\" AS ui "
"ON u.\"name\" = ui.\"name\";");
if (!t) {
- CRITICAL(SQL_USER, "Failed to create 'users' view\n");
+ TRC_CRITICAL(SQL_USER, "Failed to create 'users' view\n");
return ;
}
diff --git a/sql/backends/monet5/vaults/shp/shp.c
b/sql/backends/monet5/vaults/shp/shp.c
--- a/sql/backends/monet5/vaults/shp/shp.c
+++ b/sql/backends/monet5/vaults/shp/shp.c
@@ -69,7 +69,7 @@ GDALWConnection * GDALWConnect(char * so
OGRRegisterAll();
conn = malloc(sizeof(GDALWConnection));
if (conn == NULL) {
- CRITICAL(SHP, "Could not allocate memory\n");
+ TRC_CRITICAL(SHP, "Could not allocate memory\n");
return NULL;
}
conn->handler = OGROpen(source, 0 , &(conn->driver));
@@ -95,7 +95,7 @@ GDALWConnection * GDALWConnect(char * so
if (conn->fieldDefinitions == NULL) {
OGRReleaseDataSource(conn->handler);
free(conn);
- CRITICAL(SHP, "Could not allocate memory\n");
+ TRC_CRITICAL(SHP, "Could not allocate memory\n");
return NULL;
}
for (i=0 ; i<fieldCount ; i++) {
@@ -120,7 +120,7 @@ GDALWSimpleFieldDef * GDALWGetSimpleFiel
}*/
columns = malloc(conn.numFieldDefinitions *
sizeof(GDALWSimpleFieldDef));
if (columns == NULL) {
- CRITICAL(SHP, "Could not allocate memory\n");
+ TRC_CRITICAL(SHP, "Could not allocate memory\n");
return NULL;
}
for (i=0 ; i<conn.numFieldDefinitions ; i++) {
diff --git a/sql/backends/monet5/wlr.c b/sql/backends/monet5/wlr.c
--- a/sql/backends/monet5/wlr.c
+++ b/sql/backends/monet5/wlr.c
@@ -355,7 +355,7 @@ WLRprocessBatch(void *arg)
sql->session->ac_on_commit = 1;
sql->session->level = 0;
if(mvc_trans(sql) < 0) {
- CRITICAL(SQL_WLR, "Allocation
failure while starting the transaction\n");
+ TRC_CRITICAL(SQL_WLR,
"Allocation failure while starting the transaction\n");
} else {
TRC_DEBUG(SQL_WLR, "Process a
transaction\n");
debugFunction(SQL_WLR, mb, 0,
LIST_MAL_DEBUG | LIST_MAL_MAPI );
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -109,25 +109,25 @@ mvc_init(int debug, store_type store, in
TRC_DEBUG(SQL_MVC, "Initialization\n");
keyword_init();
if(scanner_init_keywords() != 0) {
- CRITICAL(SQL_MVC, "Malloc failure\n");
+ TRC_CRITICAL(SQL_MVC, "Malloc failure\n");
return -1;
}
if ((first = store_init(debug, store, ro, su, stk)) < 0) {
- CRITICAL(SQL_MVC, "Unable to create system tables\n");
+ TRC_CRITICAL(SQL_MVC, "Unable to create system tables\n");
return -1;
}
m = mvc_create(0, stk, 0, NULL, NULL);
if (!m) {
- CRITICAL(SQL_MVC, "Malloc failure\n");
+ TRC_CRITICAL(SQL_MVC, "Malloc failure\n");
return -1;
}
m->sa = sa_create();
if (!m->sa) {
mvc_destroy(m);
- CRITICAL(SQL_MVC, "Malloc failure\n");
+ TRC_CRITICAL(SQL_MVC, "Malloc failure\n");
return -1;
}
@@ -139,7 +139,7 @@ mvc_init(int debug, store_type store, in
if (first || catalog_version) {
if (mvc_trans(m) < 0) {
mvc_destroy(m);
- CRITICAL(SQL_MVC, "Failed to start transaction\n");
+ TRC_CRITICAL(SQL_MVC, "Failed to start transaction\n");
return -1;
}
@@ -155,7 +155,7 @@ mvc_init(int debug, store_type store, in
t = mvc_init_create_view(m, s, "tables", "SELECT \"id\",
\"name\", \"schema_id\", \"query\", CAST(CASE WHEN \"system\" THEN \"type\" +
10 /* system table/view */ ELSE (CASE WHEN \"commit_action\" = 0 THEN \"type\"
/* table/view */ ELSE \"type\" + 20 /* global temp table */ END) END AS
SMALLINT) AS \"type\", \"system\", \"commit_action\", \"access\", CASE WHEN
(NOT \"system\" AND \"commit_action\" > 0) THEN 1 ELSE 0 END AS \"temporary\"
FROM \"sys\".\"_tables\" WHERE \"type\" <> 2 UNION ALL SELECT \"id\", \"name\",
\"schema_id\", \"query\", CAST(\"type\" + 30 /* local temp table */ AS
SMALLINT) AS \"type\", \"system\", \"commit_action\", \"access\", 1 AS
\"temporary\" FROM \"tmp\".\"_tables\";");
if (!t) {
mvc_destroy(m);
- CRITICAL(SQL_MVC, "Failed to create 'tables' view\n");
+ TRC_CRITICAL(SQL_MVC, "Failed to create 'tables'
view\n");
return -1;
}
@@ -191,7 +191,7 @@ mvc_init(int debug, store_type store, in
t = mvc_init_create_view(m, s, "columns", "SELECT * FROM
(SELECT p.* FROM \"sys\".\"_columns\" AS p UNION ALL SELECT t.* FROM
\"tmp\".\"_columns\" AS t) AS columns;");
if (!t) {
mvc_destroy(m);
- CRITICAL(SQL_MVC, "Failed to create 'columns' view\n");
+ TRC_CRITICAL(SQL_MVC, "Failed to create 'columns'
view\n");
return -1;
}
ncid = t->base.id;
@@ -232,7 +232,7 @@ mvc_init(int debug, store_type store, in
assert(m->session->schema != NULL);
if ((msg = mvc_commit(m, 0, NULL, false)) != MAL_SUCCEED) {
- CRITICAL(SQL_MVC, "Unable to commit system tables:
%s\n", (msg + 6));
+ TRC_CRITICAL(SQL_MVC, "Unable to commit system tables:
%s\n", (msg + 6));
freeException(msg);
return -1;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
