From ae65684d04ed77f2328a8f3f10a1c4bea55d5fed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Madon?= <mael.madon@irit.fr>
Date: Tue, 18 Jul 2023 14:34:20 +0200
Subject: [PATCH] refac: rename DMUSerDegrad -> DMUserDegradSpace
---
src/users/broker.cpp | 6 ++--
src/users/user_description_file_template.json | 2 +-
src/users/user_replay.cpp | 10 +++---
src/users/user_replay.hpp | 10 +++---
test/schedconf/dm_user_degrad.json | 33 -------------------
test/test_dm_users.py | 8 ++---
6 files changed, 18 insertions(+), 51 deletions(-)
delete mode 100644 test/schedconf/dm_user_degrad.json
diff --git a/src/users/broker.cpp b/src/users/broker.cpp
index 4e4f917..a9d3b2a 100644
--- a/src/users/broker.cpp
+++ b/src/users/broker.cpp
@@ -130,7 +130,7 @@ Broker::Broker(rapidjson::Document *user_description_file)
/* DM user */
else if (category == "dm_user_reconfig"
- || category == "dm_user_degrad" || category == "dm_user_renonce"
+ || category == "dm_user_degrad_space" || category == "dm_user_renonce"
|| category == "dm_user_delay")
{
PPK_ASSERT_ERROR(dm_window != nullptr,
@@ -141,8 +141,8 @@ Broker::Broker(rapidjson::Document *user_description_file)
if (category == "dm_user_reconfig")
user = new DMUserReconfig(name, param, dm_window);
- else if (category == "dm_user_degrad")
- user = new DMUserDegrad(name, param, dm_window);
+ else if (category == "dm_user_degrad_space")
+ user = new DMUserDegradSpace(name, param, dm_window);
else if (category == "dm_user_renonce")
user = new DMUserRenonce(name, param, dm_window);
diff --git a/src/users/user_description_file_template.json b/src/users/user_description_file_template.json
index 3b4c185..570941a 100644
--- a/src/users/user_description_file_template.json
+++ b/src/users/user_description_file_template.json
@@ -47,7 +47,7 @@
},
{
"name": "francois",
- "category": "dm_user_degrad",
+ "category": "dm_user_degrad_space",
"param": {
"input_json": "francois.json"
diff --git a/src/users/user_replay.cpp b/src/users/user_replay.cpp
index 082264a..d341107 100644
--- a/src/users/user_replay.cpp
+++ b/src/users/user_replay.cpp
@@ -179,15 +179,15 @@ void DMUserReconfig::jobs_to_submit(double date,
ReplayUser::jobs_to_submit(date, jobs, profiles);
}
-/* DMUserDegrad */
-DMUserDegrad::DMUserDegrad(
+/* DMUserDegradSpace */
+DMUserDegradSpace::DMUserDegradSpace(
std::string name, const rapidjson::Value ¶m, DMWindow *window)
{
dm_window = window;
init_ReplayUser(name, param);
}
-DMUserDegrad::~DMUserDegrad()
+DMUserDegradSpace::~DMUserDegradSpace()
{
if (original_trace)
{
@@ -196,7 +196,7 @@ DMUserDegrad::~DMUserDegrad()
}
}
-void DMUserDegrad::jobs_to_submit(double date, std::list<shared_ptr<Job>> &jobs,
+void DMUserDegradSpace::jobs_to_submit(double date, std::list<shared_ptr<Job>> &jobs,
std::list<const Profile *> &profiles)
{
ReplayUser::jobs_to_submit(date, jobs, profiles);
@@ -264,7 +264,7 @@ bool DMUserReconfig::handle_job(
return rigid_job(job, profile, this, -1.0);
}
-bool DMUserDegrad::handle_job(
+bool DMUserDegradSpace::handle_job(
double date, shared_ptr<Job> job, Profile *profile)
{
if (!dm_window->date_in_dm_window(date))
diff --git a/src/users/user_replay.hpp b/src/users/user_replay.hpp
index 4a9b447..99c42d8 100644
--- a/src/users/user_replay.hpp
+++ b/src/users/user_replay.hpp
@@ -106,18 +106,18 @@ protected:
/**
* @brief The user follows the input trace in a rigid fashion, except in the
- * demand response window where she degrades the submitted jobs.
- * @details The degradation consists in dividing the number of cores requested
+ * demand response window where she degrades spatially the submitted jobs.
+ * @details The spatial degradation consists in dividing the number of cores requested
* by two (rounded up), keeping the original submission time. Note: if the
* original number of cores requested was 1, degrad is equivalent to rigid, and
* will appear as such in the logs.
*/
-class DMUserDegrad : virtual public ReplayUser
+class DMUserDegradSpace : virtual public ReplayUser
{
public:
- DMUserDegrad(
+ DMUserDegradSpace(
std::string name, const rapidjson::Value ¶m, DMWindow *dm_window);
- ~DMUserDegrad();
+ ~DMUserDegradSpace();
long next_submission();
void jobs_to_submit(double date, std::list<shared_ptr<Job>> &jobs,
std::list<const Profile *> &profiles);
diff --git a/test/schedconf/dm_user_degrad.json b/test/schedconf/dm_user_degrad.json
deleted file mode 100644
index 73bd26d..0000000
--- a/test/schedconf/dm_user_degrad.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "dm_window": [200000, 300000],
- "users": [
- {
- "name": "user14",
- "category": "dm_user_degrad",
- "param": {
- "input_json": "test/workloads/dyn/user14.json"
- }
- },
- {
- "name": "user15",
- "category": "dm_user_degrad",
- "param": {
- "input_json": "test/workloads/dyn/user15.json"
- }
- },
- {
- "name": "user16",
- "category": "dm_user_degrad",
- "param": {
- "input_json": "test/workloads/dyn/user16.json"
- }
- },
- {
- "name": "user18",
- "category": "dm_user_degrad",
- "param": {
- "input_json": "test/workloads/dyn/user18.json"
- }
- }
- ]
-}
\ No newline at end of file
diff --git a/test/test_dm_users.py b/test/test_dm_users.py
index b7c07e2..6ced863 100644
--- a/test/test_dm_users.py
+++ b/test/test_dm_users.py
@@ -8,7 +8,7 @@ two_machine_platform = Platform(name='two_machine_platform', filename='test/plat
users = [
"dm_user_reconfig",
- "dm_user_degrad",
+ "dm_user_degrad_space",
"dm_user_renonce",
"dm_user_delay",
"dm_user_multi_behavior",
@@ -32,9 +32,9 @@ def test_dm_user_reconfig(platform_multiC):
""" Test user_class dm_user_reconfig as described in the file schedconf/dm_user_reconfig"""
run_user("dm_user_reconfig", platform_multiC)
-def test_dm_user_degrad(platform_multiC):
- """ Test user_class dm_user_degrad as described in the file schedconf/dm_user_degrad"""
- run_user("dm_user_degrad", platform_multiC)
+def test_dm_user_degrad_space(platform_multiC):
+ """ Test user_class dm_user_degrad_space as described in the file schedconf/dm_user_degrad_space"""
+ run_user("dm_user_degrad_space", platform_multiC)
def test_speedup():
""" Test user_class dm_user_reconfig alpha speedup as described in the file schedconf/reconfig_alpha.json"""
--
GitLab