Changeset: 94c4ff367c0d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=94c4ff367c0d
Modified Files:
clients/Tests/exports.stable.out
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_linker.h
monetdb5/mal/mal_listing.h
monetdb5/mal/mal_namespace.h
monetdb5/mal/mal_profiler.h
monetdb5/mal/mal_resolve.h
Branch: default
Log Message:
Removed unused definitions and reference to inexistent traceFcnName global
variable, making the code compile.
diffs (197 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
@@ -1422,7 +1422,6 @@ str MBMuniform(bat *ret, oid *base, lng
int MCactiveClients(void);
str MCawakeClient(int id);
void MCcloseClient(Client c);
-int MCdefault;
Client MCforkClient(Client father);
Client MCgetClient(int id);
bool MCinit(void);
@@ -2154,7 +2153,6 @@ str escape_str(str *retval, str s);
str evalFile(str fname, int listing);
str evalRef;
str execRef;
-void expandMacro(MalBlkPtr mb, InstrPtr p, MalBlkPtr mc);
str expandRef;
str exportOperationRef;
str export_tableRef;
@@ -2168,7 +2166,6 @@ Symbol findSymbol(Module usermodule, str
Symbol findSymbolInModule(Module v, str fcn);
int findVariable(MalBlkPtr mb, const char *name);
int findVariableLength(MalBlkPtr mb, str name, int len);
-void finishNamespace(void);
str finishRef;
void finishSessionProfiler(Client cntxt);
str first_valueRef;
@@ -2269,7 +2266,6 @@ int inlineMALblock(MalBlkPtr mb, int pc,
str inplaceRef;
void insertSymbol(Module scope, Symbol prg);
str instruction2str(MalBlkPtr mb, MalStkPtr stl, InstrPtr p, int hidden);
-str instructionCall(MalBlkPtr mb, InstrPtr p, str s, str base, size_t len);
str intRef;
str intersectRef;
str intersectcandRef;
@@ -2335,7 +2331,6 @@ char *malLibraryHowToEnable(str name);
int malProfileMode;
str malRef;
void mal_atom_reset(void);
-MT_Lock mal_beatLock;
void mal_client_reset(void) __attribute__((__visibility__("hidden")));
ClientRec *mal_clients;
MT_Lock mal_contextLock;
@@ -2490,7 +2485,6 @@ str projectRef;
str projectdeltaRef;
str projectionRef;
str projectionpathRef;
-void promptInstruction(stream *fd, MalBlkPtr mb, MalStkPtr stk, InstrPtr p,
int flg);
InstrPtr pushArgument(MalBlkPtr mb, InstrPtr p, int varid);
InstrPtr pushArgumentId(MalBlkPtr mb, InstrPtr p, const char *name);
InstrPtr pushBit(MalBlkPtr mb, InstrPtr q, bit val);
@@ -2588,7 +2582,6 @@ str setVariableRef;
void setVariableScope(MalBlkPtr mb);
str setWriteModeRef;
void setprofilerlimit(int limit);
-str setprofilerpoolsize(int size);
str shortStmtRendering(MalBlkPtr mb, MalStkPtr stl, InstrPtr p);
void showAllScenarios(stream *f);
void showCurrentScenario(void);
diff --git a/monetdb5/mal/mal.c b/monetdb5/mal/mal.c
--- a/monetdb5/mal/mal.c
+++ b/monetdb5/mal/mal.c
@@ -44,7 +44,6 @@ MT_Lock mal_remoteLock = MT_LOCK_INI
MT_Lock mal_profileLock = MT_LOCK_INITIALIZER("mal_profileLock");
MT_Lock mal_copyLock = MT_LOCK_INITIALIZER("mal_copyLock");
MT_Lock mal_delayLock = MT_LOCK_INITIALIZER("mal_delayLock");
-MT_Lock mal_beatLock = MT_LOCK_INITIALIZER("mal_beatLock");
MT_Lock mal_oltpLock = MT_LOCK_INITIALIZER("mal_oltpLock");
/*
diff --git a/monetdb5/mal/mal.h b/monetdb5/mal/mal.h
--- a/monetdb5/mal/mal.h
+++ b/monetdb5/mal/mal.h
@@ -77,10 +77,8 @@ 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_Lock mal_beatLock ;
mal_export MT_Lock mal_oltpLock ;
-
mal_export int mal_init(void);
mal_export _Noreturn void mal_exit(int status);
mal_export void mserver_reset(void);
@@ -91,7 +89,6 @@ mal_export void mserver_reset(void);
* also moving the implementation there...
*/
-
/* Listing modes are globally known */
#define LIST_INPUT 1 /* echo original input */
#define LIST_MAL_NAME 2 /* show variable name */
@@ -104,17 +101,6 @@ mal_export void mserver_reset(void);
#define LIST_MAL_DEBUG (LIST_MAL_NAME | LIST_MAL_VALUE | LIST_MAL_TYPE |
LIST_MAL_PROPS)
#define LIST_MAL_ALL (LIST_MAL_NAME | LIST_MAL_VALUE | LIST_MAL_TYPE |
LIST_MAL_PROPS | LIST_MAL_MAPI)
-/* The MAL instruction block type definitions */
-/* Variable properties */
-#define VAR_CONSTANT 1
-#define VAR_TYPEVAR 2
-#define VAR_FIXTYPE 4
-#define VAR_UDFTYPE 8
-#define VAR_CLEANUP 16
-#define VAR_INIT 32
-#define VAR_USED 64
-#define VAR_DISABLED 128 /* used for comments and scheduler */
-
/* type check status is kept around to improve type checking efficiency */
#define TYPE_ERROR -1
#define TYPE_UNKNOWN 0
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
@@ -808,7 +808,6 @@ retryRead:
skipBlanc(cntxt, b);
if ((w = strchr(b, '\n')))
*w = 0;
- traceFcnName = GDKstrdup(b);
}
break;
case 't': /* trace a variable toggle */
diff --git a/monetdb5/mal/mal_linker.h b/monetdb5/mal/mal_linker.h
--- a/monetdb5/mal/mal_linker.h
+++ b/monetdb5/mal/mal_linker.h
@@ -18,11 +18,8 @@
#define RTLD_LAZY 1
#define RTLD_NOW 2
#define RTLD_GLOBAL 4
-#define RTLD_NOW_REPORT_ERROR 8
#endif
-/* #define DEBUG_MAL_LINKER */
-#define MONET64 1
mal_export MALfcn getAddress(str fcnname);
mal_export char *MSP_locate_sqlscript(const char *mod_name, bit recurse);
mal_export str loadLibrary(str modulename, int flag);
diff --git a/monetdb5/mal/mal_listing.h b/monetdb5/mal/mal_listing.h
--- a/monetdb5/mal/mal_listing.h
+++ b/monetdb5/mal/mal_listing.h
@@ -13,13 +13,9 @@
#include "mal_stack.h"
#include "mal_instruction.h"
-#define DEBUG_MAL_LIST
-
mal_export str fcnDefinition(MalBlkPtr mb, InstrPtr p, str s, int flg, str
base, size_t len);
mal_export void printInstruction(stream *fd, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p, int flg);
mal_export void fprintInstruction(FILE *fd, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p, int flg);
-mal_export str instructionCall(MalBlkPtr mb, InstrPtr p, str s, str base,
size_t len);
-mal_export void promptInstruction(stream *fd, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p, int flg);
mal_export str instruction2str(MalBlkPtr mb, MalStkPtr stl, InstrPtr p, int
hidden);
mal_export str shortStmtRendering(MalBlkPtr mb, MalStkPtr stl, InstrPtr p);
mal_export str mal2str(MalBlkPtr mb, int first, int last);
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
@@ -10,7 +10,6 @@
#define _MAL_NAMESPACE_H
mal_export void initNamespace(void);
-mal_export void finishNamespace(void);
mal_export str putName(const char *nme);
mal_export str putNameLen(const char *nme, size_t len);
mal_export str getName(const char *nme);
diff --git a/monetdb5/mal/mal_profiler.h b/monetdb5/mal/mal_profiler.h
--- a/monetdb5/mal/mal_profiler.h
+++ b/monetdb5/mal/mal_profiler.h
@@ -20,8 +20,6 @@
typedef struct rusage Rusage;
#endif
-typedef struct tms Tms;
-
mal_export int malProfileMode;
mal_export void initProfiler(void);
@@ -35,7 +33,6 @@ mal_export str stopProfiler(void);
mal_export str startTrace(str path);
mal_export str stopTrace(str path);
mal_export void setHeartbeat(int delay);
-mal_export str setprofilerpoolsize(int size);
mal_export void initHeartbeat(void);
mal_export void profilerHeartbeatEvent(char *alter);
mal_export int getprofilerlimit(void);
diff --git a/monetdb5/mal/mal_resolve.h b/monetdb5/mal/mal_resolve.h
--- a/monetdb5/mal/mal_resolve.h
+++ b/monetdb5/mal/mal_resolve.h
@@ -24,9 +24,6 @@ mal_export int chkInstruction(Module s,
mal_export void chkTypes(Module s, MalBlkPtr mb, int silent);
mal_export void typeChecker(Module scope, MalBlkPtr mb, InstrPtr p, int
silent);
-extern str traceFcnName;
-mal_export void expandMacro(MalBlkPtr mb, InstrPtr p, MalBlkPtr mc);
-
/*
* @- Type resolution algorithm.
* Every actual argument of a function call should be type compatible
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
