Changeset: 85110cff2357 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=85110cff2357
Modified Files:
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_profiler.h
Branch: holindex
Log Message:
Change parameter type in HeartCPUload functions.
diffs (47 lines):
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
@@ -1320,11 +1320,12 @@ static int getCPULoad(char cpuload[BUFSI
}
// Give users the option to check for the system load between two heart beats
-void HeartbeatCPUload(str (*IdleFunc)(int *))
+void HeartbeatCPUload(void *arg)
{
char cpuload[BUFSIZ];
char *p = getenv("CPULOAD_THRESHOLD");
int thres;
+ str (*IdleFunc)(int *) = arg;
if (p == NULL)
{
fprintf(stderr, "Error: CPULOAD_THRESHOLD\n");
@@ -1346,12 +1347,13 @@ void HeartbeatCPUload(str (*IdleFunc)(in
}
// Give users the option to check for the system total load between two heart
beats
-void HeartbeatCPUload_total(void)
+void HeartbeatCPUload_total(void* dummy)
{
char cpuload[BUFSIZ];
FILE *ofp;
char *outputFilename1;
-
+ (void) dummy;
+
outputFilename1 = getenv("TOTAL_CPULOAD");
if (outputFilename1 == NULL){
fprintf(stderr, "Error: TOTAL_CPULOAD\n");
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
@@ -101,8 +101,8 @@ mal_export str stopProfiling(void);
mal_export str cleanupProfiler(void);
mal_export void initHeartbeat(void);
mal_export void stopHeartbeat(void);
-mal_export void HeartbeatCPUload(str (*IdleFunc)(int *));
-mal_export void HeartbeatCPUload_total(void);
+mal_export void HeartbeatCPUload(void*);
+mal_export void HeartbeatCPUload_total(void*);
mal_export int instrFilter(InstrPtr pci, str mod, str fcn);
mal_export void setFilter(Module cntxt, str mod, str fcn);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
