Changeset: 41a89b37ef34 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/41a89b37ef34
Modified Files:
monetdb5/mal/mal_client.c
monetdb5/modules/mal/clients.c
Branch: resource_management
Log Message:
favour MALblk allocator
diffs (161 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
@@ -462,8 +462,9 @@ MCcloseClient(Client c)
c->mode = FREECLIENT;
c->idx = -1;
}
+ ma_destroy(c->ma);
c->ta = NULL;
- ma_destroy(c->ma);
+ c->ma = NULL;
MT_thread_setallocator(NULL);
MT_lock_unset(&mal_contextLock);
}
diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c
--- a/monetdb5/modules/mal/clients.c
+++ b/monetdb5/modules/mal/clients.c
@@ -55,9 +55,9 @@ CLTgetScenario(Client ctx, MalBlkPtr mb,
{
(void) mb;
if (ctx->scenario)
- *getArgReference_str(stk, pci, 0) = MA_STRDUP(ctx->ma,
ctx->scenario);
+ *getArgReference_str(stk, pci, 0) = MA_STRDUP(mb->ma,
ctx->scenario);
else
- *getArgReference_str(stk, pci, 0) = MA_STRDUP(ctx->ma, "nil");
+ *getArgReference_str(stk, pci, 0) = MA_STRDUP(mb->ma, "nil");
if (*getArgReference_str(stk, pci, 0) == NULL)
throw(MAL, "clients.getScenario", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
return MAL_SUCCEED;
@@ -72,7 +72,7 @@ CLTsetScenario(Client ctx, MalBlkPtr mb,
msg = setScenario(ctx, *getArgReference_str(stk, pci, 1));
*getArgReference_str(stk, pci, 0) = 0;
if (msg == NULL) {
- *getArgReference_str(stk, pci, 0) = MA_STRDUP(ctx->ma,
ctx->scenario);
+ *getArgReference_str(stk, pci, 0) = MA_STRDUP(mb->ma,
ctx->scenario);
if (*getArgReference_str(stk, pci, 0) == NULL)
throw(MAL, "clients.setScenario", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
}
@@ -564,7 +564,7 @@ CLTgetProfile(Client ctx, MalBlkPtr mb,
int *wlim = getArgReference_int(stk, pci, 3);
int *mlim = getArgReference_int(stk, pci, 4);
(void) mb;
- if (!(*opt = MA_STRDUP(ctx->ma, ctx->optimizer)))
+ if (!(*opt = MA_STRDUP(mb->ma, ctx->optimizer)))
throw(MAL, "clients.getProfile", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
*qto = (int) (ctx->querytimeout / 1000000);
*sto = (int) (ctx->sessiontimeout / 1000000);
@@ -591,15 +591,15 @@ CLTsetPrintTimeout(Client ctx, void *ret
static str
CLTmd5sum(Client ctx, str *ret, const char *const *pw)
{
- (void) ctx;
+ allocator *ma = ctx->curprg->def->ma;
if (strNil(*pw)) {
- *ret = MA_STRDUP(ctx->ma, str_nil);
+ *ret = MA_STRDUP(ma, str_nil);
} else {
char *mret = mcrypt_MD5Sum(*pw, strlen(*pw));
if (!mret)
throw(MAL, "clients.md5sum", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
- *ret = MA_STRDUP(ctx->ma, mret);
+ *ret = MA_STRDUP(ma, mret);
free(mret);
}
if (*ret == NULL)
@@ -610,15 +610,15 @@ CLTmd5sum(Client ctx, str *ret, const ch
static str
CLTsha1sum(Client ctx, str *ret, const char *const *pw)
{
- (void) ctx;
+ allocator *ma = ctx->curprg->def->ma;
if (strNil(*pw)) {
- *ret = MA_STRDUP(ctx->ma, str_nil);
+ *ret = MA_STRDUP(ma, str_nil);
} else {
char *mret = mcrypt_SHA1Sum(*pw, strlen(*pw));
if (!mret)
throw(MAL, "clients.sha1sum", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
- *ret = MA_STRDUP(ctx->ma, mret);
+ *ret = MA_STRDUP(ma, mret);
free(mret);
}
if (*ret == NULL)
@@ -629,15 +629,15 @@ CLTsha1sum(Client ctx, str *ret, const c
static str
CLTripemd160sum(Client ctx, str *ret, const char *const *pw)
{
- (void) ctx;
+ allocator *ma = ctx->curprg->def->ma;
if (strNil(*pw)) {
- *ret = MA_STRDUP(ctx->ma, str_nil);
+ *ret = MA_STRDUP(ma, str_nil);
} else {
char *mret = mcrypt_RIPEMD160Sum(*pw, strlen(*pw));
if (!mret)
throw(MAL, "clients.ripemd160sum", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
- *ret = MA_STRDUP(ctx->ma, mret);
+ *ret = MA_STRDUP(ma, mret);
free(mret);
}
if (*ret == NULL)
@@ -648,9 +648,9 @@ CLTripemd160sum(Client ctx, str *ret, co
static str
CLTsha2sum(Client ctx, str *ret, const char *const *pw, const int *bits)
{
- (void) ctx;
+ allocator *ma = ctx->curprg->def->ma;
if (strNil(*pw) || is_int_nil(*bits)) {
- *ret = MA_STRDUP(ctx->ma, str_nil);
+ *ret = MA_STRDUP(ma, str_nil);
} else {
char *mret = 0;
switch (*bits) {
@@ -673,7 +673,7 @@ CLTsha2sum(Client ctx, str *ret, const c
}
if (!mret)
throw(MAL, "clients.sha2sum", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
- *ret = MA_STRDUP(ctx->ma, mret);
+ *ret = MA_STRDUP(ma, mret);
free(mret);
}
if (*ret == NULL)
@@ -684,14 +684,14 @@ CLTsha2sum(Client ctx, str *ret, const c
static str
CLTbackendsum(Client ctx, str *ret, const char *const *pw)
{
- (void) ctx;
+ allocator *ma = ctx->curprg->def->ma;
if (strNil(*pw)) {
- *ret = MA_STRDUP(ctx->ma, str_nil);
+ *ret = MA_STRDUP(ma, str_nil);
} else {
char *mret = mcrypt_BackendSum(*pw, strlen(*pw));
if (mret == NULL)
throw(MAL, "clients.backendsum", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
- *ret = MA_STRDUP(ctx->ma, mret);
+ *ret = MA_STRDUP(ma, mret);
free(mret);
}
if (*ret == NULL)
@@ -705,7 +705,7 @@ CLTgetUsername(Client ctx, MalBlkPtr mb,
str *ret = getArgReference_str(stk, pci, 0);
(void) mb;
- *ret = MA_STRDUP(ctx->ma, ctx->username);
+ *ret = MA_STRDUP(mb->ma, ctx->username);
return MAL_SUCCEED;
}
@@ -766,7 +766,7 @@ CLTshutdown(Client ctx, MalBlkPtr mb, Ma
} while (delay > 0 && leftover > 1);
if (delay == 0 && leftover > 1)
snprintf(buf, 1024, "%d client sessions still running",
leftover);
- *ret = MA_STRDUP(ctx->ma, buf);
+ *ret = MA_STRDUP(mb->ma, buf);
if (force)
GDKprepareExit();
if (*ret == NULL)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
