#105: renaming HTCondorService to HTCondorComputeService

wrench-project · May 27, 2019 · be0ec50 · be0ec50
1 parent 33de6c4
commit be0ec50
Show file tree

Hide file tree

Showing 7 changed files with 268 additions and 266 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -83,6 +83,8 @@ set(HEADER_FILES
         include/wrench/services/compute/htcondor/HTCondorCentralManagerServiceMessage.h
         include/wrench/services/compute/htcondor/HTCondorCentralManagerServiceMessagePayload.h
         include/wrench/services/compute/htcondor/HTCondorNegotiatorService.h
+        include/wrench/services/compute/htcondor/HTCondorComputeServiceProperty.h
+        include/wrench/services/compute/htcondor/HTCondorComputeServiceMessagePayload.h
         include/wrench/services/storage/StorageService.h
         include/wrench/services/storage/StorageServiceProperty.h
         include/wrench/services/storage/StorageServiceMessagePayload.h

diff --git a/doc/guide/htcondor.md b/doc/guide/htcondor.md
@@ -23,14 +23,14 @@ daemons (including initialization and completion).
 HTCondor is composed of a pool of resources in which jobs are submitted to
 perform their computation. In WRENCH, an HTCondor service represents a 
 compute service (`wrench::ComputeService`), which is defined by the 
-`wrench::HTCondorService` class. An instantiation of an HTCondor 
+`wrench::HTCondorComputeService` class. An instantiation of an HTCondor 
 service requires the following parameters:
 
 - A hostname on which to start the service;
 - The HTCondor pool name;
 - A `std::set` of `wrench::ComputeService` available to the HTCondor pool; and
-- A `std::map` of properties (`wrench::HTCondorServiceProperty`) and message 
-  payloads (`wrench::HTCondorServiceMessagePayload`).
+- A `std::map` of properties (`wrench::HTCondorComputeServiceProperty`) and message 
+  payloads (`wrench::HTCondorComputeServiceMessagePayload`).
 
 The set of compute services may represent any computing instance natively 
 provided by WRENCH (e.g., bare-metal servers, cloud platforms, batch-scheduled
@@ -54,10 +54,10 @@ compute_services.insert(new wrench::BareMetalComputeService(
           100000000000.0));
 
 auto compute_service = simulation->add(
-          new wrench::HTCondorService(hostname, 
+          new wrench::HTCondorComputeService(hostname, 
                                       "local", 
                                       std::move(compute_services),
-                                      {{wrench::HTCondorServiceProperty::SUPPORTS_PILOT_JOBS, "false"}}
+                                      {{wrench::HTCondorComputeServiceProperty::SUPPORTS_PILOT_JOBS, "false"}}
                                       ));
 ~~~~~~~~~~~~~
 
@@ -85,7 +85,7 @@ WRENCH HTCondor service implementation spawns two additional services during
 execution: wrench::HTCondorCentralManagerService and wrench::HTCondorNegotiatorService.
 
 The wrench::HTCondorCentralManagerService coordinates the execution of jobs
-submitted to the HTCondor pool. Jobs submitted to the wrench::HTCondorService
+submitted to the HTCondor pool. Jobs submitted to the wrench::HTCondorComputeService
 are then queued in a `std::vector<wrench::StandardJob *>`, which are then 
 consumed as resources become available. The Central Manager also spawns the
 execution of the wrench::HTCondorNegotiatorService, which performs matchmaking

diff --git a/include/wrench.h b/include/wrench.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017-2018. The WRENCH Team.
+ * Copyright (c) 2017-2019. The WRENCH Team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 #include "wrench/services/compute/batch/BatchComputeService.h"
 #include "wrench/services/compute/batch/BatchComputeServiceProperty.h"
 #include "wrench/services/compute/htcondor/HTCondorComputeService.h"
-#include "wrench/services/compute/htcondor/HTCondorServiceProperty.h"
+#include "wrench/services/compute/htcondor/HTCondorComputeServiceProperty.h"
 #include "wrench/services/network_proximity/NetworkProximityService.h"
 #include "wrench/services/network_proximity/NetworkProximityServiceProperty.h"
 

diff --git a/include/wrench/services/compute/htcondor/HTCondorComputeService.h b/include/wrench/services/compute/htcondor/HTCondorComputeService.h
@@ -13,8 +13,8 @@
 #include "wrench/services/compute/ComputeServiceMessage.h"
 #include "wrench/services/compute/ComputeService.h"
 #include "wrench/services/compute/htcondor/HTCondorCentralManagerService.h"
-#include "wrench/services/compute/htcondor/HTCondorServiceProperty.h"
-#include "wrench/services/compute/htcondor/HTCondorServiceMessagePayload.h"
+#include "wrench/services/compute/htcondor/HTCondorComputeServiceProperty.h"
+#include "wrench/services/compute/htcondor/HTCondorComputeServiceMessagePayload.h"
 #include "wrench/workflow/job/PilotJob.h"
 #include "wrench/workflow/job/StandardJob.h"
 
@@ -27,19 +27,19 @@ namespace wrench {
     class HTCondorComputeService : public ComputeService {
     private:
         std::map<std::string, std::string> default_property_values = {
-                {HTCondorServiceProperty::SUPPORTS_PILOT_JOBS,    "true"},
-                {HTCondorServiceProperty::SUPPORTS_STANDARD_JOBS, "true"}
+                {HTCondorComputeServiceProperty::SUPPORTS_PILOT_JOBS,    "true"},
+                {HTCondorComputeServiceProperty::SUPPORTS_STANDARD_JOBS, "true"}
         };
 
         std::map<std::string, double> default_messagepayload_values = {
-                {HTCondorServiceMessagePayload::STOP_DAEMON_MESSAGE_PAYLOAD,                  1024},
-                {HTCondorServiceMessagePayload::DAEMON_STOPPED_MESSAGE_PAYLOAD,               1024},
-                {HTCondorServiceMessagePayload::RESOURCE_DESCRIPTION_REQUEST_MESSAGE_PAYLOAD, 1024},
-                {HTCondorServiceMessagePayload::RESOURCE_DESCRIPTION_ANSWER_MESSAGE_PAYLOAD,  1024},
-                {HTCondorServiceMessagePayload::SUBMIT_STANDARD_JOB_REQUEST_MESSAGE_PAYLOAD,  512000000},
-                {HTCondorServiceMessagePayload::SUBMIT_STANDARD_JOB_ANSWER_MESSAGE_PAYLOAD,   1024},
-                {HTCondorServiceMessagePayload::SUBMIT_PILOT_JOB_REQUEST_MESSAGE_PAYLOAD,     1024},
-                {HTCondorServiceMessagePayload::SUBMIT_PILOT_JOB_ANSWER_MESSAGE_PAYLOAD,      1024}
+                {HTCondorComputeServiceMessagePayload::STOP_DAEMON_MESSAGE_PAYLOAD,                  1024},
+                {HTCondorComputeServiceMessagePayload::DAEMON_STOPPED_MESSAGE_PAYLOAD,               1024},
+                {HTCondorComputeServiceMessagePayload::RESOURCE_DESCRIPTION_REQUEST_MESSAGE_PAYLOAD, 1024},
+                {HTCondorComputeServiceMessagePayload::RESOURCE_DESCRIPTION_ANSWER_MESSAGE_PAYLOAD,  1024},
+                {HTCondorComputeServiceMessagePayload::SUBMIT_STANDARD_JOB_REQUEST_MESSAGE_PAYLOAD,  512000000},
+                {HTCondorComputeServiceMessagePayload::SUBMIT_STANDARD_JOB_ANSWER_MESSAGE_PAYLOAD,   1024},
+                {HTCondorComputeServiceMessagePayload::SUBMIT_PILOT_JOB_REQUEST_MESSAGE_PAYLOAD,     1024},
+                {HTCondorComputeServiceMessagePayload::SUBMIT_PILOT_JOB_ANSWER_MESSAGE_PAYLOAD,      1024}
         };
 
     public:

diff --git a/.../htcondor/HTCondorServiceMessagePayload.h → ...or/HTCondorComputeServiceMessagePayload.h b/.../htcondor/HTCondorServiceMessagePayload.h → ...or/HTCondorComputeServiceMessagePayload.h
@@ -1,14 +1,14 @@
 /**
- * Copyright (c) 2017-2018. The WRENCH Team.
+ * Copyright (c) 2017-2019. The WRENCH Team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  */
 
-#ifndef WRENCH_HTCONDORSERVICEMESSAGEPAYLOAD_H
-#define WRENCH_HTCONDORSERVICEMESSAGEPAYLOAD_H
+#ifndef WRENCH_HTCONDORCOMPUTESERVICEMESSAGEPAYLOAD_H
+#define WRENCH_HTCONDORCOMPUTESERVICEMESSAGEPAYLOAD_H
 
 #include "wrench/services/compute/ComputeServiceMessagePayload.h"
 
@@ -17,9 +17,9 @@ namespace wrench {
     /**
      * @brief Configurable message payloads for an HTCondorService
      */
-    class HTCondorServiceMessagePayload : public ComputeServiceMessagePayload {
+    class HTCondorComputeServiceMessagePayload : public ComputeServiceMessagePayload {
 
     };
 }
 
-#endif //WRENCH_HTCONDORSERVICEMESSAGEPAYLOAD_H
+#endif //WRENCH_HTCONDORCOMPUTESERVICEMESSAGEPAYLOAD_H
diff --git a/...ompute/htcondor/HTCondorServiceProperty.h → ...htcondor/HTCondorComputeServiceProperty.h b/...ompute/htcondor/HTCondorServiceProperty.h → ...htcondor/HTCondorComputeServiceProperty.h
@@ -1,14 +1,14 @@
 /**
- * Copyright (c) 2017-2018. The WRENCH Team.
+ * Copyright (c) 2017-2019. The WRENCH Team.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  */
 
-#ifndef WRENCH_HTCONDORSERVICEPROPERTY_H
-#define WRENCH_HTCONDORSERVICEPROPERTY_H
+#ifndef WRENCH_HTCONDORCOMPUTESERVICEPROPERTY_H
+#define WRENCH_HTCONDORCOMPUTESERVICEPROPERTY_H
 
 #include "wrench/services/compute/ComputeServiceProperty.h"
 
@@ -17,11 +17,11 @@ namespace wrench {
     /**
      * @brief Properties for an HTCondor service
      */
-    class HTCondorServiceProperty : public ComputeServiceProperty {
+    class HTCondorComputeServiceProperty : public ComputeServiceProperty {
 
     public:
 
     };
 }
 
-#endif //WRENCH_HTCONDORSERVICEPROPERTY_H
+#endif //WRENCH_HTCONDORCOMPUTESERVICEPROPERTY_H