Changeset: a6bec353b97c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a6bec353b97c
Modified Files:
clients/Tests/exports.stable.out
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_interpreter.h
Branch: Sep2022
Log Message:
Unexport functions that have no business being exported + approve.
diffs (148 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
@@ -1078,7 +1078,6 @@ const char *ioRef;
bool isExceptionVariable(const char *nme);
int isIdentifier(str s);
int isLoopBarrier(MalBlkPtr mb, int pc);
-int isNotUsedIn(InstrPtr p, int start, int a);
int isOptimizerPipe(const char *name);
const char *iteratorRef;
const char *jitRef;
@@ -1101,7 +1100,6 @@ const char *lookupRef;
str mal2str(MalBlkPtr mb, int first, int last);
int malAtomSize(int size, const char *name);
str malBootstrap(char *modules[], bool embedded);
-str malCommandCall(MalStkPtr stk, InstrPtr pci);
str malEmbeddedBoot(int workerlimit, int memorylimit, int querytimeout, int
sessionlimit, bool with_mapi_server);
void malEmbeddedReset(void);
_Noreturn void malEmbeddedStop(int status);
@@ -1239,7 +1237,7 @@ 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);
+void profilerEvent(MalEvent *me, NonMalEvent *nme);
void profilerGetCPUStat(lng *user, lng *nice, lng *sys, lng *idle, lng
*iowait);
void profilerHeartbeatEvent(char *alter);
int profilerMode;
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
@@ -29,8 +29,8 @@ setqptimeout(lng usecs)
qptimeout = usecs;
}
-inline
-ptr getArgReference(MalStkPtr stk, InstrPtr pci, int k)
+inline ptr
+getArgReference(MalStkPtr stk, InstrPtr pci, int k)
{
/* the C standard says: "A pointer to a union object, suitably
* converted, points to each of its members (or if a member is a
@@ -39,7 +39,8 @@ ptr getArgReference(MalStkPtr stk, Instr
return (ptr) &stk->stk[pci->argv[k]].val;
}
-str malCommandCall(MalStkPtr stk, InstrPtr pci)
+static str
+malCommandCall(MalStkPtr stk, InstrPtr pci)
{
str ret= MAL_SUCCEED;
@@ -241,14 +242,13 @@ str malCommandCall(MalStkPtr stk, InstrP
}\
}
-int
+static inline bool
isNotUsedIn(InstrPtr p, int start, int a)
{
- int k;
- for (k = start; k < p->argc; k++)
+ for (int k = start; k < p->argc; k++)
if (getArg(p, k) == a)
- return 0;
- return 1;
+ return false;
+ return true;
}
MalStkPtr
@@ -273,7 +273,8 @@ prepareMALstack(MalBlkPtr mb, int size)
return stk;
}
-str runMAL(Client cntxt, MalBlkPtr mb, MalBlkPtr mbcaller, MalStkPtr env)
+str
+runMAL(Client cntxt, MalBlkPtr mb, MalBlkPtr mbcaller, MalStkPtr env)
{
MalStkPtr stk = NULL;
int i;
@@ -356,7 +357,8 @@ str runMAL(Client cntxt, MalBlkPtr mb, M
* answer to direct their actions. Or, a dataflow scheduler could step in
* to enforce a completely different execution order.
*/
-str reenterMAL(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr
stk)
+str
+reenterMAL(Client cntxt, MalBlkPtr mb, int startpc, int stoppc, MalStkPtr stk)
{
str ret;
int keepAlive;
@@ -449,8 +451,9 @@ callMAL(Client cntxt, MalBlkPtr mb, MalS
* in the enclosing routine. When we start executing the first
* instruction, we take the wall-clock time for resource management.
*/
-str runMALsequence(Client cntxt, MalBlkPtr mb, int startpc,
- int stoppc, MalStkPtr stk, MalStkPtr env,
InstrPtr pcicaller)
+str
+runMALsequence(Client cntxt, MalBlkPtr mb, int startpc,
+ int stoppc, MalStkPtr stk, MalStkPtr env, InstrPtr
pcicaller)
{
ValPtr lhs, rhs, v;
int i, k;
@@ -1391,7 +1394,8 @@ str runMALsequence(Client cntxt, MalBlkP
* The first step is to always safe the destination variable
* before a function call is made.
*/
-void garbageElement(Client cntxt, ValPtr v)
+void
+garbageElement(Client cntxt, ValPtr v)
{
(void) cntxt;
if (ATOMstorage(v->vtype) == TYPE_str) {
@@ -1440,18 +1444,17 @@ void garbageElement(Client cntxt, ValPtr
* type should be saved for variables that recide on a global
* stack frame.
*/
-void garbageCollector(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int flag)
+void
+garbageCollector(Client cntxt, MalBlkPtr mb, MalStkPtr stk, int flag)
{
- int k;
- ValPtr v;
-
assert(mb->vtop <= mb->vsize);
assert(stk->stktop <= stk->stksize);
(void) flag;
(void)mb;
(void)cntxt;
- for (k = 0; k < stk->stktop; k++) {
+ for (int k = 0; k < stk->stktop; k++) {
// if (isVarCleanup(mb, k) ){
+ ValPtr v;
garbageElement(cntxt, v = &stk->stk[k]);
v->vtype = TYPE_int;
v->val.ival = int_nil;
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
@@ -30,8 +30,6 @@ mal_export str reenterMAL(Client cntxt,
mal_export str callMAL(Client cntxt, MalBlkPtr mb, MalStkPtr *glb, ValPtr
argv[], char debug);
mal_export void garbageElement(Client cntxt, ValPtr v);
mal_export void garbageCollector(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
int flag);
-mal_export str malCommandCall(MalStkPtr stk, InstrPtr pci);
-mal_export int isNotUsedIn(InstrPtr p, int start, int a);
/* defined in mal.c */
mal_export Client getClientContext(void);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
