perf(trace): Keep reader state in own class

This change removes the external class that holds the state of the
reader and instead puts the state in the reader implementation.
Maintaining a separate class for the state increases the complexity and
has worse performance characteristics due to the bytecode produced by
Kotlin for property accesses.

3 files changed, 42 insertions, 49 deletions

diff --git a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/ResourceColumns.kt b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/ResourceColumns.kt
index 44dec95b..e2e5ea6d 100644
--- a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/ResourceColumns.kt
+++ b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/ResourceColumns.kt
@@ -41,7 +41,7 @@ public val RESOURCE_START_TIME: TableColumn<Instant> = TableColumn("resource:sta
  * End time for the resource.
  */
 @JvmField
-public val RESOURCE_END_TIME: TableColumn<Instant> = TableColumn("resource:end_time", Instant::class.java)
+public val RESOURCE_STOP_TIME: TableColumn<Instant> = TableColumn("resource:stop_time", Instant::class.java)
 
 /**
  * Number of CPUs for the resource.
@@ -50,7 +50,7 @@ public val RESOURCE_END_TIME: TableColumn<Instant> = TableColumn("resource:end_t
 public val RESOURCE_NCPUS: TableColumn<Int> = intColumn("resource:num_cpus")
 
 /**
- * Memory capacity for the resource.
+ * Memory capacity for the resource in KB.
  */
 @JvmField
 public val RESOURCE_MEM_CAPACITY: TableColumn<Double> = doubleColumn("resource:mem_capacity")
diff --git a/opendc-trace/opendc-trace-gwf/src/main/kotlin/org/opendc/trace/gwf/GwfTaskTableReader.kt b/opendc-trace/opendc-trace-gwf/src/main/kotlin/org/opendc/trace/gwf/GwfTaskTableReader.kt
index 64b7d465..fb9099bf 100644
--- a/opendc-trace/opendc-trace-gwf/src/main/kotlin/org/opendc/trace/gwf/GwfTaskTableReader.kt
+++ b/opendc-trace/opendc-trace-gwf/src/main/kotlin/org/opendc/trace/gwf/GwfTaskTableReader.kt
@@ -32,18 +32,13 @@ import java.util.regex.Pattern
  * A [TableReader] implementation for the GWF format.
  */
 internal class GwfTaskTableReader(private val parser: CsvParser) : TableReader {
-    /**
-     * The current parser state.
-     */
-    private val state = RowState()
-
     init {
         parser.schema = schema
     }
 
     override fun nextRow(): Boolean {
         // Reset the row state
-        state.reset()
+        reset()
 
         if (!nextStart()) {
             return false
@@ -57,12 +52,12 @@ internal class GwfTaskTableReader(private val parser: CsvParser) : TableReader {
             }
 
             when (parser.currentName) {
-                "WorkflowID" -> state.workflowId = parser.longValue
-                "JobID" -> state.jobId = parser.longValue
-                "SubmitTime" -> state.submitTime = parser.longValue
-                "RunTime" -> state.runtime = parser.longValue
-                "NProcs" -> state.nProcs = parser.intValue
-                "ReqNProcs" -> state.reqNProcs = parser.intValue
+                "WorkflowID" -> workflowId = parser.longValue
+                "JobID" -> jobId = parser.longValue
+                "SubmitTime" -> submitTime = parser.longValue
+                "RunTime" -> runtime = parser.longValue
+                "NProcs" -> nProcs = parser.intValue
+                "ReqNProcs" -> reqNProcs = parser.intValue
                 "Dependencies" -> parseParents(parser.valueAsString)
             }
         }
@@ -85,13 +80,13 @@ internal class GwfTaskTableReader(private val parser: CsvParser) : TableReader {
 
     override fun <T> get(column: TableColumn<T>): T {
         val res: Any = when (column) {
-            TASK_WORKFLOW_ID -> state.workflowId
-            TASK_ID -> state.jobId
-            TASK_SUBMIT_TIME -> state.submitTime
-            TASK_RUNTIME -> state.runtime
-            TASK_REQ_NCPUS -> state.nProcs
-            TASK_ALLOC_NCPUS -> state.reqNProcs
-            TASK_PARENTS -> state.dependencies
+            TASK_WORKFLOW_ID -> workflowId
+            TASK_ID -> jobId
+            TASK_SUBMIT_TIME -> submitTime
+            TASK_RUNTIME -> runtime
+            TASK_REQ_NCPUS -> nProcs
+            TASK_ALLOC_NCPUS -> reqNProcs
+            TASK_PARENTS -> dependencies
             else -> throw IllegalArgumentException("Invalid column")
         }
 
@@ -105,18 +100,18 @@ internal class GwfTaskTableReader(private val parser: CsvParser) : TableReader {
 
     override fun getInt(column: TableColumn<Int>): Int {
         return when (column) {
-            TASK_REQ_NCPUS -> state.nProcs
-            TASK_ALLOC_NCPUS -> state.reqNProcs
+            TASK_REQ_NCPUS -> nProcs
+            TASK_ALLOC_NCPUS -> reqNProcs
             else -> throw IllegalArgumentException("Invalid column")
         }
     }
 
     override fun getLong(column: TableColumn<Long>): Long {
         return when (column) {
-            TASK_WORKFLOW_ID -> state.workflowId
-            TASK_ID -> state.jobId
-            TASK_SUBMIT_TIME -> state.submitTime
-            TASK_RUNTIME -> state.runtime
+            TASK_WORKFLOW_ID -> workflowId
+            TASK_ID -> jobId
+            TASK_SUBMIT_TIME -> submitTime
+            TASK_RUNTIME -> runtime
             else -> throw IllegalArgumentException("Invalid column")
         }
     }
@@ -166,29 +161,27 @@ internal class GwfTaskTableReader(private val parser: CsvParser) : TableReader {
     }
 
     /**
-     * The current row state.
+     * Reader state fields.
      */
-    private class RowState {
-        var workflowId = -1L
-        var jobId = -1L
-        var submitTime = -1L
-        var runtime = -1L
-        var nProcs = -1
-        var reqNProcs = -1
-        var dependencies = emptySet<Long>()
+    private var workflowId = -1L
+    private var jobId = -1L
+    private var submitTime = -1L
+    private var runtime = -1L
+    private var nProcs = -1
+    private var reqNProcs = -1
+    private var dependencies = emptySet<Long>()
 
-        /**
-         * Reset the state.
-         */
-        fun reset() {
-            workflowId = -1
-            jobId = -1
-            submitTime = -1
-            runtime = -1
-            nProcs = -1
-            reqNProcs = -1
-            dependencies = emptySet()
-        }
+    /**
+     * Reset the state.
+     */
+    private fun reset() {
+        workflowId = -1
+        jobId = -1
+        submitTime = -1
+        runtime = -1
+        nProcs = -1
+        reqNProcs = -1
+        dependencies = emptySet()
     }
 
     companion object {
diff --git a/opendc-trace/opendc-trace-wtf/src/main/kotlin/org/opendc/trace/wtf/WtfTrace.kt b/opendc-trace/opendc-trace-wtf/src/main/kotlin/org/opendc/trace/wtf/WtfTrace.kt
index 7eff0f5a..a755a107 100644
--- a/opendc-trace/opendc-trace-wtf/src/main/kotlin/org/opendc/trace/wtf/WtfTrace.kt
+++ b/opendc-trace/opendc-trace-wtf/src/main/kotlin/org/opendc/trace/wtf/WtfTrace.kt
@@ -43,5 +43,5 @@ public class WtfTrace internal constructor(private val path: Path) : Trace {
         return WtfTaskTable(path)
     }
 
-    override fun toString(): String = "SwfTrace[$path]"
+    override fun toString(): String = "WtfTrace[$path]"
 }