forb: executable resources and fcb changed into dynamic libs

[frescor/frsh.git] / resources / cluster_tree / frm_cluster_tree.c

diff --git a/resources/cluster_tree/frm_cluster_tree.c b/resources/cluster_tree/frm_cluster_tree.c
index 6d76d6d6c14e380d00006c936a3492472463b08c..edf7a936fa3e0039390d77e9735f085da06e64b0 100644 (file)
--- a/resources/cluster_tree/frm_cluster_tree.c
+++ b/resources/cluster_tree/frm_cluster_tree.c
@@ -96,7 +96,7 @@ int admission_test(struct fres_sa_scenario *scenario, void *priv, bool *schedula
        cum_traffic.length = 0;
        cum_traffic.p_nodes = NULL;
 
-       fres_sa_scenario_for_each_contract(scenario, c) {
+       fres_sa_scenario_for_each_no_cancel_contract(scenario, c) {
                fres_block_cluster_tree_traffic *contract_traffic;
                frsh_rel_time_t deadline;
 
@@ -166,13 +166,10 @@ static const struct fres_res_manager frm = {
 };
 
 
-int main(int argc, char *argv[])
+int forb_main(forb_orb orb, int argc, char *argv[])
 {
-       forb_orb orb;
        int ret;
-
-       orb = forb_init(&argc, &argv, "frm_cluster_tree");
-       if (!orb) error(1, errno, "forb_init");
+       forb_init_attr_t attr = { .orb_id = "org.frescor.frm.cluster_tree" };
 
        fres_block_register_cluster_tree();