X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/66f84edf2502421941eaaa74414323a16979b9ad..a882344bc908a258a991701e226556ec23fd7cd6:/src/surf/disk_s19.cpp

diff --git a/src/surf/disk_s19.cpp b/src/surf/disk_s19.cpp
index 6be25cdf61..e638f1fc58 100644
--- a/src/surf/disk_s19.cpp
+++ b/src/surf/disk_s19.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2022. 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. */
@@ -77,41 +77,37 @@ DiskAction* DiskS19Model::io_start(const DiskImpl* disk, sg_size_t size, s4u::Io
  ************/
 void DiskS19::set_read_bandwidth(double value)
 {
-  read_bw_.peak = value;
-
+  DiskImpl::set_read_bandwidth(value);
   if (get_read_constraint()) {
-    get_model()->get_maxmin_system()->update_constraint_bound(get_read_constraint(), read_bw_.peak * read_bw_.scale);
+    get_model()->get_maxmin_system()->update_constraint_bound(get_read_constraint(), get_read_bandwidth());
   }
 }
 
 void DiskS19::set_write_bandwidth(double value)
 {
-  write_bw_.peak = value;
-
+  DiskImpl::set_write_bandwidth(value);
   if (get_write_constraint()) {
-    get_model()->get_maxmin_system()->update_constraint_bound(get_write_constraint(), write_bw_.peak * write_bw_.scale);
+    get_model()->get_maxmin_system()->update_constraint_bound(get_write_constraint(), get_write_bandwidth());
   }
 }
 
 void DiskS19::set_readwrite_bandwidth(double value)
 {
-  readwrite_bw_ = value;
+  DiskImpl::set_readwrite_bandwidth(value);
   if (get_constraint()) {
-    get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), readwrite_bw_);
+    get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), get_readwrite_bandwidth());
   }
 }
 
 void DiskS19::apply_event(kernel::profile::Event* triggered, double value)
 {
   /* Find out which of my iterators was triggered, and react accordingly */
-  if (triggered == read_bw_.event) {
+  if (triggered == get_read_event()) {
     set_read_bandwidth(value);
-    tmgr_trace_event_unref(&read_bw_.event);
-
-  } else if (triggered == write_bw_.event) {
+    unref_read_event();
+  } else if (triggered == get_write_event()) {
     set_write_bandwidth(value);
-    tmgr_trace_event_unref(&write_bw_.event);
-
+    unref_write_event();
   } else if (triggered == get_state_event()) {
     if (value > 0)
       turn_on();