Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Don't reopen the coverage file each time; on windows that is very slow.
  • Loading branch information
RichardBradley committed May 15, 2014
commit 870df6618f07d991985c61ca72c75733145c4957
9 changes: 6 additions & 3 deletions src/main/scala/scoverage/IOUtils.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@ object IOUtils {
def clean(dataDir: String): Unit = clean(new File(dataDir))

def coverageFile(dataDir: File): File = coverageFile(dataDir.getAbsolutePath)
def coverageFile(dataDir: String): File = new File(dataDir + "/" + CoverageFileName)
def coverageFile(dataDir: String): File = new File(dataDir, CoverageFileName)

/**
* @return the measurement file for the current thread.
*/
def measurementFile(dataDir: File): File = measurementFile(dataDir.getAbsolutePath)
def measurementFile(dataDir: String): File = new File(dataDir + "/" + MeasurementsPrefix + Thread.currentThread.getId)
def measurementFile(dataDir: String): File = new File(dataDir, MeasurementsPrefix + Thread.currentThread.getId)

def findMeasurementFiles(dataDir: String): Array[File] = findMeasurementFiles(new File(dataDir))
def findMeasurementFiles(dataDir: File): Array[File] = dataDir.listFiles(new FileFilter {
Expand Down Expand Up @@ -141,4 +144,4 @@ object IOUtils {
reader.close()
coverage
}
}
}
15 changes: 10 additions & 5 deletions src/main/scala/scoverage/Invoker.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import java.io.FileWriter
/** @author Stephen Samuel */
object Invoker {

val threadFile = new ThreadLocal[FileWriter]

/**
* We record that the given id has been invoked by appending its id to the coverage
* data file.
Expand All @@ -23,9 +25,12 @@ object Invoker {
def invoked(id: Int, dataDir: String) = {
// Each thread writes to a separate measurement file, to reduce contention
// and because file appends via FileWriter are not atomic on Windows.
val file = IOUtils.measurementFile(dataDir)
val writer = new FileWriter(file, true)
writer.append(id.toString + ';')
writer.close()
var writer = threadFile.get()
if (writer == null) {
val file = IOUtils.measurementFile(dataDir)
writer = new FileWriter(file, true)
threadFile.set(writer)
}
writer.append(id.toString + ';').flush()
}
}
}