Changeset: c0d2c80c53f2 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c0d2c80c53f2
Modified Files:
monetdb5/modules/atoms/str.c
monetdb5/modules/atoms/str.h
monetdb5/modules/kernel/batstr.c
Branch: resource_management
Log Message:
using MALblk allocator in str modules
diffs (truncated from 1336 to 300 lines):
diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c
--- a/monetdb5/modules/atoms/str.c
+++ b/monetdb5/modules/atoms/str.c
@@ -325,16 +325,16 @@ STRTail(Client ctx, str *res, const char
size_t buflen = INITIAL_STR_BUFFER_LENGTH;
*res = NULL;
- if (!(buf = GDKmalloc(buflen)))
+ if (!(buf = ma_alloc(ma, buflen)))
throw(MAL, "str.tail", SQLSTATE(HY013) MAL_MALLOC_FAIL);
if ((msg = str_tail(&buf, &buflen, s, off)) != MAL_SUCCEED) {
- GDKfree(buf);
+ //GDKfree(buf);
return msg;
}
*res = MA_STRDUP(ma, buf);
}
- GDKfree(buf);
+ //GDKfree(buf);
if (!*res)
msg = createException(MAL, "str.tail", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
return msg;
@@ -382,16 +382,16 @@ STRSubString(Client ctx, str *res, const
size_t buflen = INITIAL_STR_BUFFER_LENGTH;
*res = NULL;
- if (!(buf = GDKmalloc(buflen)))
+ if (!(buf = ma_alloc(ma, buflen)))
throw(MAL, "str.substring", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
if ((msg = str_Sub_String(&buf, &buflen, s, off, len)) !=
MAL_SUCCEED) {
- GDKfree(buf);
+ //GDKfree(buf);
return msg;
}
*res = MA_STRDUP(ma, buf);
}
- GDKfree(buf);
+ //GDKfree(buf);
if (!*res)
msg = createException(MAL, "str.substring",
SQLSTATE(HY013)
MAL_MALLOC_FAIL);
@@ -423,16 +423,16 @@ STRFromWChr(Client ctx, str *res, const
size_t buflen = MAX(strlen(str_nil) + 1, 8);
*res = NULL;
- if (!(buf = GDKmalloc(buflen)))
+ if (!(buf = ma_alloc(ma, buflen)))
throw(MAL, "str.unicode", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
if ((msg = str_from_wchr(&buf, &buflen, cc)) != MAL_SUCCEED) {
- GDKfree(buf);
+ //GDKfree(buf);
return msg;
}
*res = MA_STRDUP(ma, buf);
}
- GDKfree(buf);
+ //GDKfree(buf);
if (!*res)
msg = createException(MAL, "str.unicode",
SQLSTATE(HY013)
MAL_MALLOC_FAIL);
@@ -482,16 +482,16 @@ doStrConvert(allocator *ma, str *res, co
size_t buflen = INITIAL_STR_BUFFER_LENGTH;
*res = NULL;
- if (!(buf = GDKmalloc(buflen)))
+ if (!(buf = ma_alloc(ma, buflen)))
throw(MAL, "str.lower", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
if ((*func)(&buf, &buflen, arg1) != GDK_SUCCEED) {
- GDKfree(buf);
+ //GDKfree(buf);
throw(MAL, "str.lower", GDK_EXCEPTION);
}
*res = MA_STRDUP(ma, buf);
}
- GDKfree(buf);
+ //GDKfree(buf);
if (!*res)
msg = createException(MAL, "str.lower",
SQLSTATE(HY013)
MAL_MALLOC_FAIL);
@@ -790,16 +790,16 @@ STRsplitpart(Client ctx, str *res, const
size_t buflen = INITIAL_STR_BUFFER_LENGTH;
*res = NULL;
- if (!(buf = GDKmalloc(buflen)))
+ if (!(buf = ma_alloc(ma, buflen)))
throw(MAL, "str.splitpart", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
if ((msg = str_splitpart(&buf, &buflen, s, s2, f)) !=
MAL_SUCCEED) {
- GDKfree(buf);
+ //GDKfree(buf);
return msg;
}
*res = MA_STRDUP(ma, buf);
}
- GDKfree(buf);
+ //GDKfree(buf);
if (!*res)
msg = createException(MAL, "str.splitpart",
SQLSTATE(HY013)
MAL_MALLOC_FAIL);
@@ -914,16 +914,16 @@ STRStrip(Client ctx, str *res, const cha
size_t buflen = INITIAL_STR_BUFFER_LENGTH;
*res = NULL;
- if (!(buf = GDKmalloc(buflen)))
+ if (!(buf = ma_alloc(ma, buflen)))
throw(MAL, "str.strip", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
if ((msg = str_strip(&buf, &buflen, s)) != MAL_SUCCEED) {
- GDKfree(buf);
+ //GDKfree(buf);
return msg;
}
*res = MA_STRDUP(ma, buf);
}
- GDKfree(buf);
+ //GDKfree(buf);
if (!*res)
msg = createException(MAL, "str.strip",
SQLSTATE(HY013)
MAL_MALLOC_FAIL);
@@ -956,16 +956,16 @@ STRLtrim(Client ctx, str *res, const cha
size_t buflen = INITIAL_STR_BUFFER_LENGTH;
*res = NULL;
- if (!(buf = GDKmalloc(buflen)))
+ if (!(buf = ma_alloc(ma, buflen)))
throw(MAL, "str.ltrim", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
if ((msg = str_ltrim(&buf, &buflen, s)) != MAL_SUCCEED) {
- GDKfree(buf);
+ //GDKfree(buf);
return msg;
}
*res = MA_STRDUP(ma, buf);
}
- GDKfree(buf);
+ //GDKfree(buf);
if (!*res)
msg = createException(MAL, "str.ltrim",
SQLSTATE(HY013)
MAL_MALLOC_FAIL);
@@ -998,16 +998,16 @@ STRRtrim(Client ctx, str *res, const cha
size_t buflen = INITIAL_STR_BUFFER_LENGTH;
*res = NULL;
- if (!(buf = GDKmalloc(buflen)))
+ if (!(buf = ma_alloc(ma, buflen)))
throw(MAL, "str.rtrim", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
if ((msg = str_rtrim(&buf, &buflen, s)) != MAL_SUCCEED) {
- GDKfree(buf);
+ //GDKfree(buf);
return msg;
}
*res = MA_STRDUP(ma, buf);
}
- GDKfree(buf);
+ //GDKfree(buf);
if (!*res)
msg = createException(MAL, "str.rtrim",
SQLSTATE(HY013)
MAL_MALLOC_FAIL);
@@ -1082,16 +1082,16 @@ STRStrip2(Client ctx, str *res, const ch
size_t buflen = INITIAL_STR_BUFFER_LENGTH * sizeof(int);
*res = NULL;
- if (!(buf = GDKmalloc(buflen)))
+ if (!(buf = ma_alloc(ma, buflen)))
throw(MAL, "str.strip2", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
if ((msg = str_strip2(&buf, &buflen, s, s2)) != MAL_SUCCEED) {
- GDKfree(buf);
+ //GDKfree(buf);
return msg;
}
*res = MA_STRDUP(ma, buf);
}
- GDKfree(buf);
+ //GDKfree(buf);
if (!*res)
msg = createException(MAL, "str.strip2",
SQLSTATE(HY013)
MAL_MALLOC_FAIL);
@@ -1137,16 +1137,16 @@ STRLtrim2(Client ctx, str *res, const ch
size_t buflen = INITIAL_STR_BUFFER_LENGTH * sizeof(int);
*res = NULL;
- if (!(buf = GDKmalloc(buflen)))
+ if (!(buf = ma_alloc(ma, buflen)))
throw(MAL, "str.ltrim2", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
if ((msg = str_ltrim2(&buf, &buflen, s, s2)) != MAL_SUCCEED) {
- GDKfree(buf);
+ //GDKfree(buf);
return msg;
}
*res = MA_STRDUP(ma, buf);
}
- GDKfree(buf);
+ //GDKfree(buf);
if (!*res)
msg = createException(MAL, "str.ltrim2",
SQLSTATE(HY013)
MAL_MALLOC_FAIL);
@@ -1192,16 +1192,16 @@ STRRtrim2(Client ctx, str *res, const ch
size_t buflen = INITIAL_STR_BUFFER_LENGTH * sizeof(int);
*res = NULL;
- if (!(buf = GDKmalloc(buflen)))
+ if (!(buf = ma_alloc(ma, buflen)))
throw(MAL, "str.rtrim2", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
if ((msg = str_rtrim2(&buf, &buflen, s, s2)) != MAL_SUCCEED) {
- GDKfree(buf);
+ //GDKfree(buf);
return msg;
}
*res = MA_STRDUP(ma, buf);
}
- GDKfree(buf);
+ //GDKfree(buf);
if (!*res)
msg = createException(MAL, "str.rtrim2",
SQLSTATE(HY013)
MAL_MALLOC_FAIL);
@@ -1294,16 +1294,16 @@ STRLpad(Client ctx, str *res, const char
size_t buflen = INITIAL_STR_BUFFER_LENGTH;
*res = NULL;
- if (!(buf = GDKmalloc(buflen)))
+ if (!(buf = ma_alloc(ma, buflen)))
throw(MAL, "str.lpad", SQLSTATE(HY013) MAL_MALLOC_FAIL);
if ((msg = str_lpad(&buf, &buflen, s, l)) != MAL_SUCCEED) {
- GDKfree(buf);
+ //GDKfree(buf);
return msg;
}
*res = MA_STRDUP(ma, buf);
}
- GDKfree(buf);
+ //GDKfree(buf);
if (!*res)
msg = createException(MAL, "str.lpad", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
return msg;
@@ -1336,16 +1336,16 @@ STRRpad(Client ctx, str *res, const char
size_t buflen = INITIAL_STR_BUFFER_LENGTH;
*res = NULL;
- if (!(buf = GDKmalloc(buflen)))
+ if (!(buf = ma_alloc(ma, buflen)))
throw(MAL, "str.rpad", SQLSTATE(HY013) MAL_MALLOC_FAIL);
if ((msg = str_rpad(&buf, &buflen, s, l)) != MAL_SUCCEED) {
- GDKfree(buf);
+ //GDKfree(buf);
return msg;
}
*res = MA_STRDUP(ma, buf);
}
- GDKfree(buf);
+ //GDKfree(buf);
if (!*res)
msg = createException(MAL, "str.rpad", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
return msg;
@@ -1378,16 +1378,16 @@ STRLpad3(Client ctx, str *res, const cha
size_t buflen = INITIAL_STR_BUFFER_LENGTH;
*res = NULL;
- if (!(buf = GDKmalloc(buflen)))
+ if (!(buf = ma_alloc(ma, buflen)))
throw(MAL, "str.lpad2", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
if ((msg = str_lpad3(&buf, &buflen, s, l, s2)) != MAL_SUCCEED) {
- GDKfree(buf);
+ //GDKfree(buf);
return msg;
}
*res = MA_STRDUP(ma, buf);
}
- GDKfree(buf);
+ //GDKfree(buf);
if (!*res)
msg = createException(MAL, "str.lpad2",
SQLSTATE(HY013)
MAL_MALLOC_FAIL);
@@ -1421,16 +1421,16 @@ STRRpad3(Client ctx, str *res, const cha
size_t buflen = INITIAL_STR_BUFFER_LENGTH;
*res = NULL;
- if (!(buf = GDKmalloc(buflen)))
+ if (!(buf = ma_alloc(ma, buflen)))
throw(MAL, "str.rpad2", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
if ((msg = str_rpad3(&buf, &buflen, s, l, s2)) != MAL_SUCCEED) {
- GDKfree(buf);
+ //GDKfree(buf);
return msg;
}
*res = MA_STRDUP(ma, buf);
}
- GDKfree(buf);
+ //GDKfree(buf);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
