Changeset: 991350ce8f6a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=991350ce8f6a Modified Files: clients/Tests/exports.stable.out monetdb5/mal/mal.c monetdb5/mal/mal.h monetdb5/mal/mal_atom.c monetdb5/mal/mal_atom.h monetdb5/mal/mal_authorize.c monetdb5/mal/mal_authorize.h monetdb5/mal/mal_box.c monetdb5/mal/mal_box.h monetdb5/mal/mal_builder.c monetdb5/mal/mal_builder.h monetdb5/mal/mal_client.c monetdb5/mal/mal_client.h monetdb5/mal/mal_debugger.c monetdb5/mal/mal_debugger.h monetdb5/mal/mal_exception.c monetdb5/mal/mal_exception.h monetdb5/mal/mal_factory.c monetdb5/mal/mal_factory.h monetdb5/mal/mal_function.c monetdb5/mal/mal_function.h monetdb5/mal/mal_http_daemon.c monetdb5/mal/mal_http_daemon.h monetdb5/mal/mal_import.c monetdb5/mal/mal_import.h monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_namespace.c monetdb5/mal/mal_parser.c monetdb5/mal/mal_private.h monetdb5/mal/mal_resolve.c monetdb5/mal/mal_resource.c monetdb5/mal/mal_resource.h monetdb5/modules/kernel/group.c Branch: default Log Message:
Cleanup: don't export if not needed. A whole bunch of functions in monetdb5/mal were exported but never even used outside of that directory. They don't need to be exported. Some can even be static, and a few could be deleted since they weren't called anywhere at all. diffs (truncated from 1101 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 @@ -881,7 +881,6 @@ str AUTHgetUsers(BAT **ret, Client *c); str AUTHinitTables(void); str AUTHremoveUser(Client *c, str *username); str AUTHrequireAdmin(Client *c); -str AUTHrequireAdminOrUser(Client *c, str *username); str AUTHresolveUser(str *ret, oid *uid); str AUTHsetPassword(Client *c, str *username, str *passwd); str AUTHunlockVault(str *password); @@ -1563,22 +1562,15 @@ str MBMrandom_seed(int *ret, oid *base, str MBMskewed(int *ret, oid *base, wrd *size, int *domain, int *skew); str MBMuniform(int *ret, oid *base, wrd *size, int *domain); str MCawakeClient(int id); -void MCcleanupClients(void); void MCcloseClient(Client c); -int MCcountClients(void); int MCdefault; -Client MCforkClient(Client c); Client MCgetClient(int id); void MCinit(void); Client MCinitClient(oid user, bstream *fin, stream *fout); Client MCinitClientRecord(Client c, oid user, bstream *fin, stream *fout); int MCinitClientThread(Client c); -void MCpopClientInput(Client c); int MCpushClientInput(Client c, bstream *new_input, int listing, char *prompt); -int MCreadClient(Client c); str MCsuspendClient(int id); -void MCtraceAllClients(int flag); -void MCtraceClient(oid which, int flag); str MDBStkDepth(Client cntxt, MalBlkPtr mb, MalStkPtr s, InstrPtr p); str MDBStkTrace(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p); int MDBdelay; @@ -2395,7 +2387,6 @@ str bstream_destroy_wrapwrap(int *ret, B int bstream_read_wrap(int *res, Bstream *BS, int *size); str bstream_read_wrapwrap(int *res, Bstream *BS, int *size); str calcRef; -str callFactory(Client cntxt, MalBlkPtr mb, ValPtr argv[], char flag); str callMAL(Client cntxt, MalBlkPtr mb, MalStkPtr *glb, ValPtr argv[], char debug); int callString(Client c, str s, int listing); int canBeCrackedProp; @@ -2414,7 +2405,6 @@ void clearStack(MalStkPtr s); void clearTrace(void); void clearVariable(MalBlkPtr mb, int varid); str clear_tableRef; -Symbol cloneFunction(stream *out, Module scope, Symbol proc, MalBlkPtr mb, InstrPtr p); int cloneVariable(MalBlkPtr dst, MalBlkPtr src, int varid); int closeBox(str name, int flag); str closeProfilerStream(void); @@ -2448,7 +2438,6 @@ str count_no_nilRef; int cpyConstant(MalBlkPtr mb, VarPtr vr); str createException(enum malexception, const char *, _In_z_ _Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__, 3, 4))); str createRef; -str createScriptException(MalBlkPtr, int, enum malexception, const char *, _In_z_ _Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__, 5, 6))); str crossRef; int cstToken(Client cntxt, ValPtr val); str datacellRef; @@ -2503,13 +2492,11 @@ str eqRef; str escape_str(str *retval, str s); str evalFile(Client c, str fname, int listing); str evalRef; -str exceptionToString(enum malexception); str execRef; void expandMacro(MalBlkPtr mb, InstrPtr p, MalBlkPtr mc); void expandMalBlk(MalBlkPtr mb, int lines); str expandRef; str exportOperationRef; -int factoryHasFreeSpace(void); int fcnBinder(stream *out, Module scope, MalBlkPtr mb, InstrPtr p); str fcnDefinition(MalBlkPtr mb, InstrPtr p, str s, int flg, str base, size_t len); int fileProp; @@ -2523,7 +2510,6 @@ Symbol findSymbolInModule(Module v, str int findTmpVariable(MalBlkPtr mb, int type); int findVariable(MalBlkPtr mb, str name); int findVariableLength(MalBlkPtr mb, str name, int len); -str finishFactory(Client cntxt, MalBlkPtr mb, InstrPtr pp, int pc); void finishNamespace(void); str finishRef; Module fixModule(Module scope, str nme); @@ -2545,10 +2531,8 @@ void garbageElement(Client cntxt, ValPtr MALfcn getAddress(stream *out, str filename, str modnme, str fcnname, int silent); str getArgDefault(MalBlkPtr mb, InstrPtr p, int idx); ptr getArgReference(MalStkPtr stk, InstrPtr pci, int k); -int getBarrierEnvelop(MalBlkPtr mb); int getBlockBegin(MalBlkPtr mb, int pc); int getBlockExit(MalBlkPtr mb, int pc); -str getBoxName(Box box, lng i); str getBoxNames(int *bid); char *getConsoleInput(Client c, const char *prompt, int linemode, int exit_on_error); lng getDiskReads(void); @@ -2613,7 +2597,6 @@ void initNamespace(void); void initParser(void); void initProfiler(MalBlkPtr mb); int initQlog(void); -void initResource(void); int inlineMALblock(MalBlkPtr mb, int pc, MalBlkPtr mc); int inlineProp; str inplaceRef; @@ -2684,9 +2667,7 @@ str likeRef; str likeselectRef; str likesubselectRef; str likeuselectRef; -void listFunction(stream *fd, MalBlkPtr mb, MalStkPtr stk, int flg, int first, int step); str listRef; -void loadBox(str nme); str loadLibrary(str modulename, int flag); str lockRef; int lockToStr(char **dst, int *len, ptr *src); @@ -2710,16 +2691,9 @@ int logger_restart_wrap(logger *L); str lookupRef; str mal2str(MalBlkPtr mb, int flg, int first, int last); malType malAnyBatType(malType t1, malType t2); -int malAtomArray(int tpe, int idx); -void malAtomDefinition(stream *out, str name, int tpe); -int malAtomFixed(int size, int align, char *name); -int malAtomProperty(MalBlkPtr mb, InstrPtr pci); int malAtomSize(int size, int align, char *name); int malBootstrap(void); str malCommandCall(MalStkPtr stk, InstrPtr pci); -void malGarbageCollector(MalBlkPtr mb); -str malInclude(Client c, str name, int listing); -str malLoadScript(Client c, str name, bstream **fdin); int malProfileMode; str malRef; ClientRec *mal_clients; @@ -2728,8 +2702,6 @@ MT_Lock mal_copyLock; MT_Lock mal_delayLock; void mal_exit(void); int mal_init(void); -MT_Lock mal_namespaceLock; -MT_Sema mal_parallelism; MT_Lock mal_profileLock; str mal_quote(const char *msg, size_t size); MT_Lock mal_remoteLock; @@ -2743,19 +2715,12 @@ str matRef; str materializeRef; str maxRef; str max_no_nilRef; -void mdbClrBreakRequest(Client cntxt, str name); -void mdbCommand(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p, int pc); void mdbDump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str mdbGrab(Client cntxt, MalBlkPtr mb1, MalStkPtr stk1, InstrPtr pc1); -void mdbHelp(stream *f); -void mdbInit(void); str mdbRef; int mdbSession(void); void mdbSetBreakRequest(Client cntxt, MalBlkPtr mb, str request, char cmd); -void mdbSetBreakpoint(Client cntxt, MalBlkPtr mb, int pc, char cmd); int mdbSetTrap(Client cntxt, str modnme, str fcnnme, int flag); -void mdbShowBreakpoints(Client cntxt); -void mdbStep(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int pc); str mdbTrap(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int pc); str mdbTrapClient(Client cntxt, MalBlkPtr mb1, MalStkPtr stk1, InstrPtr pc1); int memoryclaims; @@ -2793,7 +2758,6 @@ int mnstr_write_string(Stream *S, str da str mnstr_write_stringwrap(int *ret, Stream *S, str *data); char monet_cwd[PATHLENGTH]; size_t monet_memory; -int moreClients(int reruns); void moveInstruction(MalBlkPtr mb, int pc, int target); str mtimeRef; str mulRef; @@ -2801,8 +2765,6 @@ str multicolumnsRef; str multiplexRef; str mvcRef; InstrPtr newAssignment(MalBlkPtr mb); -InstrPtr newAssignmentId(MalBlkPtr mb, str nme); -InstrPtr newCall(Module scope, str fcnname, int kind); InstrPtr newCatchStmt(MalBlkPtr mb, str nme); InstrPtr newComment(MalBlkPtr mb, const char *val); InstrPtr newExitStmt(MalBlkPtr mb, str nme); @@ -2821,7 +2783,6 @@ InstrPtr newReturnStmt(MalBlkPtr mb); InstrPtr newStmt(MalBlkPtr mb, char *module, char *name); InstrPtr newStmt1(MalBlkPtr mb, str module, char *name); InstrPtr newStmt2(MalBlkPtr mb, str module, char *name); -InstrPtr newStmtId(MalBlkPtr mb, char *id, char *module, char *name); Symbol newSymbol(str nme, int kind); str newTmpName(char tag, int i); int newTmpSink(MalBlkPtr mb, malType type); @@ -2849,7 +2810,6 @@ str operatorName(int i); lng optDebug; str optimizeMALBlock(Client cntxt, MalBlkPtr mb); str optimizerCheck(Client cntxt, MalBlkPtr mb, str name, int actions, lng usec, int flag); -void optimizerDebug(Client cntxt, MalBlkPtr mb, str name, int actions, lng usec); void optimizerInit(void); str optimizerRef; str optimizer_prelude(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr p); @@ -2880,17 +2840,11 @@ str pqueueRef; str preludeRef; MalStkPtr prepareMALstack(MalBlkPtr mb, int size); void prepareMalBlk(MalBlkPtr mb, str s); -void printBATelm(stream *f, int i, BUN cnt, BUN first); -void printBBPinfo(stream *out); -void printBatDetails(stream *f, int bid); -void printBatInfo(stream *f, VarPtr n, ValPtr v); -void printBatProperties(stream *f, VarPtr n, ValPtr v, str props); void printFunction(stream *fd, MalBlkPtr mb, MalStkPtr stk, int flg); void printInstruction(stream *fd, MalBlkPtr mb, MalStkPtr stk, InstrPtr p, int flg); str printRef; void printSignature(stream *fd, Symbol s, int flg); void printStack(stream *f, MalBlkPtr mb, MalStkPtr s); -void printTraceCall(stream *out, MalBlkPtr mb, MalStkPtr stk, int pc, int flags); str prodRef; int profilerAvailable(void); void profilerEvent(int idx, MalBlkPtr mb, MalStkPtr stk, int pc, int start); @@ -2966,7 +2920,6 @@ str rpcRef; str rsColumnRef; int rule_fromstr(const char *buf, int *len, rule **d); int rule_tostr(str *buf, int *len, const rule *r); -str runFactory(Client cntxt, MalBlkPtr mb, MalBlkPtr mbcaller, MalStkPtr stk, InstrPtr pci); str runMAL(Client c, MalBlkPtr mb, MalBlkPtr mbcaller, MalStkPtr env); str runMALDebugger(Client cntxt, Symbol s); str runMALdataflow(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr stk); @@ -2979,7 +2932,6 @@ void runtimeProfileFinish(Client cntxt, void runtimeProfileInit(Client cntxt, MalBlkPtr mb, MalStkPtr stk); str safeguardStack(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); int safetyBarrier(InstrPtr p, InstrPtr q); -int saveBox(Box box, int flag); str schedulerRef; str selectNotNilRef; str selectRef; @@ -3009,7 +2961,6 @@ void setVarName(MalBlkPtr mb, int i, str void setVarType(MalBlkPtr mb, int i, int tpe); str setWriteModeRef; void showAllScenarios(stream *f); -void showAtoms(stream *fd); void showCurrentScenario(void); void showErrors(Client cntxt); void showException(stream *out, enum malexception, const char *, _In_z_ _Printf_format_string_ const char *, ...) __attribute__((__format__(__printf__, 4, 5))); @@ -3043,11 +2994,9 @@ int sqlblob_tostr(str *tostr, int *l, bl int sqlfunctionProp; str srvpoolRef; int stableProp; -void startHttpdaemon(void); str startProfiling(void); str startRef; void stopHeartbeat(void); -void stopHttpdaemon(void); str stopProfiling(void); str stopRef; void strAfterCall(ValPtr v, ValPtr bak); @@ -3144,8 +3093,6 @@ str varGetPropStr(MalBlkPtr mb, int var) void varSetProp(MalBlkPtr mb, int var, int prop, int op, ValPtr cst); str vectorRef; char *xmlChr(str s); -str yieldFactory(MalBlkPtr mb, InstrPtr p, int pc); -int yieldResult(MalBlkPtr mb, InstrPtr p, int pc); str zero_or_oneRef; # stream diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c --- a/monetdb5/mal/mal.c +++ b/monetdb5/mal/mal.c @@ -185,7 +185,6 @@ char *mal_trace; /* enable profile even #include "mal_parser.h" #include "mal_interpreter.h" #include "mal_namespace.h" /* for initNamespace() */ -#include "mal_debugger.h" /* for mdbInit() */ #include "mal_client.h" #include "mal_sabaoth.h" #include "mal_recycle.h" diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h --- a/monetdb5/mal/mal.h +++ b/monetdb5/mal/mal.h @@ -113,17 +113,14 @@ mal_export char *mal_trace; /* enable mal_export MT_Lock mal_contextLock; -mal_export MT_Lock mal_namespaceLock; mal_export MT_Lock mal_remoteLock; mal_export MT_Lock mal_profileLock ; mal_export MT_Lock mal_copyLock ; mal_export MT_Lock mal_delayLock ; -mal_export MT_Sema mal_parallelism; mal_export int mal_init(void); mal_export void mal_exit(void); -mal_export int moreClients(int reruns); /* This should be here, but cannot, as "Client" isn't known, yet ... |-( * For now, we move the prototype declaration to src/mal/mal_client.c, diff --git a/monetdb5/mal/mal_atom.c b/monetdb5/mal/mal_atom.c --- a/monetdb5/mal/mal_atom.c +++ b/monetdb5/mal/mal_atom.c @@ -85,9 +85,11 @@ * They should be implemented with parameter-less functions. */ #include "monetdb_config.h" +#include "mal_instruction.h" #include "mal_atom.h" #include "mal_namespace.h" #include "mal_exception.h" +#include "mal_private.h" #ifndef MAXPATHLEN #define MAXPATHLEN 1024 @@ -275,24 +277,6 @@ void malAtomDefinition(stream *out, str * User defined modules may introduce fixed sized types _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
