From 960b3d8a13c67ac4b7f479d5764b0b618fc9ea09 Mon Sep 17 00:00:00 2001
From: Dante Niewenhuis <d.niewenhuis@hotmail.com>
Date: Tue, 5 Mar 2024 16:50:35 +0100
Subject: Cpu fix (#208)

* Updated the topology format to JSON. Updated TopologyReader.kt to handle JSON filed. Added documentation for the new format.

* applied spotless kotlin

* small update

* Updated for spotless apply

* Updated for spotless apply
---
 .../main/resources/benchmark/trace/meta.parquet    | Bin 0 -> 4514 bytes
 .../main/resources/benchmark/trace/trace.parquet   | Bin 0 -> 3749 bytes
 .../src/main/resources/env/multi.json              |  66 +++++++++++++++++++++
 .../src/main/resources/env/single.json             |  26 ++++++++
 .../src/main/resources/env/single.txt              |   3 +-
 5 files changed, 93 insertions(+), 2 deletions(-)
 create mode 100644 opendc-experiments/opendc-experiments-greenifier/src/main/resources/benchmark/trace/meta.parquet
 create mode 100644 opendc-experiments/opendc-experiments-greenifier/src/main/resources/benchmark/trace/trace.parquet
 create mode 100644 opendc-experiments/opendc-experiments-greenifier/src/main/resources/env/multi.json
 create mode 100644 opendc-experiments/opendc-experiments-greenifier/src/main/resources/env/single.json

(limited to 'opendc-experiments/opendc-experiments-greenifier/src/main/resources')

diff --git a/opendc-experiments/opendc-experiments-greenifier/src/main/resources/benchmark/trace/meta.parquet b/opendc-experiments/opendc-experiments-greenifier/src/main/resources/benchmark/trace/meta.parquet
new file mode 100644
index 00000000..2ca31107
Binary files /dev/null and b/opendc-experiments/opendc-experiments-greenifier/src/main/resources/benchmark/trace/meta.parquet differ
diff --git a/opendc-experiments/opendc-experiments-greenifier/src/main/resources/benchmark/trace/trace.parquet b/opendc-experiments/opendc-experiments-greenifier/src/main/resources/benchmark/trace/trace.parquet
new file mode 100644
index 00000000..34fa1c0c
Binary files /dev/null and b/opendc-experiments/opendc-experiments-greenifier/src/main/resources/benchmark/trace/trace.parquet differ
diff --git a/opendc-experiments/opendc-experiments-greenifier/src/main/resources/env/multi.json b/opendc-experiments/opendc-experiments-greenifier/src/main/resources/env/multi.json
new file mode 100644
index 00000000..721005b0
--- /dev/null
+++ b/opendc-experiments/opendc-experiments-greenifier/src/main/resources/env/multi.json
@@ -0,0 +1,66 @@
+{
+    "clusters":
+    [
+        {
+            "name": "C01",
+            "hosts" :
+            [
+                {
+                    "name": "H01",
+                    "cpus":
+                    [
+                        {
+                            "coreCount": 32,
+                            "coreSpeed": 3200
+                        }
+                    ],
+                    "memory": {
+                        "memorySize": 256000
+                    }
+                }
+            ]
+        },
+        {
+            "name": "C02",
+            "hosts" :
+            [
+                {
+                    "name": "H02",
+                    "count": 6,
+                    "cpus":
+                    [
+                        {
+                            "coreCount": 8,
+                            "coreSpeed": 2930
+                        }
+                    ],
+                    "memory": {
+                        "memorySize": 64000
+                    }
+                }
+            ]
+        },
+        {
+            "name": "C03",
+            "hosts" :
+            [
+                {
+                    "name": "H03",
+                    "count": 2,
+                    "cpus":
+                    [
+                        {
+                            "coreCount": 16,
+                            "coreSpeed": 3200
+                        }
+                    ],
+                    "memory": {
+                        "memorySize": 128000
+                    }
+                }
+            ]
+        }
+    ]
+}
+
+
diff --git a/opendc-experiments/opendc-experiments-greenifier/src/main/resources/env/single.json b/opendc-experiments/opendc-experiments-greenifier/src/main/resources/env/single.json
new file mode 100644
index 00000000..a1c8d95a
--- /dev/null
+++ b/opendc-experiments/opendc-experiments-greenifier/src/main/resources/env/single.json
@@ -0,0 +1,26 @@
+{
+    "clusters":
+    [
+        {
+            "name": "C01",
+            "hosts" :
+            [
+                {
+                    "name": "H01",
+                    "cpus":
+                    [
+                        {
+                            "coreCount": 8,
+                            "coreSpeed": 3200
+                        }
+                    ],
+                    "memory": {
+                        "memorySize": 128000
+                    }
+                }
+            ]
+        }
+    ]
+}
+
+
diff --git a/opendc-experiments/opendc-experiments-greenifier/src/main/resources/env/single.txt b/opendc-experiments/opendc-experiments-greenifier/src/main/resources/env/single.txt
index 5642003d..7c641f4b 100644
--- a/opendc-experiments/opendc-experiments-greenifier/src/main/resources/env/single.txt
+++ b/opendc-experiments/opendc-experiments-greenifier/src/main/resources/env/single.txt
@@ -1,3 +1,2 @@
 ClusterID;ClusterName;Cores;Speed;Memory;numberOfHosts;memoryCapacityPerHost;coreCountPerHost
-A01;A01;8;3.2;128;1;128;8
-
+A01;A01;8;1;100;1;100;8
-- 
cgit v1.2.3