Changeset: 2e99b4381f60 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2e99b4381f60
Modified Files:
Branch: default
Log Message:
Merge with Aug2011 branch.
diffs (286 lines):
diff --git a/sql/backends/monet5/datacell/actuator.c
b/sql/backends/monet5/datacell/actuator.c
--- a/sql/backends/monet5/datacell/actuator.c
+++ b/sql/backends/monet5/datacell/actuator.c
@@ -82,8 +82,8 @@
#define PASSIVE 2
static int mode = PASSIVE;
-void
-usage()
+static void
+usage(void)
{
mnstr_printf(ACout, "The actuator tool can be used to catch an event
sequence \n");
mnstr_printf(ACout, "from the emitter port. Data is in ascii .\n");
@@ -131,7 +131,7 @@
* generated by the sensor and you get a good impression
* of batch effect.
*/
-void showStatistics()
+static void showStatistics(void)
{
double elaps;
int tuplesIntheBuffer = 2222;
@@ -159,7 +159,7 @@
characters=0;
}
-void terminate(Actuator ac)
+static void terminate(Actuator ac)
{
#ifdef _DEBUG_ACTUATOR_
mnstr_printf(ACout, "about to shutdown the actuator\n");
@@ -168,7 +168,7 @@
exit(0);
}
-void stopListening(int i)
+static void stopListening(int i)
{
(void)i;
signal(i, SIG_IGN);
diff --git a/sql/backends/monet5/datacell/basket.c
b/sql/backends/monet5/datacell/basket.c
--- a/sql/backends/monet5/datacell/basket.c
+++ b/sql/backends/monet5/datacell/basket.c
@@ -70,7 +70,7 @@
*tbl = c;
}
-static int BSKTnewEntry()
+static int BSKTnewEntry(void)
{
int i;
for ( i=1; i< bsktLimit; i++)
diff --git a/sql/backends/monet5/datacell/basket.h
b/sql/backends/monet5/datacell/basket.h
--- a/sql/backends/monet5/datacell/basket.h
+++ b/sql/backends/monet5/datacell/basket.h
@@ -26,7 +26,7 @@
#include "sql.h"
#ifdef WIN32
-#ifndef LIBCONTAINERS
+#ifndef LIBDATACELL
#define datacell_export extern __declspec(dllimport)
#else
#define datacell_export extern __declspec(dllexport)
diff --git a/sql/backends/monet5/datacell/datacell.c
b/sql/backends/monet5/datacell/datacell.c
--- a/sql/backends/monet5/datacell/datacell.c
+++ b/sql/backends/monet5/datacell/datacell.c
@@ -124,7 +124,8 @@
return DCreceptorNew(ret,tbl,host,port);
}
-str
+#if 0
+static str
DCemitter(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
int *ret = (int *) getArgReference(stk,pci,0);
@@ -136,6 +137,7 @@
BSKTregister(cntxt,mb,stk,pci);
return DCemitterNew(ret,tbl,host,port);
}
+#endif
str
DCregister(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
diff --git a/sql/backends/monet5/datacell/datacell.h
b/sql/backends/monet5/datacell/datacell.h
--- a/sql/backends/monet5/datacell/datacell.h
+++ b/sql/backends/monet5/datacell/datacell.h
@@ -31,7 +31,7 @@
#include "petrinet.h"
#ifdef WIN32
-#ifndef LIBCONTAINERS
+#ifndef LIBDATACELL
#define datacell_export extern __declspec(dllimport)
#else
#define datacell_export extern __declspec(dllexport)
diff --git a/sql/backends/monet5/datacell/dcsocket.h
b/sql/backends/monet5/datacell/dcsocket.h
--- a/sql/backends/monet5/datacell/dcsocket.h
+++ b/sql/backends/monet5/datacell/dcsocket.h
@@ -43,7 +43,7 @@
#define MYBUFSIZ 64*1024
#ifdef WIN32
-#ifndef LIBDCSOCKET
+#ifndef LIBDATACELL
#define dcsocket_export extern __declspec(dllimport)
#else
#define dcsocket_export extern __declspec(dllexport)
diff --git a/sql/backends/monet5/datacell/emitter.c
b/sql/backends/monet5/datacell/emitter.c
--- a/sql/backends/monet5/datacell/emitter.c
+++ b/sql/backends/monet5/datacell/emitter.c
@@ -101,7 +101,7 @@
return em;
}
-Emitter
+static Emitter
EMfind(str nme)
{
Emitter r;
@@ -517,7 +517,7 @@
}
str
-EMdump()
+EMdump(void)
{
Emitter rc = emAnchor;
for ( ; rc; rc= rc->nxt)
diff --git a/sql/backends/monet5/datacell/emitter.h
b/sql/backends/monet5/datacell/emitter.h
--- a/sql/backends/monet5/datacell/emitter.h
+++ b/sql/backends/monet5/datacell/emitter.h
@@ -34,7 +34,7 @@
#define EMout GDKout
#ifdef WIN32
-#ifndef LIBADAPTERS
+#ifndef LIBDATACELL
#define adapters_export extern __declspec(dllimport)
#else
#define adapters_export extern __declspec(dllexport)
@@ -49,7 +49,7 @@
adapters_export str EMresume(int *ret);
adapters_export str EMstop(int *ret, str *nme);
adapters_export str EMreset(int *ret);
-adapters_export str EMdump();
+adapters_export str EMdump(void);
adapters_export str EMmode(int *ret, str *nme, str *arg);
adapters_export str EMprotocol(int *ret, str *nme, str *arg);
diff --git a/sql/backends/monet5/datacell/petrinet.c
b/sql/backends/monet5/datacell/petrinet.c
--- a/sql/backends/monet5/datacell/petrinet.c
+++ b/sql/backends/monet5/datacell/petrinet.c
@@ -161,7 +161,8 @@
return PNanalysis(cntxt,s->def);
}
-str
+#if 0
+static str
PNremove(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
{
str nme = *(str*) getArgReference(stk,pci,1);
@@ -193,6 +194,7 @@
PNresumeScheduler(&ret);
return MAL_SUCCEED;
}
+#endif
str PNstopScheduler(int *ret)
{
@@ -546,7 +548,8 @@
return MAL_SUCCEED;
}
-str PNstart(int *ret)
+#if 0
+static str PNstart(int *ret)
{
int s;
#ifdef _DEBUG_PETRINET_
@@ -564,6 +567,7 @@
(void)ret;
return MAL_SUCCEED;
}
+#endif
/* inspection routines */
str
diff --git a/sql/backends/monet5/datacell/receptor.c
b/sql/backends/monet5/datacell/receptor.c
--- a/sql/backends/monet5/datacell/receptor.c
+++ b/sql/backends/monet5/datacell/receptor.c
@@ -747,7 +747,7 @@
}
str
-RCdump()
+RCdump(void)
{
Receptor rc = rcAnchor;
for ( ; rc; rc= rc->nxt)
diff --git a/sql/backends/monet5/datacell/receptor.h
b/sql/backends/monet5/datacell/receptor.h
--- a/sql/backends/monet5/datacell/receptor.h
+++ b/sql/backends/monet5/datacell/receptor.h
@@ -30,19 +30,8 @@
#include "mtime.h"
#include "basket.h"
-#ifdef WIN32
-#ifndef LIBCONTAINERS
-#define datacell_export extern __declspec(dllimport)
-#else
-#define datacell_export extern __declspec(dllexport)
-#endif
-#else
-#define datacell_export extern
-#endif
-
/* #define _DEBUG_RECEPTOR_*/
#define RCout GDKout
-datacell_export str RCdump();
/*
* @-
@@ -56,7 +45,7 @@
#define PAUSEDEFAULT 1000
#ifdef WIN32
-#ifndef LIBADAPTERS
+#ifndef LIBDATACELL
#define adapters_export extern __declspec(dllimport)
#else
#define adapters_export extern __declspec(dllexport)
@@ -75,6 +64,6 @@
adapters_export str RCprotocol(int *ret, str *nme, str *arg);
adapters_export str DCscenario(int *ret, str *nme, str *fnme, int *seq);
adapters_export str DCgenerator(int *ret, str *nme, str *modnme, str *fcnnme);
-adapters_export str RCdump() ;
+adapters_export str RCdump(void) ;
#endif
diff --git a/sql/backends/monet5/datacell/sensor.c
b/sql/backends/monet5/datacell/sensor.c
--- a/sql/backends/monet5/datacell/sensor.c
+++ b/sql/backends/monet5/datacell/sensor.c
@@ -92,8 +92,8 @@
static int server = 0;
-void
-usage()
+static void
+usage(void)
{
mnstr_printf(SEout, "The sensor tool can be used to generate a sequence
of\n");
mnstr_printf(SEout, "events and direct them to a receptor port at a
DataCell.\n");
@@ -137,7 +137,7 @@
if ((hdl = mapi_query(dbh, X)) == NULL || mapi_error(dbh) != MOK) \
die(dbh, hdl);
-void
+static void
stopSend(int i)
{
(void)i;
@@ -147,7 +147,7 @@
static void produceStream(Sensor se);
static void produceServerStream(Sensor se);
static void produceDataStream(Sensor se);
-lng estimateOverhead(void);
+static lng estimateOverhead(void);
int main(int argc, char **argv)
{
@@ -429,8 +429,8 @@
#define L(X) (X + strlen(X))
-lng
-estimateOverhead()
+static lng
+estimateOverhead(void)
{
int i;
lng l;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
