Update of /cvsroot/monetdb/pathfinder/modules/pftijah
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv13636
Modified Files:
Tag: XQuery_0-16
pftijah.mx
Log Message:
- repair bug where tj_global_init locks when it is implicitly called from a
collection init. This screwed up the testset tonight. (Concurrency is hard:-(
Index: pftijah.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/modules/pftijah/pftijah.mx,v
retrieving revision 1.92.2.8
retrieving revision 1.92.2.9
diff -u -d -r1.92.2.8 -r1.92.2.9
--- pftijah.mx 14 Feb 2007 16:14:56 -0000 1.92.2.8
+++ pftijah.mx 15 Feb 2007 09:51:43 -0000 1.92.2.9
@@ -234,7 +234,12 @@
"pftijah");
PROC tj_init_global(BAT[str,str] param) : void :=
{
- lock_set(tj_adm_lock);
+ tj_init_global(param,false);
+}
+
+PROC tj_init_global(BAT[str,str] param, bit doLock) : void :=
+{
+ if (doLock) lock_set(tj_adm_lock);
var err := CATCH({
if ( verbose ) printf("#TJ: tj_init_global() called.\n");
[EMAIL PROTECTED]() {
@@ -251,7 +256,7 @@
new(oid,str).persists(true).bbpname("tj_globalTags");
new(oid,str).persists(true).bbpname("tj_collName");
});
- lock_unset(tj_adm_lock);
+ if (doLock) lock_unset(tj_adm_lock);
if (not(isnil(err))) ERROR(err);
}
@@ -607,7 +612,7 @@
bat("tj_" + collName + "_param").replace("height",
max(height1,height2).str());
bat("tj_" + collName + "_param").replace("status","building");
commit();
- if ( verbose ) printf("#TJ:_tj_add2collectiontj_init_collection(\"%s\")
finish.\n",collName);
+ if ( verbose ) printf("#TJ:_tj_add2collectiont(\"%s\")
finish.\n",collName);
if ( timing ) {
ms := (usec()-t_start)/1000;
printf("#C[%s]:add2coll(\"%s\"): total time =
%lld.%03llds.\n",collName,uri_name,/(ms,1000),%(ms,1000));
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
