Changeset: 8639d0e15dd2 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/8639d0e15dd2 Modified Files: clients/Tests/exports.stable.out Branch: resource_management Log Message:
approved output diffs (truncated from 676 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 @@ -144,7 +144,7 @@ BAT *BATgroupquantile(BAT *b, BAT *g, BA BAT *BATgroupquantile_avg(BAT *b, BAT *g, BAT *e, BAT *s, int tp, double quantile, bool skip_nils); BAT *BATgroupstdev_population(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); BAT *BATgroupstdev_sample(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); -BAT *BATgroupstr_group_concat(BAT *b, BAT *g, BAT *e, BAT *s, BAT *sep, bool skip_nils, const char *restrict separator); +BAT *BATgroupstr_group_concat(allocator *alloc, BAT *b, BAT *g, BAT *e, BAT *s, BAT *sep, bool skip_nils, const char *restrict separator); BAT *BATgroupsum(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); BAT *BATgroupvariance_population(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); BAT *BATgroupvariance_sample(BAT *b, BAT *g, BAT *e, BAT *s, int tp, bool skip_nils); @@ -161,10 +161,10 @@ gdk_return BATleftjoin(BAT **r1p, BAT ** gdk_return BATmarkjoin(BAT **r1p, BAT **r2p, BAT **r3p, BAT *l, BAT *r, BAT *sl, BAT *sr, BUN estimate) __attribute__((__access__(write_only, 1))) __attribute__((__access__(write_only, 2))) __attribute__((__access__(write_only, 3))) __attribute__((__warn_unused_result__)); BAT *BATmaskedcands(oid hseq, BUN nr, BAT *masked, bool selected); void *BATmax(BAT *b, void *aggr); -void *BATmax_skipnil(BAT *b, void *aggr, bit skipnil); +void *BATmax_skipnil(allocator *alloc, BAT *b, void *aggr, bit skipnil); BAT *BATmergecand(BAT *a, BAT *b); void *BATmin(BAT *b, void *aggr); -void *BATmin_skipnil(BAT *b, void *aggr, bit skipnil); +void *BATmin_skipnil(allocator *alloc, BAT *b, void *aggr, bit skipnil); gdk_return BATmode(BAT *b, bool transient); BAT *BATnegcands(oid tseq, BUN nr, BAT *odels); BAT *BATnil_grp(BAT *l, BAT *g, BAT *e, BAT *s); @@ -197,7 +197,7 @@ ValPtr BATsetprop_nolock(BAT *b, enum pr gdk_return BATsetstrimps(BAT *b); BAT *BATslice(BAT *b, BUN low, BUN high); gdk_return BATsort(BAT **sorted, BAT **order, BAT **groups, BAT *b, BAT *o, BAT *g, bool reverse, bool nilslast, bool stable) __attribute__((__access__(write_only, 1))) __attribute__((__access__(write_only, 2))) __attribute__((__access__(write_only, 3))) __attribute__((__warn_unused_result__)); -gdk_return BATstr_group_concat(ValPtr res, BAT *b, BAT *s, BAT *sep, bool skip_nils, bool nil_if_empty, const char *restrict separator); +gdk_return BATstr_group_concat(allocator *alloc, ValPtr res, BAT *b, BAT *s, BAT *sep, bool skip_nils, bool nil_if_empty, const char *restrict separator); gdk_return BATsubcross(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr, bool max_one) __attribute__((__access__(write_only, 1))) __attribute__((__access__(write_only, 2))) __attribute__((__warn_unused_result__)); BAT *BATsubexist(BAT *l, BAT *g, BAT *e, BAT *s); BAT *BATsubnot_exist(BAT *l, BAT *g, BAT *e, BAT *s); @@ -348,6 +348,7 @@ gdk_return GDKtracer_set_tracefile(const gdk_return GDKtracer_stop(void); gdk_return GDKupgradevarheap(BAT *b, var_t v, BUN cap, BUN ncopy) __attribute__((__warn_unused_result__)); lng GDKusec(void); +void GDKusr1triggerCB(void (*func)(void)); const char *GDKversion(void) __attribute__((__const__)); size_t GDKvm_cursize(void); void *GDKzalloc(size_t size) __attribute__((__malloc__)) __attribute__((__malloc__(GDKfree, 1))) __attribute__((__alloc_size__(1))) __attribute__((__warn_unused_result__)); @@ -381,6 +382,7 @@ void MT_sleep_ms(unsigned int ms); void MT_thread_deregister(void); QryCtx *MT_thread_get_qry_ctx(void); const char *MT_thread_getalgorithm(void); +allocator *MT_thread_getallocator(void); void *MT_thread_getdata(void); const char *MT_thread_getname(void); bool MT_thread_init(void); @@ -388,6 +390,7 @@ gdk_return MT_thread_init_add_callback(v bool MT_thread_register(void); void MT_thread_set_qry_ctx(QryCtx *ctx); void MT_thread_setalgorithm(const char *algo); +void MT_thread_setallocator(allocator *allocator); void MT_thread_setdata(void *data); void MT_thread_setlockwait(MT_Lock *lock); void MT_thread_setsemawait(MT_Sema *sema); @@ -415,7 +418,7 @@ bool THRhighwater(void); gdk_return TMsubcommit_list(bat *restrict subcommit, BUN *restrict sizes, int cnt, lng logno) __attribute__((__warn_unused_result__)); void VALclear(ValPtr v); int VALcmp(const ValRecord *p, const ValRecord *q); -void *VALconvert(int typ, ValPtr t); +void *VALconvert(allocator *ma, int typ, ValPtr t); ValPtr VALcopy(allocator *va, ValPtr dst, const ValRecord *src) __attribute__((__access__(write_only, 1))); void VALempty(ValPtr v) __attribute__((__access__(write_only, 1))); char *VALformat(const ValRecord *res) __attribute__((__warn_unused_result__)); @@ -450,13 +453,15 @@ gdk_return VARcalcrsh(ValPtr ret, const gdk_return VARcalcsign(ValPtr ret, const ValRecord *v); gdk_return VARcalcsub(ValPtr ret, const ValRecord *lft, const ValRecord *rgt); gdk_return VARcalcxor(ValPtr ret, const ValRecord *lft, const ValRecord *rgt); -gdk_return VARconvert(ValPtr ret, const ValRecord *v, uint8_t scale1, uint8_t scale2, uint8_t precision); +gdk_return VARconvert(allocator *ma, ValPtr ret, const ValRecord *v, uint8_t scale1, uint8_t scale2, uint8_t precision); void VIEWbounds(BAT *b, BAT *view, BUN l, BUN h); BAT *VIEWcreate(oid seq, BAT *b, BUN l, BUN h); size_t _MT_npages; size_t _MT_pagesize; const union _dbl_nil_t _dbl_nil_; const union _flt_nil_t _flt_nil_; +allocator *allocator_get_parent(const allocator *alloc); +bool allocator_tmp_active(const allocator *alloc); char *asctime_r(const struct tm *restrict, char *restrict); ssize_t bitFromStr(const char *src, size_t *len, bit **dst, bool external); ssize_t bitToStr(str *dst, size_t *len, const bit *src, bool external); @@ -478,7 +483,7 @@ BAT *canditer_slice(const struct candite BAT *canditer_slice2(const struct canditer *ci, BUN lo1, BUN hi1, BUN lo2, BUN hi2); BAT *canditer_slice2val(const struct canditer *ci, oid lo1, oid hi1, oid lo2, oid hi2); BAT *canditer_sliceval(const struct canditer *ci, oid lo, oid hi); -allocator *create_allocator(allocator *pa); +allocator *create_allocator(allocator *pa, bool use_lock); char *ctime_r(const time_t *restrict, char *restrict); date date_add_day(date dt, int days) __attribute__((__const__)); date date_add_month(date dt, int months) __attribute__((__const__)); @@ -572,8 +577,8 @@ const ptr ptr_nil; void *sa_alloc(allocator *sa, size_t sz); void sa_close(allocator *sa); void sa_destroy(allocator *sa); +void sa_free(allocator *sa, void *); exception_buffer *sa_get_eb(allocator *sa) __attribute__((__pure__)); -void sa_free(allocator *sa, void *); void sa_open(allocator *sa); void *sa_realloc(allocator *sa, void *ptr, size_t sz, size_t osz); allocator *sa_reset(allocator *sa); @@ -763,13 +768,13 @@ str AUTHdecypherValue(str *ret, const ch str AUTHrequireAdmin(Client c); str AUTHunlockVault(const char *password); str AUTHverifyPassword(const char *passwd); -str BKCmirror(bat *ret, const bat *bid); +str BKCmirror(Client ctx, bat *ret, const bat *bid); str BKCnewBAT(bat *res, const int *tt, const BUN *cap, role_t role); str CLTshutdown(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str COPYrejects(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str COPYrejects_clear(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str GRPgroup1(bat *ngid, bat *next, bat *nhis, const bat *bid); -str GRPsubgroup5(bat *ngid, bat *next, bat *nhis, const bat *bid, const bat *sid, const bat *gid, const bat *eid, const bat *hid); +str GRPgroup1(Client ctx, bat *ngid, bat *next, bat *nhis, const bat *bid); +str GRPsubgroup5(Client ctx, bat *ngid, bat *next, bat *nhis, const bat *bid, const bat *sid, const bat *gid, const bat *eid, const bat *hid); int MAL_MAXCLIENTS; int MALcommentsOnly(MalBlkPtr mb); lng MALdebug; @@ -801,9 +806,9 @@ str QLOGcatalog(BAT **r); str QLOGdisable(void *ret); str QLOGempty(void *ret); str QLOGenable(void *ret); -str QLOGenableThreshold(void *ret, const int *threshold); +str QLOGenableThreshold(Client ctx, void *ret, const int *threshold); int QLOGisset(void); -str RMTdisconnect(void *ret, const char *const *conn); +str RMTdisconnect(Client cntxt, void *ret, const char *const *conn); BUN SQLload_file(Client cntxt, Tablet *as, bstream *b, stream *out, const char *csep, const char *rsep, char quote, lng skip, lng maxrow, int best, bool from_stdin, const char *tabnam, bool escape); str TABLETcollect(BAT **bats, Tablet *as); str TABLETcreate_bats(Tablet *as, BUN est); @@ -865,6 +870,7 @@ int chkInstruction(Module s, MalBlkPtr m str chkProgram(Module s, MalBlkPtr mb); str chkTypes(Module s, MalBlkPtr mb, int silent); const char claimRef[]; +void clearStack(MalStkPtr s); void clearTrace(Client cntxt); void clearVariable(MalBlkPtr mb, int varid); const char clear_tableRef[]; @@ -876,10 +882,10 @@ const char columnBindRef[]; const char comment_onRef[]; str compileString(Symbol *fcn, Client c, str s); const char compressRef[]; -char *concatErrors(char *err1, const char *err2) __attribute__((__nonnull__(1, 2))) __attribute__((__returns_nonnull__)); +char *concatErrors(allocator *ma, char *err1, const char *err2) __attribute__((__nonnull__(1, 2))) __attribute__((__returns_nonnull__)); const char connectRef[]; const char containsRef[]; -str convertConstant(malType type, ValPtr vr); +str convertConstant(allocator *ma, malType type, ValPtr vr); InstrPtr copyInstruction(MalBlkPtr mb, const InstrRecord *p); InstrPtr copyInstructionArgs(MalBlkPtr mb, const InstrRecord *p, int args); MalBlkPtr copyMalBlk(MalBlkPtr mb); @@ -981,7 +987,7 @@ int getBteConstant(MalBlkPtr mb, bte val int getDblConstant(MalBlkPtr mb, dbl val); str getExceptionMessage(const char *); str getExceptionMessageAndState(const char *); -str getExceptionPlace(const char *); +str getExceptionPlace(allocator *ma, const char *); enum malexception getExceptionType(const char *); int getFltConstant(MalBlkPtr mb, flt val); Scenario getFreeScenario(void); @@ -995,14 +1001,14 @@ const char *getName(const char *nme); const char *getNameLen(const char *nme, size_t len); int getOidConstant(MalBlkPtr mb, oid val); int getPC(MalBlkPtr mb, InstrPtr p); -str getPipeCatalog(bat *nme, bat *def, bat *stat); +str getPipeCatalog(Client ctx, bat *nme, bat *def, bat *stat); const char getRef[]; str getScenarioLanguage(Client c); int getShtConstant(MalBlkPtr mb, sht val); int getStrConstant(MalBlkPtr mb, str val); const char getTraceRef[]; -str getTypeIdentifier(malType tpe); -str getTypeName(malType tpe); +str getTypeIdentifier(allocator *ma, malType tpe); +str getTypeName(allocator *ma, malType tpe); char *getVarNameIntoBuffer(MalBlkPtr mb, int idx, char *buf) __attribute__((__access__(write_only, 3))); const char getVariableRef[]; Module globalModule(const char *nme); @@ -1108,10 +1114,10 @@ InstrPtr newFcnCall(MalBlkPtr mb, const InstrPtr newFcnCallArgs(MalBlkPtr mb, const char *mod, const char *fcn, int args); Symbol newFunction(const char *mod, const char *nme, int kind); Symbol newFunctionArgs(const char *mod, const char *nme, int kind, int args); -MalStkPtr newGlobalStack(int size); +MalStkPtr newGlobalStack(allocator *ma, int size); InstrPtr newInstruction(MalBlkPtr mb, const char *modnme, const char *fcnnme); InstrPtr newInstructionArgs(MalBlkPtr mb, const char *modnme, const char *fcnnme, int args); -MalBlkPtr newMalBlk(int elements); +MalBlkPtr newMalBlk(int elements, allocator *pa); int newMalBlkStmt(MalBlkPtr mb, int elements); InstrPtr newRaiseStmt(MalBlkPtr mb, const char *nme); const char newRef[]; @@ -1142,7 +1148,7 @@ const char passRef[]; const char percent_rankRef[]; const char plusRef[]; const char predicateRef[]; -MalStkPtr prepareMALstack(MalBlkPtr mb, int size); +MalStkPtr prepareMALstack(allocator *pa, MalBlkPtr mb, int size); void printFunction(stream *fd, MalBlkPtr mb, MalStkPtr stk, int flg); void printInstruction(stream *fd, MalBlkPtr mb, MalStkPtr stk, InstrPtr p, int flg); const char printRef[]; @@ -1187,7 +1193,7 @@ const char raiseRef[]; const char rangejoinRef[]; const char rankRef[]; const char rapiRef[]; -MalStkPtr reallocGlobalStack(MalStkPtr s, int cnt); +MalStkPtr reallocGlobalStack(allocator *alloc, MalStkPtr s, int cnt); const char reconnectRef[]; str reenterMAL(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr stk); const char registerRef[]; @@ -1215,7 +1221,7 @@ const char rpcRef[]; const char rsColumnRef[]; const char rtreeRef[]; str runMAL(Client c, MalBlkPtr mb, MalBlkPtr mbcaller, MalStkPtr env); -str runMALsequence(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr stk, MalStkPtr env, InstrPtr pcicaller); +str runMALsequence(allocator *alloc, Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr stk, MalStkPtr env, InstrPtr pcicaller); oid runtimeProfileSetTag(Client cntxt); const char sampleRef[]; const char selectNotNilRef[]; @@ -1380,12 +1386,12 @@ str FITSdir(Client cntxt, MalBlkPtr mb, str FITSdirpat(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str FITSexportTable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str FITSloadTable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str FITStest(int *res, str *fname); +str FITStest(Client ctx, int *res, str *fname); bit IsStandardBATType(int type); str NCDFattach(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str NCDFimportVarStmt(str *sciqlstmt, str *fname, int *varid); +str NCDFimportVarStmt(Client ctx, str *sciqlstmt, str *fname, int *varid); str NCDFimportVariable(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -str NCDFtest(int *vars, str *fname); +str NCDFtest(Client ctx, int *vars, str *fname); str PYAPI3PyAPIevalAggr(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str PYAPI3PyAPIevalAggrMap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str PYAPI3PyAPIevalLoader(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); @@ -1428,138 +1434,138 @@ str SQLinitClientFromMAL(Client c, const str SQLresetClient(Client c); str SQLstatementIntern(Client c, const char *expr, const char *nme, bit execute, bit output, res_table **result); str SQLtrans(mvc *m); -char *UDFBATfuse(bat *ret, const bat *one, const bat *two); -str UDFBATreverse(bat *ret, const bat *arg); -char *UDFfuse_bte_sht(sht *ret, const bte *one, const bte *two); -char *UDFfuse_int_lng(lng *ret, const int *one, const int *two); -char *UDFfuse_lng_hge(hge *ret, const lng *one, const lng *two); -char *UDFfuse_sht_int(int *ret, const sht *one, const sht *two); -str UDFreverse(str *ret, const str *arg); +char *UDFBATfuse(Client ctx, bat *ret, const bat *one, const bat *two); +str UDFBATreverse(Client ctx, bat *ret, const bat *arg); +char *UDFfuse_bte_sht(Client ctx, sht *ret, const bte *one, const bte *two); +char *UDFfuse_int_lng(Client ctx, lng *ret, const int *one, const int *two); +char *UDFfuse_lng_hge(Client ctx, hge *ret, const lng *one, const lng *two); +char *UDFfuse_sht_int(Client ctx, int *ret, const sht *one, const sht *two); +str UDFreverse(Client ctx, str *ret, const str *arg); str append_to_table_from_emit(Client cntxt, char *sname, char *tname, sql_emit_col *columns, size_t ncols); -str batbte_dec2_bte(bat *res, const int *s1, const bat *v, const bat *sid); -str batbte_dec2_dbl(bat *res, const int *s1, const bat *v, const bat *sid); -str batbte_dec2_flt(bat *res, const int *s1, const bat *v, const bat *sid); -str batbte_dec2_int(bat *res, const int *s1, const bat *v, const bat *sid); -str batbte_dec2_lng(bat *res, const int *s1, const bat *v, const bat *sid); -str batbte_dec2_sht(bat *res, const int *s1, const bat *v, const bat *sid); -str batbte_dec2dec_bte(bat *res, const int *S1, const bat *v, const bat *sid, const int *d2, const int *S2); -str batbte_dec2dec_dbl(bat *res, const int *S1, const bat *v, const bat *sid, const int *d2, const int *S2); -str batbte_dec2dec_flt(bat *res, const int *S1, const bat *v, const bat *sid, const int *d2, const int *S2); -str batbte_dec2dec_int(bat *res, const int *S1, const bat *v, const bat *sid, const int *d2, const int *S2); -str batbte_dec2dec_lng(bat *res, const int *S1, const bat *v, const bat *sid, const int *d2, const int *S2); -str batbte_dec2dec_sht(bat *res, const int *S1, const bat *v, const bat *sid, const int *d2, const int *S2); -str batbte_num2dec_bte(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str batbte_num2dec_dbl(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str batbte_num2dec_flt(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str batbte_num2dec_int(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str batbte_num2dec_lng(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str batbte_num2dec_sht(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str batdbl_num2dec_bte(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str batdbl_num2dec_int(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str batdbl_num2dec_lng(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str batdbl_num2dec_sht(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str batflt_num2dec_bte(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str batflt_num2dec_int(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str batflt_num2dec_lng(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str batflt_num2dec_sht(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str bathge_dec2_bte(bat *res, const int *s1, const bat *v, const bat *sid); -str bathge_dec2_dbl(bat *res, const int *s1, const bat *v, const bat *sid); -str bathge_dec2_flt(bat *res, const int *s1, const bat *v, const bat *sid); -str bathge_dec2_int(bat *res, const int *s1, const bat *v, const bat *sid); -str bathge_dec2_lng(bat *res, const int *s1, const bat *v, const bat *sid); -str bathge_dec2_sht(bat *res, const int *s1, const bat *v, const bat *sid); -str bathge_dec2dec_bte(bat *res, const int *S1, const bat *v, const bat *sid, const int *d2, const int *S2); -str bathge_dec2dec_dbl(bat *res, const int *S1, const bat *v, const bat *sid, const int *d2, const int *S2); -str bathge_dec2dec_flt(bat *res, const int *S1, const bat *v, const bat *sid, const int *d2, const int *S2); -str bathge_dec2dec_int(bat *res, const int *S1, const bat *v, const bat *sid, const int *d2, const int *S2); -str bathge_dec2dec_lng(bat *res, const int *S1, const bat *v, const bat *sid, const int *d2, const int *S2); -str bathge_dec2dec_sht(bat *res, const int *S1, const bat *v, const bat *sid, const int *d2, const int *S2); -str bathge_num2dec_bte(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str bathge_num2dec_dbl(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str bathge_num2dec_flt(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str bathge_num2dec_int(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str bathge_num2dec_lng(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str bathge_num2dec_sht(bat *res, const bat *v, const bat *sid, const int *d2, const int *s2); -str batint_dec2_bte(bat *res, const int *s1, const bat *v, const bat *sid); _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
