Changeset: 89d209c0d6ac for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=89d209c0d6ac
Modified Files:
clients/Tests/exports.stable.out
common/stream/stream.c
common/stream/stream.h
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_namespace.h
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_profiler.h
monetdb5/mal/mal_type.c
monetdb5/mal/mal_type.h
monetdb5/modules/mal/profiler.c
Branch: default
Log Message:
Merge with Oct2014 branch.
diffs (truncated from 499 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
@@ -2121,7 +2121,7 @@ str ZORDencode_int_oid(oid *z, int *x, i
str ZORDslice_int(int *r, int *xb, int *yb, int *xt, int *yt);
void _initTrace(void);
str abortRef;
-str activateCounter(str name);
+str activateCounter(const char *name);
str addOptimizerPipe(Client cntxt, MalBlkPtr mb, str name);
str addPipeDefinition(Client cntxt, str name, str pipe);
void addtoMalBlkHistory(MalBlkPtr mb, str marker);
@@ -2185,7 +2185,7 @@ str closeProfilerStream(void);
str closeRef;
void clrAllTypes(MalBlkPtr mb);
void clrDeclarations(MalBlkPtr mb);
-void clrFilter(Module cntxt, str mod, str fcn);
+void clrFilter(Module cntxt, const char *mod, const char *fcn);
void clrFilterVariable(MalBlkPtr mb, int i);
void clrFunction(InstrPtr p);
void clrInstruction(InstrPtr p);
@@ -2222,14 +2222,14 @@ int daytime_fromstr(const char *buf, int
int daytime_tostr(str *buf, int *len, const daytime *val);
int daytime_tz_fromstr(const char *buf, int *len, daytime **ret);
str dblRef;
-str deactivateCounter(str name);
+str deactivateCounter(const char *name);
void debugLifespan(Client cntxt, MalBlkPtr mb, Lifespan span);
str debugOptimizers(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
void debugParser(int i);
str debugScheduler(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
int defConstant(MalBlkPtr mb, int type, ValPtr cst);
void delArgument(InstrPtr p, int varid);
-void delName(str nme, size_t len);
+void delName(const char *nme, size_t len);
void delVariable(MalBlkPtr mb, int varid);
str deleteRef;
void deleteSymbol(Module scope, Symbol prg);
@@ -2307,7 +2307,7 @@ char **getHelpMatch(char *pat);
MalBlkPtr getMalBlkHistory(MalBlkPtr mb, int idx);
MalBlkPtr getMalBlkMarker(MalBlkPtr mb, str marker);
lng getMemoryClaim(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, int i, int flag);
-str getName(str nme, size_t len);
+str getName(const char *nme, size_t len);
int getPC(MalBlkPtr mb, InstrPtr p);
str getPipeCatalog(int *nme, int *def, int *stat);
str getPipeDefinition(str name);
@@ -2317,8 +2317,8 @@ str getRef;
str getRefName(MalBlkPtr mb, int i);
str getScenarioLanguage(Client c);
lng getSystemTime(void);
-BAT *getTrace(str ev);
-int getTraceType(str nme);
+BAT *getTrace(const char *ev);
+int getTraceType(const char *nme);
malType getType(MalBlkPtr mb, str nme);
str getTypeIdentifier(malType tpe);
int getTypeIndex(str nme, int len, int deftpe);
@@ -2361,7 +2361,6 @@ void insertInstruction(MalBlkPtr mb, Ins
str insertRef;
void insertSymbol(Module scope, Symbol prg);
int insertionsProp;
-int instrFilter(InstrPtr pci, str mod, str fcn);
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;
@@ -2594,7 +2593,7 @@ void printStack(stream *f, MalBlkPtr mb,
str prodRef;
void profilerEvent(int idx, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci, int
start);
void profilerGetCPUStat(lng *user, lng *nice, lng *sys, lng *idle, lng
*iowait);
-void profilerHeartbeatEvent(str msg, lng ticks);
+void profilerHeartbeatEvent(const char *msg, lng ticks);
str profilerRef;
str projectRef;
str projectdeltaRef;
@@ -2622,7 +2621,7 @@ InstrPtr pushValue(MalBlkPtr mb, InstrPt
InstrPtr pushVoid(MalBlkPtr mb, InstrPtr q);
InstrPtr pushWrd(MalBlkPtr mb, InstrPtr q, wrd val);
InstrPtr pushZero(MalBlkPtr mb, InstrPtr q, int tpe);
-str putName(str nme, size_t len);
+str putName(const char *nme, size_t len);
str putRef;
str queryRef;
str querylogRef;
@@ -2687,20 +2686,20 @@ str seriesRef;
str setAccessRef;
void setArgType(MalBlkPtr mb, InstrPtr p, int i, int tpe);
InstrPtr setArgument(MalBlkPtr mb, InstrPtr p, int idx, int varid);
-str setEndPoint(Module cntxt, str mod, str fcn);
-void setFilter(Module cntxt, str mod, str fcn);
+str setEndPoint(Module cntxt, const char *mod, const char *fcn);
+void setFilter(Module cntxt, const char *mod, const char *fcn);
void setFilterAll(void);
-void setFilterOnBlock(MalBlkPtr mb, str mod, str fcn);
+void setFilterOnBlock(MalBlkPtr mb, const char *mod, const char *fcn);
void setFilterVariable(MalBlkPtr mb, int i);
Lifespan setLifespan(MalBlkPtr mb);
-str setLogFile(stream *fd, Module cntxt, str fname);
-str setLogStream(Module cntxt, str host, int port);
+str setLogFile(stream *fd, Module cntxt, const char *fname);
+str setLogStream(Module cntxt, const char *host, int port);
str setLogStreamStream(Module cntxt, stream *s);
void setModuleJump(str nme, Module cur);
void setPolymorphic(InstrPtr p, int tpe, int force);
void setReturnArgument(InstrPtr p, int varid);
str setScenario(Client c, str nme);
-str setStartPoint(Module cntxt, str mod, str fcn);
+str setStartPoint(Module cntxt, const char *mod, const char *fcn);
void setVarName(MalBlkPtr mb, int i, str nme);
void setVarType(MalBlkPtr mb, int i, int tpe);
str setWriteModeRef;
@@ -2894,8 +2893,8 @@ stream *socket_rastream(SOCKET socket, c
stream *socket_rstream(SOCKET socket, const char *name);
stream *socket_wastream(SOCKET socket, const char *name);
stream *socket_wstream(SOCKET socket, const char *name);
-stream *udp_rastream(char *hostname, int port, const char *name);
-stream *udp_wastream(char *hostname, int port, const char *name);
+stream *udp_rastream(const char *hostname, int port, const char *name);
+stream *udp_wastream(const char *hostname, int port, const char *name);
stream *wbstream(stream *s, size_t buflen);
diff --git a/common/stream/stream.c b/common/stream/stream.c
--- a/common/stream/stream.c
+++ b/common/stream/stream.c
@@ -2001,7 +2001,7 @@ udp_create(const char *name)
}
static int
-udp_socket(udp_stream * udp, char *hostname, int port, int write)
+udp_socket(udp_stream * udp, const char *hostname, int port, int write)
{
struct sockaddr *serv;
socklen_t servsize;
@@ -2029,7 +2029,7 @@ udp_socket(udp_stream * udp, char *hostn
}
stream *
-udp_rastream(char *hostname, int port, const char *name)
+udp_rastream(const char *hostname, int port, const char *name)
{
stream *s;
@@ -2050,7 +2050,7 @@ udp_rastream(char *hostname, int port, c
}
stream *
-udp_wastream(char *hostname, int port, const char *name)
+udp_wastream(const char *hostname, int port, const char *name)
{
stream *s;
diff --git a/common/stream/stream.h b/common/stream/stream.h
--- a/common/stream/stream.h
+++ b/common/stream/stream.h
@@ -183,8 +183,8 @@ stream_export void close_stream(stream *
stream_export stream *open_urlstream(const char *url);
-stream_export stream *udp_rastream(char *hostname, int port, const char *name);
-stream_export stream *udp_wastream(char *hostname, int port, const char *name);
+stream_export stream *udp_rastream(const char *hostname, int port, const char
*name);
+stream_export stream *udp_wastream(const char *hostname, int port, const char
*name);
stream_export stream *file_rstream(FILE *fp, const char *name);
stream_export stream *file_wstream(FILE *fp, const char *name);
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -717,7 +717,7 @@ getRefName(MalBlkPtr mb, int i)
}
int
-findVariable(MalBlkPtr mb, str name)
+findVariable(MalBlkPtr mb, const char *name)
{
int i;
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
@@ -144,7 +144,7 @@ mal_export void removeInstruction(MalBlk
mal_export void removeInstructionBlock(MalBlkPtr mb, int pc, int cnt);
mal_export str operatorName(int i);
-mal_export int findVariable(MalBlkPtr mb, str name);
+mal_export int findVariable(MalBlkPtr mb, const char *name);
mal_export int findTmpVariable(MalBlkPtr mb, int type);
mal_export int findVariableLength(MalBlkPtr mb, str name, int len);
mal_export malType getType(MalBlkPtr mb, str nme);
diff --git a/monetdb5/mal/mal_namespace.c b/monetdb5/mal/mal_namespace.c
--- a/monetdb5/mal/mal_namespace.c
+++ b/monetdb5/mal/mal_namespace.c
@@ -92,7 +92,7 @@ void finishNamespace(void) {
* Beware, the routine getName relies on datastructure maintenance that
* is conflict free.
*/
-str getName(str nme, size_t len)
+str getName(const char *nme, size_t len)
{
NamePtr n;
size_t l = len, key;
@@ -121,14 +121,14 @@ str getName(str nme, size_t len)
* private to each Client, but this would mean expensive look ups
* deep into the kernel to access the context.
*/
-void delName(str nme, size_t len){
+void delName(const char *nme, size_t len){
str n;
n= getName(nme,len);
if( nme[0]==0 || n == 0) return ;
/*Namespace garbage collection not available yet */
}
-str putName(str nme, size_t len)
+str putName(const char *nme, size_t len)
{
size_t l,k;
int key;
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
@@ -22,9 +22,9 @@
mal_export void initNamespace(void);
mal_export void finishNamespace(void);
-mal_export str putName(str nme, size_t len);
-mal_export str getName(str nme, size_t len);
-mal_export void delName(str nme, size_t len);
+mal_export str putName(const char *nme, size_t len);
+mal_export str getName(const char *nme, size_t len);
+mal_export void delName(const char *nme, size_t len);
#define MAXIDENTLEN 1024
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -99,10 +99,10 @@ getProfileCounter(int idx){
* The counters can be set individually.
*/
str
-activateCounter(str name)
+activateCounter(const char *name)
{
int i;
- char *s;
+ const char *s;
for (i = 0; profileCounter[i].name; i++)
if (strcmp(profileCounter[i].name, name) == 0) {
@@ -183,7 +183,7 @@ activateCounter(str name)
}
str
-deactivateCounter(str name)
+deactivateCounter(const char *name)
{
int i;
for (i = 0; profileCounter[i].name; i++)
@@ -528,7 +528,7 @@ offlineProfilerEvent(int idx, MalBlkPtr
str
-setLogFile(stream *fd, Module mod, str fname)
+setLogFile(stream *fd, Module mod, const char *fname)
{
(void)mod; /* still unused */
MT_lock_set(&mal_profileLock, "setLogFile");
@@ -551,7 +551,7 @@ setLogFile(stream *fd, Module mod, str f
}
str
-setLogStream(Module cntxt, str host, int port)
+setLogStream(Module cntxt, const char *host, int port)
{
(void)cntxt; /* still unused */
MT_lock_set(&mal_profileLock, "setLogStream");
@@ -590,7 +590,7 @@ openProfilerStream(stream *fd)
str
closeProfilerStream(void)
{
- if (eventstream && eventstream != GDKout && eventstream != GDKerr) {
+ if (eventstream && eventstream != mal_clients[0].fdout && eventstream
!= GDKout && eventstream != GDKerr) {
(void)mnstr_close(eventstream);
(void)mnstr_destroy(eventstream);
}
@@ -600,7 +600,7 @@ closeProfilerStream(void)
}
str
-setStartPoint(Module cntxt, str mod, str fcn)
+setStartPoint(Module cntxt, const char *mod, const char *fcn)
{
(void)cntxt;
(void)mod;
@@ -617,7 +617,7 @@ setStartPoint(Module cntxt, str mod, str
}
str
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
