Updated to rename of resource scheduler to allocator

diff --git a/fwp/lib/frsh_fwp/Makefile.omk b/fwp/lib/frsh_fwp/Makefile.omk
index bdb51bbc625233dba272d7e66dbf2cc9a1a6dcef..c59ef13f2f95c241627a4deea460037d71b755b0 100644 (file)
--- a/fwp/lib/frsh_fwp/Makefile.omk
+++ b/fwp/lib/frsh_fwp/Makefile.omk
@@ -1,7 +1,7 @@
 shared_LIBRARIES = frsh_fwp
 CFLAGS += -D_FWP_INTERNALS_
-frsh_fwp_SOURCES += fwp_fna.c fwp_frs.c fwp_block.c
+frsh_fwp_SOURCES += fwp_fna.c fwp_fra.c fwp_block.c
 include_HEADERS= fwp_res.h fwp_fna.h 
 frsh_fwp_CLIENT_IDL += fwp_idl.idl
 include_GEN_HEADERS= fwp_idl.h
-lib_LOADLIBES+= fna frs 
+lib_LOADLIBES+= fna fra 

diff --git a/fwp/lib/frsh_fwp/fwp_fna.c b/fwp/lib/frsh_fwp/fwp_fna.c
index 053c9544b3f05dd85a19187ec60e92cb17d331b6..9abdf001c005e852031342b705380e24a9ef50ce 100644 (file)
--- a/fwp/lib/frsh_fwp/fwp_fna.c
+++ b/fwp/lib/frsh_fwp/fwp_fna.c
@@ -13,8 +13,8 @@ int fwp_fna_init(const frsh_resource_id_t resource_id)
        if ((rv = fwp_init()))
                return rv;
 
-       return frs_fwp_init(frsh_forb_global.orb, frsh_forb_global.fcb,
-                               &frsh_forb_global.sch_executor);
+       return fra_fwp_init(frsh_forb_global.orb, frsh_forb_global.fcb,
+                               &frsh_forb_global.alloc_executor);
 }
 
 int fwp_fna_network_budget_to_bytes(const frsh_resource_id_t resource_id,

diff --git a/fwp/lib/frsh_fwp/fwp_frs.c b/fwp/lib/frsh_fwp/fwp_fra.c
similarity index 86%
rename from fwp/lib/frsh_fwp/fwp_frs.c
rename to fwp/lib/frsh_fwp/fwp_fra.c
index 274d2b42a7f0a044e09d0aad1d6899f8f8acb483..e1ec819c5ba9c3b04b4ea22c90f5d9160f71454d 100644 (file)
--- a/fwp/lib/frsh_fwp/fwp_frs.c
+++ b/fwp/lib/frsh_fwp/fwp_fra.c
@@ -1,5 +1,5 @@
 #include <ul_log.h>
-#include <frs_generic.h>
+#include <fra_generic.h>
 #include <fwp.h>
 //#include <fwp_fna.h>
 #include <frsh_distributed.h>
@@ -8,8 +8,8 @@
 #include <stdio.h>
 
 
-UL_LOG_CUST(ulogd_frs_fwp);
-ul_log_domain_t ulogd_frs_fwp = {UL_LOGL_MSG, "frs_fwp"};
+UL_LOG_CUST(ulogd_fra_fwp);
+ul_log_domain_t ulogd_fra_fwp = {UL_LOGL_MSG, "fra_fwp"};
 
 static int create_vres(fres_vres_t *vres, void *priv)
 {
@@ -64,7 +64,7 @@ int change_vres(fres_vres_t *vres, void *priv)
        return 0;
 }
 
-static struct fres_scheduler fwp_scheduler = {
+static struct fres_allocator fwp_allocator = {
        .res_type = FRSH_RT_NETWORK,
        .res_id = FRSH_NETPF_FWP,
        .create_vres = create_vres,
@@ -73,8 +73,8 @@ static struct fres_scheduler fwp_scheduler = {
        .priv = NULL
 };
 
-int frs_fwp_init(forb_orb orb, fres_contract_broker fcb, forb_executor_t *executor)
+int fra_fwp_init(forb_orb orb, fres_contract_broker fcb, forb_executor_t *executor)
 {
        fres_block_register_fwp();
-       return frs_register(orb, fcb, executor, &fwp_scheduler);
+       return fra_register(orb, fcb, executor, &fwp_allocator);
 }

diff --git a/fwp/lib/frsh_fwp/fwp_res.h b/fwp/lib/frsh_fwp/fwp_res.h
index 3eedd9883313d6e9e761dcd43982ba27e0663661..7e197c4903d99a566750a02f598e0d6f843582a3 100644 (file)
--- a/fwp/lib/frsh_fwp/fwp_res.h
+++ b/fwp/lib/frsh_fwp/fwp_res.h
@@ -6,7 +6,7 @@
 #include <frsh_distributed.h>
 #include "fwp_idl.h"
 
-int frs_fwp_init(forb_orb orb, fres_contract_broker fcb, forb_executor_t *executor);
+int fra_fwp_init(forb_orb orb, fres_contract_broker fcb, forb_executor_t *executor);
 int fres_block_register_fwp();
 
 #endif /* FWP_RES_H */