e72cf0100e06d6fadb7282d4e7eb2c592f320951
galt
  Mon Jul 4 13:08:35 2011 -0700
Adding parallel-fetch loading of remote bigDataUrl tracks using pthreads
diff --git src/hg/hgTracks/bigWigTrack.c src/hg/hgTracks/bigWigTrack.c
index 53bc1bd..08cc0ea 100644
--- src/hg/hgTracks/bigWigTrack.c
+++ src/hg/hgTracks/bigWigTrack.c
@@ -21,86 +21,79 @@
 if (tg->preDrawContainer != NULL)
     return tg->preDrawContainer;
 
 struct preDrawContainer *preDrawList = NULL;
 /* protect against temporary network error */
 struct errCatch *errCatch = errCatchNew();
 if (errCatchStart(errCatch))
     {
     /* Allocate predraw area. */
 
     /* Get summary info from bigWig */
     int summarySize = width;
     struct bbiSummaryElement *summary;
     AllocArray(summary, summarySize);
 
-    struct bbiFile *bbiFile ;
-    for(bbiFile = tg->bbiFile; bbiFile ; bbiFile = bbiFile->next)
+    struct bbiFile *bbiFile, *bbiNext;
+    for(bbiFile = tg->bbiFile; bbiFile ; bbiFile = bbiNext)
 	{
 	struct preDrawContainer *pre = initPreDrawContainer(width);
 	slAddHead(&preDrawList, pre);
 
 	if (bigWigSummaryArrayExtended(bbiFile, chromName, winStart, winEnd, summarySize, summary))
 	    {
 	    /* Convert format to predraw */
 	    int i;
 	    int preDrawZero = pre->preDrawZero;
 	    struct preDrawElement *preDraw = pre->preDraw;
 	    for (i=0; i<summarySize; ++i)
 		{
 		struct preDrawElement *pe = &preDraw[i + preDrawZero];
 		struct bbiSummaryElement *be = &summary[i];
 		pe->count = be->validCount;
 		pe->min = be->minVal;
 		pe->max = be->maxVal;
 		pe->sumData = be->sumData;
 		pe->sumSquares = be->sumSquares;
 		}
 	    }
+	bbiNext = bbiFile->next;
+	bigWigFileClose(&bbiFile);
 	}
+    tg->bbiFile = NULL;
     freeMem(summary);
     }
 errCatchEnd(errCatch);
 if (errCatch->gotError)
     {
     tg->networkErrMsg = cloneString(errCatch->message->string);
     }
 errCatchFree(&errCatch);
 tg->preDrawContainer = preDrawList;
 return preDrawList;
 }
 
 static void bigWigDrawItems(struct track *tg, int seqStart, int seqEnd,
 	struct hvGfx *hvg, int xOff, int yOff, int width,
 	MgFont *font, Color color, enum trackVisibility vis)
 {
-boolean canCloseHere = FALSE;
-struct preDrawContainer *pre = tg->customPt; // populated by bigWigLoadItems
-if (! pre)	// custom tracks could not do this at their load time
-    {
-    pre = bigWigLoadPreDraw(tg, seqStart, seqEnd, width);
-    canCloseHere = TRUE;
-    }
-
 if (tg->networkErrMsg == NULL)
     {
     /* Call actual graphing routine. */
     wigDrawPredraw(tg, seqStart, seqEnd, hvg, xOff, yOff, width, font, color, vis,
-		   pre, pre->preDrawZero, pre->preDrawSize, 
+		   tg->preDrawContainer, tg->preDrawContainer->preDrawZero, tg->preDrawContainer->preDrawSize, 
 		   &tg->graphUpperLimit, &tg->graphLowerLimit);
-    if (canCloseHere)
-	bigWigFileClose(&tg->bbiFile);
     }
 else
     bigDrawWarning(tg, seqStart, seqEnd, hvg, xOff, yOff, width, font, color, vis);
 }
 
 static void bigWigOpenCatch(struct track *tg, char *fileName)
 /* Try to open big wig file, store error in track struct */
 {
 /* protect against temporary network error */
 struct errCatch *errCatch = errCatchNew();
 if (errCatchStart(errCatch))
     {
     struct bbiFile *bbiFile = bigWigFileOpen(fileName);
     slAddHead(&tg->bbiFile, bbiFile);
     }
@@ -112,39 +105,46 @@
     if (!sameOk(parentContainerType(tg), "multiWig"))
 	tg->totalHeight = bigWarnTotalHeight;
     }
 errCatchFree(&errCatch);
 }
 
 
 static void bigWigLoadItems(struct track *tg)
 /* Fill up tg->items with bedGraphItems derived from a bigWig file */
 {
 char *extTableString = trackDbSetting(tg->tdb, "extTable");
 
 if (tg->bbiFile == NULL)
     {
     /* Figure out bigWig file name. */
+    if (tg->parallelLoading) // do not use mysql during parallel-fetch
+	{
+	char *fileName = cloneString(trackDbSetting(tg->tdb, "bigDataUrl"));
+	bigWigOpenCatch(tg, fileName);
+	}
+    else
+	{
     struct sqlConnection *conn = hAllocConnTrack(database, tg->tdb);
     char *fileName = bbiNameFromSettingOrTable(tg->tdb, conn, tg->table);
     bigWigOpenCatch(tg, fileName);
     // if there's an extra table, read this one in too
     if (extTableString != NULL)
 	{
 	fileName = bbiNameFromSettingOrTable(tg->tdb, conn, extTableString);
         bigWigOpenCatch(tg, fileName);
 	}
     hFreeConn(&conn);
-    tg->customPt = (void *)bigWigLoadPreDraw(tg, winStart, winEnd, insideWidth);
-    bigWigFileClose(&tg->bbiFile);
     }
 }
+bigWigLoadPreDraw(tg, winStart, winEnd, insideWidth);
+}
 
 void bigWigMethods(struct track *track, struct trackDb *tdb, 
 	int wordCount, char *words[])
 /* Set up bigWig methods. */
 {
 bedGraphMethods(track, tdb, wordCount, words);
 track->loadItems = bigWigLoadItems;
 track->drawItems = bigWigDrawItems;
 track->loadPreDraw = bigWigLoadPreDraw;
 }