Changeset: 0d49632146c0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d49632146c0
Modified Files:
monetdb5/mal/mal_resource.c
monetdb5/optimizer/opt_mitosis.c
Branch: default
Log Message:
Fix compilation issues
diffs (52 lines):
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
@@ -130,6 +130,7 @@ MALadmission_claim(Client cntxt, MalBlkP
if ( memorypool > argclaim || stk->workers == 0 ) {
/* If we are low on memory resources, limit the user if he
exceeds his memory budget
* but make sure there is at least one worker thread active */
+ /* on hold until after experiments
if ( 0 && cntxt->memorylimit) {
if (argclaim + stk->memory > (lng) cntxt->memorylimit *
LL_CONSTANT(1048576)){
MT_lock_unset(&admissionLock);
@@ -140,6 +141,7 @@ MALadmission_claim(Client cntxt, MalBlkP
}
stk->memory += argclaim;
}
+ */
memorypool -= argclaim;
PARDEBUG
fprintf(stderr, "#DFLOWadmit thread %d pool " LLFMT
"claims " LLFMT "\n",
@@ -159,17 +161,20 @@ void
MALadmission_release(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci,
lng argclaim)
{
/* release memory claimed before */
+ (void) cntxt;
(void) mb;
(void) pci;
if (argclaim == 0 )
return;
MT_lock_set(&admissionLock);
+ /* on hold until after experiments
if ( 0 && cntxt->memorylimit) {
PARDEBUG
fprintf(stderr, "#Return memory to session budget "
LLFMT "\n", stk->memory);
stk->memory -= argclaim;
}
+ */
memorypool += argclaim;
if ( memorypool > (lng) MEMORY_THRESHOLD ){
PARDEBUG
diff --git a/monetdb5/optimizer/opt_mitosis.c b/monetdb5/optimizer/opt_mitosis.c
--- a/monetdb5/optimizer/opt_mitosis.c
+++ b/monetdb5/optimizer/opt_mitosis.c
@@ -126,7 +126,7 @@ OPTmitosisImplementation(Client cntxt, M
if( cntxt->memorylimit){
/* the new mitosis scheme uses a maximum chunck size in MB from
the client context */
- m = (cntxt->memorylimit * 1024 *1024) / row_size;
+ m = (size_t) ((cntxt->memorylimit * 1024 *1024) / row_size);
pieces = rowcnt / m + (rowcnt - m * pieces > 0);
}
if( cntxt->memorylimit == 0 || pieces <= 1){
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
