From e43689c45ad6f395b298fe2eb9a31bc69ef542c9 Mon Sep 17 00:00:00 2001 From: sangorrin Date: Mon, 7 Apr 2008 15:48:20 +0000 Subject: [PATCH] frsh_freelist is now part of utils as fadt_freelist git-svn-id: http://www.frescor.org/private/svn/frescor/fna/trunk@1074 35b4ef3e-fd22-0410-ab77-dab3279adceb --- src_rtep/Makefile | 2 +- src_rtep/rtep_fna_c.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src_rtep/Makefile b/src_rtep/Makefile index a8d0b4e..6d84981 100644 --- a/src_rtep/Makefile +++ b/src_rtep/Makefile @@ -17,6 +17,6 @@ objs: $(OBJS) librtepfna.a: objs @exec echo -e "\n>> Building RTEP FNA:"; @make -C $(PLATFORM_PATH)/drivers/rt-ep librtep - @ar -rc librtepfna.a *.o $(FRSH_PATH)/src_ads/frsh_freelist.o + @ar -rc librtepfna.a *.o @mv librtepfna.a $(FNA_PATH)/lib @exec echo ">> end Building RTEP FNA [OK]" diff --git a/src_rtep/rtep_fna_c.c b/src_rtep/rtep_fna_c.c index 913ac84..8ac5ebe 100644 --- a/src_rtep/rtep_fna_c.c +++ b/src_rtep/rtep_fna_c.c @@ -68,7 +68,7 @@ #include "rtep_bandwith_reservation.h" // for rtep_bwres_* #include "rtep_fna.h" // function prototypes -#include "frsh_freelist.h" +#include "fadt_freelist.h" #if 0 #include @@ -79,7 +79,7 @@ // TODO: add a mutex for concurrent access if necessary static rtep_bwres_vres_t rtep_vres_list[MAX_N_RTEP_BWRES_VRES]; -static frsh_freelist_t rtep_vres_freelist; +static fadt_freelist_t rtep_vres_freelist; ////////////////////////////////////////////////////////////////////// // INITIALIZATION @@ -114,7 +114,7 @@ int rtep_fna_init(const frsh_resource_id_t resource_id) DEBUG("calling freelist_init\n"); // initialize the freelist to handle the rtep_vres - err = frsh_freelist_init(&rtep_vres_freelist, MAX_N_RTEP_BWRES_VRES); + err = fadt_freelist_init(&rtep_vres_freelist, NULL, MAX_N_RTEP_BWRES_VRES); if (err != 0) return -1; DEBUG("calling rtep_bwres_init\n"); @@ -178,7 +178,7 @@ int rtep_fna_contract_negotiate rtep_contract.budget_min = contract->budget_min.tv_sec; // allocate a free internal vres. - pos = frsh_freelist_alloc(&rtep_vres_freelist); + pos = fadt_freelist_alloc(&rtep_vres_freelist); if (pos < 0) { DEBUG("not enough resources\n"); @@ -196,7 +196,7 @@ int rtep_fna_contract_negotiate *vres = (fna_vres_id_t)pos; } else { DEBUG("contract not accepted\n"); - frsh_freelist_free(&rtep_vres_freelist, pos); + fadt_freelist_free(&rtep_vres_freelist, pos); } return accepted; @@ -378,7 +378,7 @@ int rtep_fna_vres_destroy if (err != 0) return -1; // free the element in the rtep_vres list - err = frsh_freelist_free(&rtep_vres_freelist, pos); + err = fadt_freelist_free(&rtep_vres_freelist, pos); if (err != 0) return -1; return 0; -- 2.39.2