X-Git-Url: http://rtime.felk.cvut.cz/gitweb/frescor/fna.git/blobdiff_plain/ff14c3a38ad29e8617c11fc8f3868cc144eee318..134806f7924a468e3ebef661f39ae7bc50aa4ad3:/src_frescan/frescan_bwres_analysis.h

diff --git a/src_frescan/frescan_bwres_analysis.h b/src_frescan/frescan_bwres_analysis.h
index e932601..8b721bb 100644
--- a/src_frescan/frescan_bwres_analysis.h
+++ b/src_frescan/frescan_bwres_analysis.h
@@ -74,21 +74,21 @@
 #ifndef _FRESCAN_BWRES_ANALYSIS_H_
 #define _FRESCAN_BWRES_ANALYSIS_H_
 
-#include "frescan.h"
-#include "frescan_data.h"
+#include "frescan_types.h"
 
 /**
- * frescan_sa_init() - init the scenario
+ * frescan_bwres_sa_init() - init the scenario
  *
  * @scenario: the scenario (in out)
  * @params: init params (in)
  */
 
-extern int frescan_sa_init(frescan_sa_scenario_t *scenario,
-                           const frescan_sa_init_params_t *params);
+extern int frescan_bwres_sa_init
+                          (frescan_bwres_sa_scenario_t *scenario,
+                           const frescan_bwres_sa_init_params_t *params);
 
 /**
- * frescan_sa_add_contract() - add a contract to the scenario
+ * frescan_bwres_sa_add_contract() - add a contract to the scenario
  *
  * @scenario: the scenario (in out)
  * @ss: the preallocated ss identificator (in)
@@ -96,13 +96,14 @@ extern int frescan_sa_init(frescan_sa_scenario_t *scenario,
  * @contract: the new contract (in)
  */
 
-extern int frescan_sa_add_contract(frescan_sa_scenario_t *scenario,
+extern int frescan_bwres_sa_add_contract
+                                  (frescan_bwres_sa_scenario_t *scenario,
                                    frescan_ss_t          ss,
                                    frescan_node_t        node,
                                    const frsh_contract_t *contract);
 
 /**
- * frescan_sa_update_contract() - update a contract in the scenario
+ * frescan_bwres_sa_update_contract() - update a contract in the scenario
  *
  * @scenario: the scenario (in out)
  * @ss: the ss identificator (in)
@@ -112,40 +113,45 @@ extern int frescan_sa_add_contract(frescan_sa_scenario_t *scenario,
  *                no contract is returned (out)
  */
 
-extern int frescan_sa_update_contract(frescan_sa_scenario_t  *scenario,
+extern int frescan_bwres_sa_update_contract
+                                     (frescan_bwres_sa_scenario_t  *scenario,
                                       frescan_ss_t           ss,
                                       frescan_node_t         node,
                                       const frsh_contract_t  *contract,
                                       frsh_contract_t        *old_contract);
 
 /**
- * frescan_sa_remove_contract() - remove a contract from the scenario
+ * frescan_bwres_sa_remove_contract() - remove a contract from the scenario
  *
  * @scenario: the scenario (in out)
  * @ss: the ss to remove (in)
  * @node: the node this contract belongs to (in)
+ * @contract: if not null, returns a copy of the contract (out)
  */
 
-extern int frescan_sa_remove_contract(frescan_sa_scenario_t *scenario,
-                                      frescan_ss_t          ss,
-                                      frescan_node_t        node);
+extern int frescan_bwres_sa_remove_contract
+                                     (frescan_bwres_sa_scenario_t *scenario,
+                                      frescan_ss_t                ss,
+                                      frescan_node_t              node,
+                                      frsh_contract_t             *contract);
 
 /**
- * frescan_sa_sched_test() - perform a scheduling test on the scenario
+ * frescan_bwres_sa_sched_test() - perform a scheduling test on the scenario
  *
  * @scenario: the scenario (in out)
  * @is_schedulable: if the scenario is schedulable or not (out)
  */
 
-extern int frescan_sa_sched_test(frescan_sa_scenario_t *scenario,
-                                 bool *is_schedulable);
+extern int frescan_bwres_sa_sched_test(frescan_bwres_sa_scenario_t *scenario,
+                                       bool *is_schedulable);
 
 /**
- * frescan_sa_spare_capacity() - distribute the spare capacity
+ * frescan_bwres_sa_spare_capacity() - distribute the spare capacity
  *
  * @scenario: the scenario (in out)
  */
 
-extern int frescan_sa_spare_capacity(frescan_sa_scenario_t *scenario);
+extern int frescan_bwres_sa_spare_capacity
+                (frescan_bwres_sa_scenario_t *scenario);
 
 #endif // _FRESCAN_BWRES_ANALYSIS_H_