Changeset: bde5dff13182 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/bde5dff13182
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_string.c
gdk/gdk_system.c
gdk/gdk_utils.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_instruction.c
monetdb5/modules/mal/tablet.c
sql/backends/monet5/UDF/udf/udf.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_bincopyconvert.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_rank.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_subquery.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/vaults/csv/csv.c
sql/backends/monet5/vaults/monetdb/monetdb.c
sql/backends/monet5/vaults/odbc/odbc_loader.c
sql/common/sql_list.c
sql/common/sql_string.c
sql/common/sql_types.c
sql/include/sql_mem.h
sql/server/rel_basetable.c
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_optimize_proj.c
sql/server/rel_optimize_sel.c
sql/server/rel_optimizer.c
sql/server/rel_planner.c
sql/server/rel_prop.c
sql/server/rel_propagate.c
sql/server/rel_psm.c
sql/server/rel_rel.c
sql/server/rel_remote.c
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_sequence.c
sql/server/rel_unnest.c
sql/server/rel_updates.c
sql/server/sql_atom.c
sql/server/sql_decimal.c
sql/server/sql_mvc.c
sql/server/sql_parser.y
sql/server/sql_privileges.c
sql/server/sql_qc.c
sql/server/sql_scan.c
sql/server/sql_semantic.c
sql/server/sqlparse.c
sql/storage/bat/bat_logger.c
sql/storage/sql_catalog.c
sql/storage/store.c
tools/monetdbe/monetdbe.c
Branch: resource_management
Log Message:
Change sa_* (SQL allocator) to ma_* (memory allocator) globally.
Note, sa_create and ma_create were different and have been replaced by
calls directly to create_allocator.
diffs (truncated from 5987 to 300 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -564,6 +564,25 @@ gdk_return log_tflush(logger *lg, ulng l
gdk_return log_tsequence(logger *lg, int seq, lng id);
gdk_return log_tstart(allocator *ma, logger *lg, bool flushnow, ulng
*log_file_id);
ATOMIC_TYPE lvl_per_component[];
+void *ma_alloc(allocator *sa, size_t sz);
+void ma_close(allocator *sa);
+void ma_close_to(allocator *sa, allocator_state *);
+void ma_destroy(allocator *sa);
+void ma_free(allocator *sa, void *);
+exception_buffer *ma_get_eb(allocator *sa) __attribute__((__pure__));
+allocator *ma_get_parent(const allocator *sa);
+allocator *ma_get_ta(allocator *sa);
+const char *ma_name(allocator *sa);
+allocator_state *ma_open(allocator *sa);
+void *ma_realloc(allocator *sa, void *ptr, size_t sz, size_t osz);
+allocator *ma_reset(allocator *sa);
+void ma_set_ta(allocator *sa, allocator *ta);
+size_t ma_size(allocator *sa);
+char *ma_strconcat(allocator *sa, const char *s1, const char *s2);
+char *ma_strdup(allocator *sa, const char *s);
+char *ma_strndup(allocator *sa, const char *s, size_t l);
+bool ma_tmp_active(const allocator *sa);
+void *ma_zalloc(allocator *sa, size_t sz);
void *mdlopen(const char *library, int mode);
int mo_add_option(opt **Set, int setlen, opt_kind kind, const char *name,
const char *value);
int mo_builtin_settings(opt **Set);
@@ -575,25 +594,6 @@ const oid oid_nil;
ssize_t ptrFromStr(allocator *ma, const char *src, size_t *len, ptr **dst,
bool external);
ssize_t ptrToStr(allocator *ma, str *dst, size_t *len, const ptr *src, bool
external);
const ptr ptr_nil;
-void *sa_alloc(allocator *sa, size_t sz);
-void sa_close(allocator *sa);
-void sa_close_to(allocator *sa, allocator_state *);
-void sa_destroy(allocator *sa);
-void sa_free(allocator *sa, void *);
-exception_buffer *sa_get_eb(allocator *sa) __attribute__((__pure__));
-allocator *sa_get_parent(const allocator *sa);
-allocator *sa_get_ta(allocator *sa);
-const char *sa_name(allocator *sa);
-allocator_state *sa_open(allocator *sa);
-void *sa_realloc(allocator *sa, void *ptr, size_t sz, size_t osz);
-allocator *sa_reset(allocator *sa);
-void sa_set_ta(allocator *sa, allocator *ta);
-size_t sa_size(allocator *sa);
-char *sa_strconcat(allocator *sa, const char *s1, const char *s2);
-char *sa_strdup(allocator *sa, const char *s);
-char *sa_strndup(allocator *sa, const char *s, size_t l);
-bool sa_tmp_active(const allocator *sa);
-void *sa_zalloc(allocator *sa, size_t sz);
ssize_t shtFromStr(allocator *ma, const char *src, size_t *len, sht **dst,
bool external);
ssize_t shtToStr(allocator *ma, str *dst, size_t *len, const sht *src, bool
external);
const sht sht_nil;
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1735,100 +1735,88 @@ gdk_export ValPtr VALinit(allocator *va,
__attribute__((__access__(write_only, 1)));
gdk_export allocator *create_allocator(allocator *pa, const char *, bool
use_lock);
-gdk_export allocator *sa_get_parent(const allocator *sa);
-gdk_export bool sa_tmp_active(const allocator *sa);
-gdk_export allocator *sa_reset(allocator *sa);
-gdk_export void *sa_alloc(allocator *sa, size_t sz);
-gdk_export void *sa_zalloc(allocator *sa, size_t sz);
-gdk_export void *sa_realloc(allocator *sa, void *ptr, size_t sz, size_t osz);
-gdk_export void sa_destroy(allocator *sa);
-gdk_export char *sa_strndup(allocator *sa, const char *s, size_t l);
-gdk_export char *sa_strdup(allocator *sa, const char *s);
-gdk_export char *sa_strconcat(allocator *sa, const char *s1, const char *s2);
-gdk_export size_t sa_size(allocator *sa);
-gdk_export const char* sa_name(allocator *sa);
-gdk_export allocator_state* sa_open(allocator *sa); /* open new frame of
tempory allocations */
-gdk_export void sa_close(allocator *sa); /* close temporary frame, reset to
initial state */
-gdk_export void sa_close_to(allocator *sa, allocator_state *); /* close
temporary frame, reset to old state */
-gdk_export void sa_free(allocator *sa, void *);
-gdk_export exception_buffer *sa_get_eb(allocator *sa)
+gdk_export allocator *ma_get_parent(const allocator *sa);
+gdk_export bool ma_tmp_active(const allocator *sa);
+gdk_export allocator *ma_reset(allocator *sa);
+gdk_export void *ma_alloc(allocator *sa, size_t sz);
+gdk_export void *ma_zalloc(allocator *sa, size_t sz);
+gdk_export void *ma_realloc(allocator *sa, void *ptr, size_t sz, size_t osz);
+gdk_export void ma_destroy(allocator *sa);
+gdk_export char *ma_strndup(allocator *sa, const char *s, size_t l);
+gdk_export char *ma_strdup(allocator *sa, const char *s);
+gdk_export char *ma_strconcat(allocator *sa, const char *s1, const char *s2);
+gdk_export size_t ma_size(allocator *sa);
+gdk_export const char* ma_name(allocator *sa);
+gdk_export allocator_state* ma_open(allocator *sa); /* open new frame of
tempory allocations */
+gdk_export void ma_close(allocator *sa); /* close temporary frame, reset to
initial state */
+gdk_export void ma_close_to(allocator *sa, allocator_state *); /* close
temporary frame, reset to old state */
+gdk_export void ma_free(allocator *sa, void *);
+gdk_export exception_buffer *ma_get_eb(allocator *sa)
__attribute__((__pure__));
-gdk_export void sa_set_ta(allocator *sa, allocator *ta);
-gdk_export allocator *sa_get_ta(allocator *sa);
+gdk_export void ma_set_ta(allocator *sa, allocator *ta);
+gdk_export allocator *ma_get_ta(allocator *sa);
-#define sa_create(pa) create_allocator(pa, NULL, false)
-#define ma_create(pa) create_allocator(pa, NULL, true)
-#define ma_destroy(ma) sa_destroy(ma)
-#define ma_alloc(ma, sz) (void*)sa_alloc(ma, sz)
-#define ma_zalloc(ma, sz) (void*)sa_zalloc(ma, sz)
-#define ma_realloc(ma, obj, sz, osz) (void *) sa_realloc(ma, obj, sz, osz)
-#define ma_open(ma) sa_open(ma)
-#define ma_close(ma) sa_close(ma)
-#define ma_close_to(ma, state) sa_close_to(ma, state)
-#define ma_free(ma, obj) sa_free(ma, obj)
-#define ma_reset(ma) sa_reset(ma)
-
-#define MA_NEW( sa, type ) ((type*)sa_alloc( sa,
sizeof(type)))
-#define MA_ZNEW( sa, type ) ((type*)sa_zalloc( sa,
sizeof(type)))
-#define MA_NEW_ARRAY( sa, type, size ) (type*)sa_alloc( sa,
((size)*sizeof(type)))
-#define MA_ZNEW_ARRAY( sa, type, size )
(type*)sa_zalloc( sa, ((size)*sizeof(type)))
-#define MA_RENEW_ARRAY( sa, type, ptr, sz, osz ) (type*)sa_realloc( sa,
ptr, ((sz)*sizeof(type)), ((osz)*sizeof(type)))
-#define MA_STRDUP( sa, s) sa_strdup(sa, s)
-#define MA_STRNDUP( sa, s, l) sa_strndup(sa, s, l)
+#define MA_NEW( sa, type ) ((type*)ma_alloc( sa,
sizeof(type)))
+#define MA_ZNEW( sa, type ) ((type*)ma_zalloc( sa,
sizeof(type)))
+#define MA_NEW_ARRAY( sa, type, size ) (type*)ma_alloc( sa,
((size)*sizeof(type)))
+#define MA_ZNEW_ARRAY( sa, type, size )
(type*)ma_zalloc( sa, ((size)*sizeof(type)))
+#define MA_RENEW_ARRAY( sa, type, ptr, sz, osz ) (type*)ma_realloc( sa,
ptr, ((sz)*sizeof(type)), ((osz)*sizeof(type)))
+#define MA_STRDUP( sa, s) ma_strdup(sa, s)
+#define MA_STRNDUP( sa, s, l) ma_strndup(sa, s, l)
#if !defined(NDEBUG) && !defined(__COVERITY__) && defined(__GNUC__)
-#define sa_alloc(sa, sz) \
+#define ma_alloc(sa, sz) \
({ \
allocator *_sa = (sa); \
size_t _sz = (sz); \
- void *_res = sa_alloc(_sa, _sz); \
+ void *_res = ma_alloc(_sa, _sz); \
TRC_DEBUG(ALLOC, \
- "sa_alloc(%p,%zu) -> %p\n", \
+ "ma_alloc(%p,%zu) -> %p\n", \
_sa, _sz, _res); \
_res; \
})
-#define sa_zalloc(sa, sz) \
+#define ma_zalloc(sa, sz) \
({ \
allocator *_sa = (sa); \
size_t _sz = (sz); \
- void *_res = sa_zalloc(_sa, _sz); \
+ void *_res = ma_zalloc(_sa, _sz); \
TRC_DEBUG(ALLOC, \
- "sa_zalloc(%p,%zu) -> %p\n", \
+ "ma_zalloc(%p,%zu) -> %p\n", \
_sa, _sz, _res); \
_res; \
})
-#define sa_realloc(sa, ptr, sz, osz) \
+#define ma_realloc(sa, ptr, sz, osz) \
({ \
allocator *_sa = (sa); \
void *_ptr = (ptr); \
size_t _sz = (sz); \
size_t _osz = (osz); \
- void *_res = sa_realloc(_sa, _ptr, _sz, _osz); \
+ void *_res = ma_realloc(_sa, _ptr, _sz, _osz); \
TRC_DEBUG(ALLOC, \
- "sa_realloc(%p,%p,%zu,%zu) -> %p\n", \
+ "ma_realloc(%p,%p,%zu,%zu) -> %p\n", \
_sa, _ptr, _sz, _osz, _res); \
_res; \
})
-#define sa_strdup(sa, s) \
+#define ma_strdup(sa, s) \
({ \
allocator *_sa = (sa); \
const char *_s = (s); \
- char *_res = sa_strdup(_sa, _s); \
+ char *_res = ma_strdup(_sa, _s); \
TRC_DEBUG(ALLOC, \
- "sa_strdup(%p,len=%zu) -> %p\n", \
+ "ma_strdup(%p,len=%zu) -> %p\n", \
_sa, strlen(_s), _res); \
_res; \
})
-#define sa_strndup(sa, s, l) \
+#define ma_strndup(sa, s, l) \
({ \
allocator *_sa = (sa); \
const char *_s = (s); \
size_t _l = (l); \
- char *_res = sa_strndup(_sa, _s, _l); \
+ char *_res = ma_strndup(_sa, _s, _l); \
TRC_DEBUG(ALLOC, \
- "sa_strndup(%p,len=%zu) -> %p\n", \
+ "ma_strndup(%p,len=%zu) -> %p\n", \
_sa, _l, _res); \
_res; \
})
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -3703,7 +3703,7 @@ BATmin_skipnil(allocator *alloc, BAT *b,
}
if (aggr == NULL) {
s = ATOMlen(bi.type, res);
- aggr = alloc? sa_alloc(alloc, s) : GDKmalloc(s);
+ aggr = alloc? ma_alloc(alloc, s) : GDKmalloc(s);
} else {
s = ATOMsize(ATOMtype(bi.type));
}
@@ -3834,7 +3834,7 @@ BATmax_skipnil(allocator *alloc, BAT *b,
}
if (aggr == NULL) {
s = ATOMlen(bi.type, res);
- aggr = alloc? sa_alloc(alloc, s) : GDKmalloc(s);
+ aggr = alloc? ma_alloc(alloc, s) : GDKmalloc(s);
} else {
s = ATOMsize(ATOMtype(bi.type));
}
diff --git a/gdk/gdk_string.c b/gdk/gdk_string.c
--- a/gdk/gdk_string.c
+++ b/gdk/gdk_string.c
@@ -881,7 +881,7 @@ concat_strings(allocator *ma, BAT **bnp,
if (nils == 0 && !empty) {
char *single_str = NULL;
- if ((single_str = sa_alloc(ma, single_length + 1)) ==
NULL) {
+ if ((single_str = ma_alloc(ma, single_length + 1)) ==
NULL) {
bat_iterator_end(&bi);
bat_iterator_end(&bis);
BBPreclaim(bn);
@@ -959,8 +959,8 @@ concat_strings(allocator *ma, BAT **bnp,
} else {
/* first used to calculated the total length of
* each group, then the the total offset */
- lengths = sa_zalloc(ma, ngrp * sizeof(*lengths));
- astrings = sa_alloc(ma, ngrp * sizeof(str));
+ lengths = ma_zalloc(ma, ngrp * sizeof(*lengths));
+ astrings = ma_alloc(ma, ngrp * sizeof(str));
if (lengths == NULL || astrings == NULL) {
goto finish;
}
@@ -1018,7 +1018,7 @@ concat_strings(allocator *ma, BAT **bnp,
if (separator) {
for (i = 0; i < ngrp; i++) {
if (astrings[i] == NULL) {
- if ((astrings[i] = sa_alloc(ma,
lengths[i] + 1)) == NULL) {
+ if ((astrings[i] = ma_alloc(ma,
lengths[i] + 1)) == NULL) {
goto finish;
}
astrings[i][0] = 0;
@@ -1030,7 +1030,7 @@ concat_strings(allocator *ma, BAT **bnp,
assert(sep != NULL);
for (i = 0; i < ngrp; i++) {
if (astrings[i] == NULL) {
- if ((astrings[i] = sa_alloc(ma,
lengths[i] + 1)) == NULL) {
+ if ((astrings[i] = ma_alloc(ma,
lengths[i] + 1)) == NULL) {
goto finish;
}
astrings[i][0] = 0;
@@ -1141,7 +1141,7 @@ BATstr_group_concat(allocator *ma, ValPt
if (sep && BATcount(sep) == 1) { /* Only one element in sep */
BATiter bi = bat_iterator(sep);
- nseparator = sa_strdup(ma, BUNtvar(bi, 0));
+ nseparator = ma_strdup(ma, BUNtvar(bi, 0));
bat_iterator_end(&bi);
if (!nseparator)
return GDK_FAIL;
@@ -1192,7 +1192,7 @@ BATgroupstr_group_concat(allocator *ma,
if (sep && BATcount(sep) == 1) { /* Only one element in sep */
BATiter bi = bat_iterator(sep);
- nseparator = sa_strdup(ma, BUNtvar(bi, 0));
+ nseparator = ma_strdup(ma, BUNtvar(bi, 0));
bat_iterator_end(&bi);
if (!nseparator)
return NULL;
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -377,7 +377,7 @@ rm_mtthread(struct mtthread *t)
*pt = t->next;
free(t);
thread_unlock();
- sa_destroy(ta);
+ ma_destroy(ta);
}
bool
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -2399,7 +2399,7 @@ static inline void
/*
* Reset allocator to initial state
*/
-allocator *sa_reset(allocator *sa)
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
