Added utilization based admission test - needed to be modified.

[frescor/fwp.git] / fwp / mngr / fwp_mngr.c

diff --git a/fwp/mngr/fwp_mngr.c b/fwp/mngr/fwp_mngr.c
index b8f01a5ea8aa9592765b2ed4a5e19eb4f230344b..39ca31de7dafa785bf6bdba7432765843e367195 100644 (file)
--- a/fwp/mngr/fwp_mngr.c
+++ b/fwp/mngr/fwp_mngr.c
@@ -9,19 +9,12 @@
 #include "res_dummy.h"
 #include <stdio.h>
 
-struct dummy_data {
-       int some_data;
-};
-
-
-bool admission_test(struct fres_sa_scenario *scenario, void *priv)
+int dummy_admission_test(struct fres_sa_scenario *scenario, void *priv, 
+                               bool *schedulable)
 {
-       bool schedulable;
-       struct dummy_data *data = priv;
        struct fres_sa_contract *c;
 
-       printf("Admission test:\n");
-       data->some_data++;
+       printf("Dummy admission test:\n");
 
        fres_sa_scenario_for_each_contract(scenario, c) {
                fres_block_basic *basic;
@@ -35,19 +28,17 @@ bool admission_test(struct fres_sa_scenario *scenario, void *priv)
                       fosa_rel_time_to_msec(basic->budget));
 
        }
-       schedulable = scenario->num_contracts <= 3;
+       *schedulable = scenario->num_contracts <= 3;
        printf("=> %s\n", schedulable?"schedulable":"not schedulable");
                
-       return schedulable;
+       return 0;
 }
 
-struct dummy_data dummy_data;
-
 static const struct fres_res_manager frm = {
        .res_type = FRSH_RT_NETWORK,
        .res_id = FRSH_NETPF_FWP,
-       .admission_test = admission_test,
-       .priv = &dummy_data
+       .admission_test = dummy_admission_test,
+       .priv = NULL
 };
 
 int main(int argc, char *argv[])