Added support for carbon traces (#218)

* Started with the carbon trace implementation

* Moved the carbon trace system to the proper folders

1 files changed, 3 insertions, 11 deletions

diff --git a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/spi/TraceFormat.kt b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/spi/TraceFormat.kt
index 89cac608..67df667b 100644
--- a/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/spi/TraceFormat.kt
+++ b/opendc-trace/opendc-trace-api/src/main/kotlin/org/opendc/trace/spi/TraceFormat.kt
@@ -26,6 +26,7 @@ import org.opendc.trace.TableReader
 import org.opendc.trace.TableWriter
 import org.opendc.trace.azure.AzureTraceFormat
 import org.opendc.trace.bitbrains.BitbrainsTraceFormat
+import org.opendc.trace.formats.carbon.CarbonTraceFormat
 import org.opendc.trace.formats.opendc.OdcVmTraceFormat
 import org.opendc.trace.gwf.GwfTraceFormat
 import org.opendc.trace.swf.SwfTraceFormat
@@ -114,26 +115,17 @@ public interface TraceFormat {
             return ServiceLoader.load(TraceFormat::class.java)
         }
 
-//        /**
-//         * Obtain a [TraceFormat] implementation by [name].
-//         */
-//        @JvmStatic
-//        public fun byName(name: String): TraceFormat? {
-//
-//            val loader = ServiceLoader.load(TraceFormat::class.java)
-//            return loader.find { it.name == name }
-//        }
-
         /**
          * Obtain a [TraceFormat] implementation by [name].
          */
         @JvmStatic
         public fun byName(name: String): TraceFormat? {
             return when (name) {
-                "opendc-vm" -> OdcVmTraceFormat()
                 "azure" -> AzureTraceFormat()
                 "bitbrains" -> BitbrainsTraceFormat()
+                "carbon" -> CarbonTraceFormat()
                 "gwf" -> GwfTraceFormat()
+                "opendc-vm" -> OdcVmTraceFormat()
                 "swf" -> SwfTraceFormat()
                 "wfformat" -> WfFormatTraceFormat()
                 "wtf" -> WtfTraceFormat()