Changeset: 2a57fc2bd5b0 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2a57fc2bd5b0
Modified Files:
monetdb5/extras/crackers/crackers_selectpl_ops.mx
Branch: holindex
Log Message:
Uncomment global array of locks for parallel cracking.
diffs (117 lines):
diff --git a/monetdb5/extras/crackers/crackers_selectpl_ops.mx
b/monetdb5/extras/crackers/crackers_selectpl_ops.mx
--- a/monetdb5/extras/crackers/crackers_selectpl_ops.mx
+++ b/monetdb5/extras/crackers/crackers_selectpl_ops.mx
@@ -305,7 +305,7 @@ createView:
if (createIndex==1)
{
- //MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
+ MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
//MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
createIndex=0;
}
@@ -341,7 +341,7 @@ createView:
bit copy=TRUE;
FILE *ofp;
char *outputFilename1;
- //int mod_bid=0;
+ int mod_bid=0;
//gettimeofday(&tv0,0);
@@ -357,9 +357,9 @@ createView:
exit(1);
}
- //mod_bid=ABS(*bid)%LOCKS;
+ mod_bid=ABS(*bid)%LOCKS;
- //MT_lock_set(&CRKIndexLock[mod_bid],"Cracker Index Lock");
+ MT_lock_set(&CRKIndexLock[mod_bid],"Cracker Index Lock");
//MT_lock_set(&CRKIndexLock,"Cracker Index Lock");
//gettimeofday(&tv1,0); wt+=dt(tv0,tv1); tv0=tv1;
@@ -535,7 +535,7 @@ createView:
}
- //MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
+ MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
//MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
//gettimeofday(&tv1,0); ct+=dt(tv0,tv1); tv0=tv1;
@@ -711,7 +711,7 @@ createView:
if (createIndex==1)
{
- //MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
+ MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
//MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
createIndex=0;
}
@@ -1141,11 +1141,11 @@ CRKRangeLeftNilTree_@1(int *vid, int *bi
struct Node *lowNode=NULL;
pthread_rwlock_t *plock=0;
BUN idxFirst = BUN_NONE;
- //int mod_bid=0;
+ int mod_bid=0;
- //mod_bid=ABS(*bid)%LOCKS;
+ mod_bid=ABS(*bid)%LOCKS;
- //MT_lock_set(&CRKIndexLock[mod_bid],"Cracker Index Lock");
+ MT_lock_set(&CRKIndexLock[mod_bid],"Cracker Index Lock");
//MT_lock_set(&CRKIndexLock,"Cracker Index Lock");
if (*inclusiveHgh == TRUE) HBound = FALSE;
@@ -1219,7 +1219,7 @@ CRKRangeLeftNilTree_@1(int *vid, int *bi
idxFirst = BUNfirst(c);
- //MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
+ MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
//MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
vl = BUNfirst(b);
@@ -1272,7 +1272,7 @@ CRKRangeLeftNilTree_@1(int *vid, int *bi
if (createIndex==1)
{
- //MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
+ MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
//MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
createIndex=0;
}
@@ -1294,11 +1294,11 @@ CRKRangeRightNilTree_@1(int *vid, int *b
struct Node *lowNode=NULL;
pthread_rwlock_t *plock=0;
BUN idxFirst = BUN_NONE;
- //int mod_bid=0;
+ int mod_bid=0;
- //mod_bid=ABS(*bid)%LOCKS;
+ mod_bid=ABS(*bid)%LOCKS;
- //MT_lock_set(&CRKIndexLock[mod_bid],"Cracker Index Lock");
+ MT_lock_set(&CRKIndexLock[mod_bid],"Cracker Index Lock");
//MT_lock_set(&CRKIndexLock,"Cracker Index Lock");
m = existsCrackerIndex(*bid);
@@ -1369,7 +1369,7 @@ CRKRangeRightNilTree_@1(int *vid, int *b
idxFirst = BUNfirst(c);
- //MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
+ MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
//MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
vh = BUNlast(b)-(oid)1;
@@ -1430,7 +1430,7 @@ CRKRangeRightNilTree_@1(int *vid, int *b
if (createIndex==1)
{
- //MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
+ MT_lock_unset(&CRKIndexLock[mod_bid],"Cracker Index Lock");
//MT_lock_unset(&CRKIndexLock,"Cracker Index Lock");
createIndex=0;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
