From 17bb0205c577720ab5137729d619b1f3cc71297e Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Thu, 21 Nov 2019 14:36:02 +0100 Subject: docs: Move odcsim docs to separate directory --- README.md | 33 ++++++++++----------------------- odcsim/README.md | 52 +++++----------------------------------------------- 2 files changed, 15 insertions(+), 70 deletions(-) diff --git a/README.md b/README.md index b4da4287..d3cae15f 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,11 @@ OpenDC
- OpenDC + OpenDC Simulator +

+Collaborative Datacenter Simulation and Exploration for Everybody +

Build Status @@ -13,29 +16,13 @@ MIT License

-

- Collaborative Datacenter Simulation and Exploration for Everybody -

- ## Introduction -**odcsim** is a framework for discrete event simulation in Kotlin and Java, used -by the [OpenDC](https://opendc.org) project. -Simulations are defined in terms of a hierarchical grouping of actors -and the interactions between these actors -([Actor model](https://en.wikipedia.org/wiki/Actor_model)), using -an API very similar to [Akka Typed](https://doc.akka.io/docs/akka/current/typed/index.html). - -## Documentation -Check out the [Getting Started](#getting-started) section for a quick -overview. -The documentation is located in the [docs/](docs/) directory and is divided as follows: -* [Main Concepts](docs/concepts.md) -* [Building a Model](docs/build.md) -* [Running a Model](docs/run.md) -* [Pre-built Models](docs/models.md) -* [API Reference](https://atlarge-research.github.io/opendc-simulator) -* [Contributing Guide](CONTRIBUTING.md) +This repository hosts the source code and development of the simulation component of the [OpenDC](https://opendc.org) project. This component is responsible for modelling and simulation of datacenters and their components. We have structured the repository into two individual subprojects: +- **[odcsim](/odcsim)** + A framework for discrete event simulation using the [Kotlin](https://kotlinlang.org/) language. +- **[opendc](/opendc)** + A collection of models for simulating clouds, datacenters and their components using the **odcsim** framework. ## Contributing ### Contributing Guide @@ -44,4 +31,4 @@ development process, how to propose bug fixes and improvements, and how to build and test your changes to the project. ### License -The OpenDC simulator is [MIT licensed](https://github.com/atlarge-research/opendc-simulator/blob/master/LICENSE.txt). +The OpenDC simulator is available under the [MIT license](https://github.com/atlarge-research/opendc-simulator/blob/master/LICENSE.txt). diff --git a/odcsim/README.md b/odcsim/README.md index 5863b055..e5dcc319 100644 --- a/odcsim/README.md +++ b/odcsim/README.md @@ -7,12 +7,12 @@ ## Introduction -**odcsim** is a framework for discrete event simulation in Kotlin and Java, used +**odcsim** is a framework for discrete event simulation in Kotlin, used by the [OpenDC](https://opendc.org) project. Simulations are defined in terms of a hierarchical grouping of actors and the interactions between these actors ([Actor model](https://en.wikipedia.org/wiki/Actor_model)), using -an API very similar to [Akka Typed](https://doc.akka.io/docs/akka/current/typed/index.html). +an API similar to [Akka](https://doc.akka.io/docs/akka/current/index.html). ## Documentation Check out the [Getting Started](#getting-started) section for a quick @@ -37,12 +37,12 @@ model. #### Gradle Groovy ```groovy -implementation 'com.atlarge.odcsim:odcsim-core:2.0.0' +implementation 'com.atlarge.odcsim:odcsim-api:2.0.0' runtime 'com.atlarge.odcsim:odcsim-engine-omega:2.0.0' ``` Kotlin ```groovy -implementation("com.atlarge.odcsim:odcsim-core:2.0.0") +implementation("com.atlarge.odcsim:odcsim-api:2.0.0") runtime("com.atlarge.odcsim:odcsim-engine-omega:2.0.0") ``` @@ -50,7 +50,7 @@ runtime("com.atlarge.odcsim:odcsim-engine-omega:2.0.0") ```xml com.atlarge.odcsim - odcsim-core + odcsim-api 2.0.0 @@ -61,45 +61,3 @@ runtime("com.atlarge.odcsim:odcsim-engine-omega:2.0.0") ``` -### Construction of Simulation Model -Let's construct a simple simulation model of a single car actor. -The car will alternately drive and park for a while. When it starts -driving (or parking), it will print the current simulation time. - - -```kotlin -import com.atlarge.odcsim.Behavior -import com.atlarge.odcsim.coroutines.suspending -import com.atlarge.odcsim.coroutines.dsl.timeout - -fun car(): Behavior = - suspending { ctx -> - while (true) { - println("Start parking at ${ctx.time}") - val parkingDuration = 5.0 - timeout(parkingDuration) - - println("Start driving at ${ctx.time}") - val tripDuration = 2.0 - timeout(tripDuration) - } - - stopped() - } -``` - -### Running Simulation -Running the constructed simulation model requires an implementation -of the `ActorSystem` interface provided by one of the `odcsim-engine-*` -packages. The [ServiceLoader](https://docs.oracle.com/javase/9/docs/api/java/util/ServiceLoader.html) -class found in the JDK can be used to locate the `ActorSystem` implementation on the classpath. -```kotlin -import com.atlarge.odcsim.ActorSystemFactory -import java.util.ServiceLoader - -val factory = ServiceLoader.load(ActorSystemFactory::class.java).first() -val system = factory(car(), name = "car") -system.run(until = 10.0) -system.terminate() -``` - -- cgit v1.2.3