From 1766888d6dde44f96508a4bc6878978ddcaa073d Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Wed, 30 Sep 2020 21:44:39 +0200 Subject: Add module for simulation-specific code for OpenDC This change introduces a new module in the OpenDC namespace where simulation-specific code will be placed. We will move away from the odcsim naming to prevent getting confused users due to this complex naming scheme. Furthermore, this module will live in the org.opendc package instead of the com.atlarge.opendc to further reduce depth of the packages. --- simulator/settings.gradle.kts | 1 + 1 file changed, 1 insertion(+) (limited to 'simulator/settings.gradle.kts') diff --git a/simulator/settings.gradle.kts b/simulator/settings.gradle.kts index 9411d882..ccfb68fc 100644 --- a/simulator/settings.gradle.kts +++ b/simulator/settings.gradle.kts @@ -25,6 +25,7 @@ rootProject.name = "opendc-simulator" include(":odcsim:odcsim-api") include(":odcsim:odcsim-engine-omega") +include(":opendc:opendc-simulator") include(":opendc:opendc-core") include(":opendc:opendc-compute") include(":opendc:opendc-format") -- cgit v1.2.3 From 0df646c2951e9950f27472fdf0cb2624303c2d74 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Thu, 1 Oct 2020 00:23:37 +0200 Subject: Move custom Flows to separate utility module This change moves the custom Flow object we provide (e.g. EventFlow and StateFlow) outside of the odcsim-api module into a separate opendc-utils module. This is in preparation for the removal of the odcsim components in OpenDC. --- simulator/settings.gradle.kts | 1 + 1 file changed, 1 insertion(+) (limited to 'simulator/settings.gradle.kts') diff --git a/simulator/settings.gradle.kts b/simulator/settings.gradle.kts index ccfb68fc..cd7121c0 100644 --- a/simulator/settings.gradle.kts +++ b/simulator/settings.gradle.kts @@ -26,6 +26,7 @@ rootProject.name = "opendc-simulator" include(":odcsim:odcsim-api") include(":odcsim:odcsim-engine-omega") include(":opendc:opendc-simulator") +include(":opendc:opendc-utils") include(":opendc:opendc-core") include(":opendc:opendc-compute") include(":opendc:opendc-format") -- cgit v1.2.3 From 27ddd462d148d70760e45f967387905054e21d20 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Thu, 1 Oct 2020 00:32:46 +0200 Subject: Remove odcsim components from repository This change removes the odcsim components from the repository as we have eliminated their use in the OpenDC codebase, by replacing them with the more generic (Test)CoroutineScope and Clock. From now on, we will only place modules under the OpenDC namespace and not use odcsim as well to prevent confusion. --- simulator/settings.gradle.kts | 2 -- 1 file changed, 2 deletions(-) (limited to 'simulator/settings.gradle.kts') diff --git a/simulator/settings.gradle.kts b/simulator/settings.gradle.kts index cd7121c0..64bf59a9 100644 --- a/simulator/settings.gradle.kts +++ b/simulator/settings.gradle.kts @@ -23,8 +23,6 @@ */ rootProject.name = "opendc-simulator" -include(":odcsim:odcsim-api") -include(":odcsim:odcsim-engine-omega") include(":opendc:opendc-simulator") include(":opendc:opendc-utils") include(":opendc:opendc-core") -- cgit v1.2.3 From 8a9f5573bef3f68316add17c04a47cc4e5fe75fa Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Thu, 1 Oct 2020 00:49:53 +0200 Subject: Move OpenDC modules into simulator root This change moves the OpenDC modules previously living in the simulator/opendc directory to the simulator directory itself given that we do not make a distinction between OpenDC and odcsim anymore. --- simulator/settings.gradle.kts | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'simulator/settings.gradle.kts') diff --git a/simulator/settings.gradle.kts b/simulator/settings.gradle.kts index 64bf59a9..e5e218b8 100644 --- a/simulator/settings.gradle.kts +++ b/simulator/settings.gradle.kts @@ -1,7 +1,5 @@ /* - * MIT License - * - * Copyright (c) 2017 atlarge-research + * Copyright (c) 2017 AtLarge Research * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -23,12 +21,12 @@ */ rootProject.name = "opendc-simulator" -include(":opendc:opendc-simulator") -include(":opendc:opendc-utils") -include(":opendc:opendc-core") -include(":opendc:opendc-compute") -include(":opendc:opendc-format") -include(":opendc:opendc-workflows") -include(":opendc:opendc-experiments-sc18") -include(":opendc:opendc-experiments-sc20") -include(":opendc:opendc-runner-web") +include(":opendc-core") +include(":opendc-compute") +include(":opendc-workflows") +include(":opendc-format") +include(":opendc-experiments:opendc-experiments-sc18") +include(":opendc-experiments:opendc-experiments-sc20") +include(":opendc-runner-web") +include(":opendc-simulator") +include(":opendc-utils") -- cgit v1.2.3