f970f8e2fd81d08901048b2070054dd71ed7f1f1 angie Tue Apr 9 11:47:57 2013 -0700 Use localmem for annoRow storage, instead of many independent malloc & free calls. refs #6152 diff --git src/inc/annoStreamer.h src/inc/annoStreamer.h index ac4f448..e2cf8f1 100644 --- src/inc/annoStreamer.h +++ src/inc/annoStreamer.h @@ -30,31 +30,31 @@ void (*setRegion)(struct annoStreamer *self, char *chrom, uint rStart, uint rEnd); /* Set genomic region for query (should be called only by annoGratorQuerySetRegion) */ char *(*getHeader)(struct annoStreamer *self); /* Get the file header as a string (possibly NULL, possibly multi-line). */ struct annoFilter *(*getFilters)(struct annoStreamer *self); void (*setFilters)(struct annoStreamer *self, struct annoFilter *newFilters); /* Get and set filters */ struct annoColumn *(*getColumns)(struct annoStreamer *self); void (*setColumns)(struct annoStreamer *self, struct annoColumn *newColumns); /* Get and set output fields */ - struct annoRow *(*nextRow)(struct annoStreamer *self); + struct annoRow *(*nextRow)(struct annoStreamer *self, struct lm *lm); /* Get next item's output fields from this source */ void (*close)(struct annoStreamer **pSelf); /* Close connection to source and free self. */ void (*setQuery)(struct annoStreamer *self, struct annoGratorQuery *query); /* For use by annoGratorQuery only: hook up query object after creation */ // Public members -- callers are on the honor system to access these read-only. struct annoGratorQuery *query; // The query object that owns this streamer. enum annoRowType rowType; int numCols; struct annoFilter *filters; struct annoColumn *columns;