Changeset: 21e6b83d806d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=21e6b83d806d
Modified Files:
monetdb5/mal/mal.h
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_namespace.h
monetdb5/mal/mal_resolve.c
monetdb5/mal/mal_scenario.c
monetdb5/mal/mal_scenario.h
monetdb5/mal/mal_stack.h
monetdb5/mal/mal_type.h
monetdb5/optimizer/opt_wlc.c
Branch: default
Log Message:
Removed unused struct components and preprocessor macros.
diffs (237 lines):
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -30,7 +30,6 @@
# include <sys/times.h>
#endif
-#include <setjmp.h>
/*
* MonetDB Calling Options
* The number of invocation arguments is kept to a minimum.
@@ -110,8 +109,6 @@ mal_export void mserver_reset(void);
#define VARARGS 1 /* deal with variable arguments
*/
#define VARRETS 2
-#define SERVERSHUTDOWNDELAY 5 /* seconds */
-
typedef int malType;
typedef str (*MALfcn) ();
@@ -206,7 +203,6 @@ typedef struct MALBLK {
#define STACKINCR 128
#define MAXGLOBALS (4 * STACKINCR)
-#define MAXSHARES 8
typedef int (*DFhook) (void *, void *, void *, void *);
@@ -217,8 +213,6 @@ typedef struct MALSTK {
int stkdepth; /* to protect against runtime stack overflow */
int calldepth; /* to protect against runtime stack overflow */
short keepAlive; /* do not garbage collect when set */
- short garbageCollect; /* stack needs garbage collection */
- lng tmpspace; /* amount of temporary space produced */
/*
* Parallel processing is mostly driven by dataflow, but within this
context
* there may be different schemes to take instructions into execution.
diff --git a/monetdb5/mal/mal_client.c b/monetdb5/mal/mal_client.c
--- a/monetdb5/mal/mal_client.c
+++ b/monetdb5/mal/mal_client.c
@@ -218,7 +218,6 @@ MCinitClientRecord(Client c, oid user, b
c->listing = 0;
c->fdout = fout ? fout : GDKstdout;
- c->mdb = 0;
c->curprg = c->backup = 0;
c->glb = 0;
diff --git a/monetdb5/mal/mal_client.h b/monetdb5/mal/mal_client.h
--- a/monetdb5/mal/mal_client.h
+++ b/monetdb5/mal/mal_client.h
@@ -24,8 +24,6 @@ enum clientmode {
BLOCKCLIENT
};
-#define PROCESSTIMEOUT 2 /* seconds */
-
/*
* The prompt structure is designed to simplify recognition of the
* language framework for interaction. For access through an API we
@@ -122,7 +120,6 @@ typedef struct CLIENT {
* debugger features.
*/
int debug;
- void *mdb; /* context upon suspend */
enum clientmode mode; /* FREECLIENT..BLOCKED */
/*
* Client records are organized into a two-level dependency tree,
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
@@ -1211,7 +1211,6 @@ mdbStep(Client cntxt, MalBlkPtr mb, MalS
state.stk = stk;
state.p = getInstrPtr(mb, pc);
state.pc = pc;
- cntxt->mdb = &state;
mnstr_printf(cntxt->fdout, "#Process %d put to sleep\n", (int)
(cntxt - mal_clients));
cntxt->itrace = 'W';
mdbTrap(cntxt, mb, stk, state.p);
diff --git a/monetdb5/mal/mal_instruction.h b/monetdb5/mal/mal_instruction.h
--- a/monetdb5/mal/mal_instruction.h
+++ b/monetdb5/mal/mal_instruction.h
@@ -126,7 +126,6 @@
#define getArgGDKType(M,P,I) getVarGDKType((M),(P)->argv[I])
#define getGDKType(T) ( T <= TYPE_str ? T : (T == TYPE_any ?
TYPE_void : findGDKtype(T)))
-
mal_export void addMalException(MalBlkPtr mb, str msg);
mal_export void mal_instruction_reset(void);
mal_export InstrPtr newInstruction(MalBlkPtr mb, str modnme, str fcnnme);
diff --git a/monetdb5/mal/mal_namespace.h b/monetdb5/mal/mal_namespace.h
--- a/monetdb5/mal/mal_namespace.h
+++ b/monetdb5/mal/mal_namespace.h
@@ -16,6 +16,4 @@ mal_export str getName(const char *nme);
mal_export str getNameLen(const char *nme, size_t len);
mal_export void delName(const char *nme, size_t len);
-#define MAXIDENTLEN 1024
-
#endif /* _MAL_NAMESPACE_H */
diff --git a/monetdb5/mal/mal_resolve.c b/monetdb5/mal/mal_resolve.c
--- a/monetdb5/mal/mal_resolve.c
+++ b/monetdb5/mal/mal_resolve.c
@@ -26,7 +26,6 @@ static int updateTypeMap(int formal, int
static int typeKind(MalBlkPtr mb, InstrPtr p, int i);
/* #define DEBUG_MAL_RESOLVE*/
-#define MAXMALARG 256
/*
* We found the proper function. Copy some properties. In particular,
diff --git a/monetdb5/mal/mal_scenario.c b/monetdb5/mal/mal_scenario.c
--- a/monetdb5/mal/mal_scenario.c
+++ b/monetdb5/mal/mal_scenario.c
@@ -109,35 +109,35 @@ static struct SCENARIO scenarioRec[MAXSC
0, 0, /* implicit */
"MALinitClient", (MALfcn) &MALinitClient,
"MALexitClient", (MALfcn) &MALexitClient,
- "MALreader", (MALfcn) &MALreader, 0,
- "MALparser", (MALfcn) &MALparser, 0,
- "MALoptimizer", 0, 0,
- 0, 0, 0,
- "MALengine", (MALfcn) &MALengine, 0,
- "MALcallback", (MALfcn) &MALcallback, 0 },
+ "MALreader", (MALfcn) &MALreader,
+ "MALparser", (MALfcn) &MALparser,
+ "MALoptimizer", 0,
+ 0, 0,
+ "MALengine", (MALfcn) &MALengine,
+ "MALcallback", (MALfcn) &MALcallback },
{"profiler","profiler", /* name */
0, 0, /* initClient */
0, 0, /* exitClient */
"PROFinitClient", (MALfcn) &PROFinitClient, /*
initClient */
"PROFexitClient", (MALfcn) &PROFexitClient, /*
exitClient */
- "MALreader", (MALfcn) &MALreader, 0, /* reader */
- "MALparser", (MALfcn) &MALparser, 0, /* parser */
- 0, 0, 0, /* optimizer */
- 0, 0, 0, /* scheduler */
- 0, 0, 0, /* callback */
- 0, 0, 0 /* engine */
+ "MALreader", (MALfcn) &MALreader, /* reader */
+ "MALparser", (MALfcn) &MALparser, /* parser */
+ 0, 0, /* optimizer */
+ 0, 0, /* scheduler */
+ 0, 0, /* callback */
+ 0, 0 /* engine */
},
{0, 0, /* name */
0, 0, /* init */
0, 0, /* exit */
0, 0, /* initClient */
0, 0, /* exitClient */
- 0, 0, 0, /* reader */
- 0, 0, 0, /* parser */
- 0, 0, 0, /* optimizer */
- 0, 0, 0, /* scheduler */
- 0, 0, 0, /* callback */
- 0, 0, 0 /* engine */
+ 0, 0, /* reader */
+ 0, 0, /* parser */
+ 0, 0, /* optimizer */
+ 0, 0, /* scheduler */
+ 0, 0, /* callback */
+ 0, 0 /* engine */
}
};
diff --git a/monetdb5/mal/mal_scenario.h b/monetdb5/mal/mal_scenario.h
--- a/monetdb5/mal/mal_scenario.h
+++ b/monetdb5/mal/mal_scenario.h
@@ -42,22 +42,16 @@ typedef struct SCENARIO {
MALfcn exitClientCmd;
str reader;
MALfcn readerCmd;
- void *readerState;
str parser;
MALfcn parserCmd;
- void *parserState;
str optimizer;
MALfcn optimizerCmd;
- void *optimizerState;
str tactics;
MALfcn tacticsCmd;
- void *tacticsState;
str engine;
MALfcn engineCmd;
- void *engineState;
str callback;
MALfcn callbackCmd;
- void *callbackState;
} *Scenario;
mal_export str setScenario(Client c, str nme);
diff --git a/monetdb5/mal/mal_stack.h b/monetdb5/mal/mal_stack.h
--- a/monetdb5/mal/mal_stack.h
+++ b/monetdb5/mal/mal_stack.h
@@ -17,9 +17,6 @@ mal_export MalStkPtr reallocGlobalStack(
mal_export void freeStack(MalStkPtr stk);
mal_export void clearStack(MalStkPtr s);
-#define VARfreeze(X) if(X){X->frozen=TRUE;}
-#define VARfixate(X) if(X){X->constant=TRUE;}
-
#define getStkRecord(S,P,I) &(S)->stk[(P)->argv[I]]
#define getStkValue(S,P,I) ( getStkType(S,P,I)== TYPE_str? \
getStkRecord(S,P,I)->val.sval :\
diff --git a/monetdb5/mal/mal_type.h b/monetdb5/mal/mal_type.h
--- a/monetdb5/mal/mal_type.h
+++ b/monetdb5/mal/mal_type.h
@@ -12,7 +12,6 @@
/* #define DEBUG_MAL_TYPE 1 */
-#define malVARG " malVARG"
#define TMPMARKER '_'
#define REFMARKER 'X'
#define REFMARKERC 'C'
@@ -59,7 +58,6 @@
#define REMsymbol 99 /* commentary to be retained */
-
mal_export str getTypeName(malType tpe);
mal_export str getTypeIdentifier(malType tpe);
mal_export int getAtomIndex(const char *nme, size_t len, int deftpe);
diff --git a/monetdb5/optimizer/opt_wlc.c b/monetdb5/optimizer/opt_wlc.c
--- a/monetdb5/optimizer/opt_wlc.c
+++ b/monetdb5/optimizer/opt_wlc.c
@@ -12,7 +12,6 @@
#include "monetdb_config.h"
#include "opt_wlc.h"
-
str
OPTwlcImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{ int i, j, limit, slimit, updates=0, query=1;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
