Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,10 @@
*/
package org.cloudsimplus.benchmarks;

import org.cloudsimplus.cloudlets.Cloudlet;
import org.cloudsimplus.cloudlets.CloudletSimple;
import org.cloudsimplus.hosts.HostSimple;
import org.cloudsimplus.vms.VmSimple;
import org.cloudsimplus.hosts.Host;
import org.cloudsimplus.vms.Vm;

import java.util.function.IntFunction;

Expand Down Expand Up @@ -94,19 +95,19 @@ public static void main(final String[] args) {
printResult("CloudletSimple", measure(MemoryFootprintBenchmark::newCloudlet));
}

private static VmSimple newVm(final int index) {
private static Vm newVm(final int index) {
return ProcessorScenario.newVm(VM_CORES, VM_MIPS);
}

/// Creates a Host with a single CPU core.
/// The Host Processor is included in the measured size.
private static HostSimple newHost(final int index) {
private static Host newHost(final int index) {
return ProcessorScenario.newHost(HOST_RAM, HOST_BW, HOST_STORAGE, 1, HOST_CORE_MIPS);
}

/// Creates a Cloudlet with the default utilization models.
private static CloudletSimple newCloudlet(final int index) {
return new CloudletSimple(CLOUDLET_LENGTH, CLOUDLET_CORES);
private static Cloudlet newCloudlet(final int index) {
return CloudletSimple.of(CLOUDLET_LENGTH, CLOUDLET_CORES);
}

/// {@return the median heap (in bytes) retained by each object created by a given function}
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/org/cloudsimplus/benchmarks/ProcessorScenario.java
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ final class ProcessorScenario {

ProcessorScenario() {
simulation = new CloudSimPlus();
final var datacenter = new DatacenterSimple(simulation, createHosts(), new VmPlacementPolicyBestFit());
final var datacenter = DatacenterSimple.of(simulation, createHosts(), new VmPlacementPolicyBestFit());
datacenter.setSchedulingInterval(1);

final DatacenterBroker broker = new DatacenterBrokerSimple(simulation);
Expand Down Expand Up @@ -121,7 +121,7 @@ private static List<Cloudlet> createCloudlets() {
final var cloudlets = new ArrayList<Cloudlet>(count);
for (int i = 0; i < count; i++) {
final long length = CLOUDLET_MIN_LENGTH * (1 + i % CLOUDLET_LENGTHS);
cloudlets.add(new CloudletSimple(length, CLOUDLET_CORES));
cloudlets.add(CloudletSimple.of(length, CLOUDLET_CORES));
}

return cloudlets;
Expand All @@ -133,14 +133,14 @@ private static List<Cloudlet> createCloudlets() {
/// @param storage the storage capacity (in Megabytes)
/// @param cores the number of CPU cores
/// @param mips the MIPS capacity of each core
static HostSimple newHost(final long ram, final long bw, final long storage, final long cores, final double mips) {
return new HostSimple(ram, bw, storage, new CoreCapacity(cores, mips));
static Host newHost(final long ram, final long bw, final long storage, final long cores, final double mips) {
return HostSimple.of(ram, bw, storage, new CoreCapacity(cores, mips));
}

/// {@return a new VM}
/// @param cores the number of CPU cores
/// @param mips the MIPS capacity of each core
static VmSimple newVm(final long cores, final double mips) {
return new VmSimple(new CoreCapacity(cores, mips));
static Vm newVm(final long cores, final double mips) {
return VmSimple.of(new CoreCapacity(cores, mips));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ private Datacenter createDatacenter() {
}

//Uses a VmPlacementPolicySimple by default to place VMs
return new DatacenterSimple(simulation, hostList).setSchedulingInterval(-1);
return DatacenterSimple.of(simulation, hostList).setSchedulingInterval(-1);
}

private Host createHost() {
Expand All @@ -148,15 +148,15 @@ private Host createHost() {
Uses ResourceAllocatorSimple by default for RAM and BW allocation
and VmSchedulerSpaceShared for VM scheduling.
*/
return new HostSimple(ram, bw, storage, cpuCapacity);
return HostSimple.of(ram, bw, storage, cpuCapacity);
}

/// Creates a list of VMs.
private List<Vm> createVms() {
final List<Vm> list = new ArrayList<>(vmsNumber);
for (int i = 0; i < vmsNumber; i++) {
//Uses a CloudletSchedulerTimeShared by default to schedule Cloudlets
final Vm vm = new VmSimple(new CoreCapacity(VM_CORES, 1000));
final Vm vm = VmSimple.of(new CoreCapacity(VM_CORES, 1000));
vm.setRam(512).setBw(1000).setSize(10000);
list.add(vm);
}
Expand All @@ -172,7 +172,7 @@ private List<Cloudlet> createCloudlets() {
final UtilizationModelDynamic utilizationModel = new UtilizationModelDynamic(0.5);

for (int i = 0; i < cloudletsNumber; i++) {
final Cloudlet cloudlet = new CloudletSimple(CLOUDLET_LENGTH, CLOUDLET_CORES, utilizationModel);
final Cloudlet cloudlet = CloudletSimple.of(CLOUDLET_LENGTH, CLOUDLET_CORES, utilizationModel);
cloudlet.setSizes(1024);
list.add(cloudlet);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ private CloudletToVmMappingSolution createInstance() {
UtilizationModel um = UtilizationModel.NULL;
IntStream.range(0, 100).forEach(i
-> result.bindCloudletToVm(
new CloudletSimple(i, 1, 1).setUtilizationModel(um),
new VmSimple(i, new CoreCapacity(1, 1000)))
CloudletSimple.of(i, 1, 1).setUtilizationModel(um),
VmSimple.of(i, new CoreCapacity(1, 1000)))
);

return result;
Expand Down
Loading