Changeset: 340820845f56 for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/340820845f56 Modified Files: clients/Tests/exports.stable.out monetdb5/mal/mal_dataflow.h monetdb5/mal/mal_debugger.c monetdb5/mal/mal_debugger.h monetdb5/mal/mal_factory.h monetdb5/mal/mal_interpreter.c monetdb5/mal/mal_interpreter.h monetdb5/mal/mal_parser.c monetdb5/mal/mal_parser.h monetdb5/mal/mal_resource.h monetdb5/mal/mal_scenario.h monetdb5/mal/mal_session.c monetdb5/mal/mal_session.h monetdb5/mal/mal_utils.h monetdb5/modules/mal/factories.c monetdb5/optimizer/opt_pipes.c monetdb5/optimizer/opt_support.h monetdb5/optimizer/optimizer.c monetdb5/optimizer/optimizer.h sql/backends/monet5/sql_cat.c sql/backends/monet5/sql_gencode.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_statement.c sql/backends/monet5/sql_transaction.c Branch: default Log Message:
Unexport a whole bunch of stuff. All from include files that aren't installed so not available externally anyway. diffs (truncated from 495 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 @@ -736,7 +736,6 @@ str AUTHinitTables(void); str AUTHrequireAdmin(Client c); str AUTHunlockVault(const char *password); str AUTHverifyPassword(const char *passwd); -str BATinfo(BAT **key, BAT **val, const bat bid); str BKCmirror(bat *ret, const bat *bid); str BKCnewBAT(bat *res, const int *tt, const BUN *cap, role_t role); str BKCreuseBAT(bat *ret, const bat *bid, const bat *did); @@ -750,8 +749,6 @@ str COPYrejects_clear(Client cntxt, MalB 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); int MAL_MAXCLIENTS; -int MALadmission_claim(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, lng argclaim); -void MALadmission_release(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, lng argclaim); str MALcallback(Client c, str msg); int MALcommentsOnly(MalBlkPtr mb); lng MALdebug; @@ -887,7 +884,6 @@ const char *crossRef; const char *cume_distRef; const char *dataflowRef; const char *dblRef; -str deblockdataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); void debugFunction(stream *fd, MalBlkPtr mb, MalStkPtr stk, int flg, int first, int size); const char *decompressRef; int defConstant(MalBlkPtr mb, int type, ValPtr cst); @@ -975,7 +971,6 @@ int getIntConstant(MalBlkPtr mb, int val int getLngConstant(MalBlkPtr mb, lng val); MalBlkPtr getMalBlkHistory(MalBlkPtr mb, int idx); MalBlkPtr getMalBlkOptimized(MalBlkPtr mb, const char *name); -lng getMemoryClaim(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, int i, int flag); Module getModule(const char *nme); void getModuleList(Module **out, int *length); BAT *getModules(void); @@ -985,7 +980,6 @@ int getOidConstant(MalBlkPtr mb, oid val int getPC(MalBlkPtr mb, InstrPtr p); str getPipeCatalog(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; @@ -1008,7 +1002,6 @@ const char *identityRef; const char *ifthenelseRef; const char *importColumnRef; void initNamespace(void); -void initParser(void); void insertSymbol(Module scope, Symbol prg); str instruction2str(MalBlkPtr mb, MalStkPtr stl, InstrPtr p, int hidden); const char *intRef; @@ -1056,10 +1049,8 @@ int mal_init(char *modules[], bool embed void mal_instruction_reset(void); void mal_module(const char *name, mel_atom *atoms, mel_func *funcs); void mal_module2(const char *name, mel_atom *atoms, mel_func *funcs, mel_init initfunc, const char *code); -str mal_quote(const char *msg, size_t size); void mal_reset(void); int mal_startup(void); -void mal_unquote(char *msg); const char *mal_version(void); stream *maleventstream; const char *manifoldRef; @@ -1067,9 +1058,7 @@ const char *mapiRef; const char *maskRef; const char *matRef; const char *maxRef; -void mdbDump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); const char *mdbRef; -void mdbSetBreakRequest(Client cntxt, MalBlkPtr mb, str request, char cmd); const char *mergecandRef; const char *mergepackRef; const char *mergetableRef; @@ -1144,7 +1133,6 @@ const char *outerjoinRef; const char *packIncrementRef; const char *packRef; const char *parametersRef; -void parseMAL(Client cntxt, Symbol curPrg, int skipcomments, int lines, MALfcn address); const char *passRef; const char *percent_rankRef; const char *plusRef; @@ -1154,7 +1142,6 @@ void printFunction(stream *fd, MalBlkPtr void printInstruction(stream *fd, MalBlkPtr mb, MalStkPtr stk, InstrPtr p, int flg); const char *printRef; void printSignature(stream *fd, Symbol s, int flg); -void printStack(stream *f, MalBlkPtr mb, MalStkPtr s); const char *prodRef; void profilerEvent(MalEvent *me, NonMalEvent *nme); int profilerMode; @@ -1215,7 +1202,6 @@ const char *renumberRef; const char *replaceRef; void resetMalBlk(MalBlkPtr mb); void resetMalTypes(MalBlkPtr mb, int stop); -void resetScenario(Client c); int resizeMalBlk(MalBlkPtr mb, int elements); int resolveType(int dsttype, int srctype); const char *resultSetRef; @@ -1227,9 +1213,7 @@ const char *rpcRef; const char *rsColumnRef; str runMAL(Client c, MalBlkPtr mb, MalBlkPtr mbcaller, MalStkPtr env); str runMALDebugger(Client cntxt, MalBlkPtr mb); -str runMALdataflow(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr stk); str runMALsequence(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr stk, MalStkPtr env, InstrPtr pcicaller); -str runScenario(Client c, int once); oid runtimeProfileSetTag(Client cntxt); const char *sampleRef; const char *selectNotNilRef; @@ -1242,18 +1226,11 @@ void setArgType(MalBlkPtr mb, InstrPtr p InstrPtr setArgument(MalBlkPtr mb, InstrPtr p, int idx, int varid); void setPolymorphic(InstrPtr p, int tpe, int force); void setReturnArgument(InstrPtr p, int varid); -str setScenario(Client c, str nme); const char *setVariableRef; void setVariableScope(MalBlkPtr mb); void setVariableType(MalBlkPtr mb, const int idx, malType type); const char *set_protocolRef; -void showAllScenarios(stream *f); -void showCurrentScenario(void); void showMalBlkHistory(stream *out, MalBlkPtr mb); -void showScenario(stream *f, Scenario s); -void showScenarioByName(stream *f, str s); -str shutdownFactory(Client cntxt, MalBlkPtr mb); -str shutdownFactoryByName(Client cntxt, Module m, str nme); const char *singleRef; void slash_2_dir_sep(str fname); const char *sliceRef; @@ -1304,7 +1281,6 @@ const char *umaskRef; const char *uniqueRef; const char *unlockRef; const char *updateRef; -void updateScenario(str scen, str nme, MALfcn fcn); Module userModule(void); const char *userRef; const char *window_boundRef; diff --git a/monetdb5/mal/mal_dataflow.h b/monetdb5/mal/mal_dataflow.h --- a/monetdb5/mal/mal_dataflow.h +++ b/monetdb5/mal/mal_dataflow.h @@ -9,10 +9,14 @@ #ifndef _MAL_DATAFLOW_H #define _MAL_DATAFLOW_H +#ifndef LIBMONETDB5 +#error this file should not be included outside its source directory +#endif + #include "mal.h" #include "mal_client.h" -mal_export str runMALdataflow(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr stk); -mal_export str deblockdataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +extern str runMALdataflow(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr stk); +extern str deblockdataflow(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); #endif /* _MAL_DATAFLOW_H*/ diff --git a/monetdb5/mal/mal_debugger.c b/monetdb5/mal/mal_debugger.c --- a/monetdb5/mal/mal_debugger.c +++ b/monetdb5/mal/mal_debugger.c @@ -13,6 +13,7 @@ #include "monetdb_config.h" #include "mal.h" #include "mal_debugger.h" +#include "mal_scenario.h" #include "mal_interpreter.h" /* for getArgReference() */ #include "mal_listing.h" #include "mal_function.h" diff --git a/monetdb5/mal/mal_debugger.h b/monetdb5/mal/mal_debugger.h --- a/monetdb5/mal/mal_debugger.h +++ b/monetdb5/mal/mal_debugger.h @@ -10,16 +10,21 @@ #define _MAL_DEBUGGER_H #include "mal.h" -#include "mal_scenario.h" #include "mal_client.h" +mal_export str runMALDebugger(Client cntxt, MalBlkPtr mb); + +#ifdef LIBMONETDB5 +/* only available in monetdb5 */ + #define MAXBREAKS 32 -mal_export void mdbDump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); -mal_export void printStack(stream *f, MalBlkPtr mb, MalStkPtr s); +extern void mdbDump(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); +extern void printStack(stream *f, MalBlkPtr mb, MalStkPtr s); -mal_export void mdbSetBreakRequest(Client cntxt, MalBlkPtr mb, str request, char cmd); -mal_export str runMALDebugger(Client cntxt, MalBlkPtr mb); -mal_export str BATinfo(BAT **key, BAT **val, const bat bid); +extern void mdbSetBreakRequest(Client cntxt, MalBlkPtr mb, str request, char cmd); +extern str BATinfo(BAT **key, BAT **val, const bat bid); + +#endif #endif /* _MAL_DEBUGGER_h */ diff --git a/monetdb5/mal/mal_factory.h b/monetdb5/mal/mal_factory.h --- a/monetdb5/mal/mal_factory.h +++ b/monetdb5/mal/mal_factory.h @@ -12,6 +12,6 @@ #include "mal.h" #include "mal_client.h" -mal_export str shutdownFactory(Client cntxt, MalBlkPtr mb); -mal_export str shutdownFactoryByName(Client cntxt, Module m,str nme); +extern str shutdownFactory(Client cntxt, MalBlkPtr mb); +extern str shutdownFactoryByName(Client cntxt, Module m,str nme); #endif /* _MAL_FACTORY_H */ diff --git a/monetdb5/mal/mal_interpreter.c b/monetdb5/mal/mal_interpreter.c --- a/monetdb5/mal/mal_interpreter.c +++ b/monetdb5/mal/mal_interpreter.c @@ -20,6 +20,7 @@ #include "mal_private.h" #include "mal_internal.h" #include "mal_function.h" +#include "mal_factory.h" static lng qptimeout = 0; /* how often we print still running queries (usec) */ diff --git a/monetdb5/mal/mal_interpreter.h b/monetdb5/mal/mal_interpreter.h --- a/monetdb5/mal/mal_interpreter.h +++ b/monetdb5/mal/mal_interpreter.h @@ -15,7 +15,6 @@ #define _MAL_INTERPRET_H #include "mal_client.h" -#include "mal_factory.h" #include "mal_profiler.h" /* diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c --- a/monetdb5/mal/mal_parser.c +++ b/monetdb5/mal/mal_parser.c @@ -23,7 +23,7 @@ #include "mal_session.h" #include "mal_private.h" -#define FATALINPUT MAXERRORS+1 +#define FATALINPUT (MAXERRORS+1) #define NL(X) ((X)=='\n' || (X)=='\r') static str idCopy(Client cntxt, int len); diff --git a/monetdb5/mal/mal_parser.h b/monetdb5/mal/mal_parser.h --- a/monetdb5/mal/mal_parser.h +++ b/monetdb5/mal/mal_parser.h @@ -11,16 +11,17 @@ #include "mal_import.h" -#define MAXERRORS 250 - #define CURRENT(c) (c->fdin->buf + c->fdin->pos + c->yycur) #define currChar(X) (*CURRENT(X)) #define peekChar(X) (*((X)->fdin->buf + (X)->fdin->pos + (X)->yycur+1)) #define nextChar(X) X->yycur++ #define prevChar(X) if(X->yycur) X->yycur-- -mal_export void initParser(void); /* needed in src/mal/mal.c */ -mal_export void parseMAL(Client cntxt, Symbol curPrg, int skipcomments, int lines, MALfcn address); +#ifdef LIBMONETDB5 +#define MAXERRORS 250 + +extern void initParser(void); /* needed in src/mal/mal.c */ +extern void parseMAL(Client cntxt, Symbol curPrg, int skipcomments, int lines, MALfcn address); +#endif #endif /* _MAL_PARSER_H */ - diff --git a/monetdb5/mal/mal_resource.h b/monetdb5/mal/mal_resource.h --- a/monetdb5/mal/mal_resource.h +++ b/monetdb5/mal/mal_resource.h @@ -12,20 +12,22 @@ #include "mal_interpreter.h" #include "matomic.h" +//#define heapinfo(X,Id) (((X) && (X)->base && ((X)->parentid == 0 || (X)->parentid == Id)) ? (X)->free : 0) +#define heapinfo(X,Id) ((X) ? (X)->free : 0) +#define hashinfo(X,Id) ((X) && (X) != (Hash *) 1 ? heapinfo(&(X)->heaplink, Id) + heapinfo(&(X)->heapbckt, Id) : 0) + +#ifdef LIBMONETDB5 #define LONGRUNNING (60 * 1000 * 1000) /* usec , 60 seconds high priority */ #define TIMESLICE (3 * 1000 * 1000) /* usec , 3 seconds high priority */ #define DELAYUNIT 2 /* ms delay in parallel processing decisions */ #define MAX_DELAYS 1000 /* never wait more then 2000 ms */ -//#define heapinfo(X,Id) (((X) && (X)->base && ((X)->parentid == 0 || (X)->parentid == Id)) ? (X)->free : 0) -#define heapinfo(X,Id) ((X) ? (X)->free : 0) -#define hashinfo(X,Id) ((X) && (X) != (Hash *) 1 ? heapinfo(&(X)->heaplink, Id) + heapinfo(&(X)->heapbckt, Id) : 0) - -mal_export int MALadmission_claim(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, lng argclaim); -mal_export void MALadmission_release(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, lng argclaim); +extern int MALadmission_claim(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, lng argclaim); +extern void MALadmission_release(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, lng argclaim); #define FAIRNESS_THRESHOLD (MAX_DELAYS * DELAYUNIT) -mal_export lng getMemoryClaim(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, int i, int flag); +extern lng getMemoryClaim(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, int i, int flag); +#endif _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
