X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3b7e5f4b4d7c87ee3e8827313ec966ea8fc8387..3b2cba76f01c60f2dea5ff0b1cb0b30931f90748:/src/surf/disk_s19.cpp diff --git a/src/surf/disk_s19.cpp b/src/surf/disk_s19.cpp index 0f3f4b7423..3d114ccbbb 100644 --- a/src/surf/disk_s19.cpp +++ b/src/surf/disk_s19.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -11,7 +11,7 @@ #include "src/surf/xml/platf.hpp" #include "surf/surf.hpp" -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(disk_kernel); +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_disk); /********* * Model * @@ -31,11 +31,9 @@ DiskS19Model::DiskS19Model() all_existing_models.push_back(this); } -DiskImpl* DiskS19Model::createDisk(const std::string& id, double read_bw, double write_bw) +DiskImpl* DiskS19Model::create_disk() { - XBT_DEBUG("SURF disk create resource\n\t\tid '%s'\n\t\tread_bw '%f'\n", id.c_str(), read_bw); - - return new DiskS19(this, id, get_maxmin_system(), read_bw, write_bw); + return new DiskS19(); } double DiskS19Model::next_occurring_event(double now) @@ -62,12 +60,6 @@ void DiskS19Model::update_actions_state(double /*now*/, double delta) * Resource * ************/ -DiskS19::DiskS19(DiskModel* model, const std::string& name, lmm::System* maxminSystem, double read_bw, double write_bw) - : DiskImpl(model, name, maxminSystem, read_bw, write_bw) -{ - XBT_DEBUG("Create resource with read_bw '%f' write_bw '%f'", read_bw, write_bw); -} - DiskAction* DiskS19::io_start(sg_size_t size, s4u::Io::OpType type) { return new DiskS19Action(get_model(), static_cast(size), not is_on(), this, type);