Changeset: 2b1f1e074670 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2b1f1e074670
Modified Files:
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_resource.c
monetdb5/mal/mal_resource.h
Branch: Feb2013
Log Message:
Fix changeset 33a1b7bfcb28 so that we don't have an ABI change.
Not to be propagated.
diffs (45 lines):
diff --git a/monetdb5/mal/mal_dataflow.c b/monetdb5/mal/mal_dataflow.c
--- a/monetdb5/mal/mal_dataflow.c
+++ b/monetdb5/mal/mal_dataflow.c
@@ -333,7 +333,7 @@ DFLOWworker(void *t)
if (todo->last == 0)
profilerHeartbeatEvent("wait");
else
- MALresourceFairness(usec);
+ MALresourceFairness(NULL, NULL, usec);
}
}
GDKfree(GDKerrbuf);
diff --git a/monetdb5/mal/mal_resource.c b/monetdb5/mal/mal_resource.c
--- a/monetdb5/mal/mal_resource.c
+++ b/monetdb5/mal/mal_resource.c
@@ -184,7 +184,7 @@ static MT_Lock runningLock
#endif
void
-MALresourceFairness(lng usec)
+MALresourceFairness(Client cntxt, MalBlkPtr mb, lng usec)
{
size_t rss;
unsigned int delay;
@@ -199,6 +199,9 @@ MALresourceFairness(lng usec)
#endif
#endif
+ (void) cntxt;
+ (void) mb;
+
if ( usec > 0 && ( (usec = GDKusec()-usec)) <= TIMESLICE )
return;
threads = GDKnr_threads > 0 ? GDKnr_threads : 1;
diff --git a/monetdb5/mal/mal_resource.h b/monetdb5/mal/mal_resource.h
--- a/monetdb5/mal/mal_resource.h
+++ b/monetdb5/mal/mal_resource.h
@@ -31,6 +31,6 @@ mal_export int MALadmission(lng argclaim
#endif
mal_export lng getMemoryClaim(MalBlkPtr mb, MalStkPtr stk, int pc, int i, int
flag);
-mal_export void MALresourceFairness(lng usec);
+mal_export void MALresourceFairness(Client cntxt, MalBlkPtr mb, lng usec);
#endif /* _MAL_RESOURCE_H*/
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
