Changeset: 0d9df0b1e9bd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d9df0b1e9bd
Modified Files:
clients/mapiclient/tachograph.c
monetdb5/mal/mal_profiler.c
Branch: profiler
Log Message:
Fix compiler warnings
diffs (68 lines):
diff --git a/clients/mapiclient/tachograph.c b/clients/mapiclient/tachograph.c
--- a/clients/mapiclient/tachograph.c
+++ b/clients/mapiclient/tachograph.c
@@ -67,7 +67,6 @@
static stream *conn = NULL;
static char hostname[128];
static char *dbname;
-static int delay = 0; // ms
static Mapi dbh;
static MapiHdl hdl = NULL;
static int capturing=0;
@@ -107,7 +106,6 @@ usageTachograph(void)
fprintf(stderr, " -u | --user=<user>\n");
fprintf(stderr, " -p | --port=<portnr>\n");
fprintf(stderr, " -h | --host=<hostname>\n");
- fprintf(stderr, " -w | --wait=<delay time> in milliseconds\n");
fprintf(stderr, " -? | --help\n");
exit(-1);
}
@@ -402,7 +400,6 @@ main(int argc, char **argv)
{ "help", 0, 0, '?' },
{ "output", 1, 0, 'o' },
{ "queries", 1, 0, 'q' },
- { "wait", 1, 0, 'w' },
{ "debug", 0, 0, 'D' },
{ 0, 0, 0, 0 }
};
@@ -412,14 +409,11 @@ main(int argc, char **argv)
while (1) {
int option_index = 0;
- int c = getopt_long(argc, argv, "d:u:p:P:h:?:o:q:w:D",
+ int c = getopt_long(argc, argv, "d:u:p:P:h:?:o:q:D",
long_options, &option_index);
if (c == -1)
break;
switch (c) {
- case 'w':
- delay = atoi(optarg ? optarg : "5000");
- break;
case 'D':
debug = 1;
break;
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
@@ -45,6 +45,9 @@ static struct{
double load;
} corestat[256];
+/* the heartbeat process produces a ping event once every X milliseconds */
+static MT_Lock hbLock MT_LOCK_INITIALIZER("hbLock");
+
/*
* Profiler trace cache
* The trace information for a limited collection of queries is retained in
@@ -1016,11 +1019,6 @@ getDiskSpace(void)
return size;
}
-/* the heartbeat process produces a ping event once every X milliseconds */
-#ifdef ATOMIC_LOCK
-static MT_Lock hbLock MT_LOCK_INITIALIZER("hbLock");
-#endif
-
//
// Retrieve the io statistics for the complete process group
// This information can only be obtained using root-permissions.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
