From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Wed, 10 Dec 2008 09:33:50 +0000 (+0100)
Subject: fwpmngr displays budgets in bytes
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/frescor/fwp.git/commitdiff_plain/b51160c78844ac9fe175ec27ac50c5e813a81759

fwpmngr displays budgets in bytes
---

diff --git a/fwp/mngr/fwp_admctrl.c b/fwp/mngr/fwp_admctrl.c
index d42ea1b..889f845 100644
--- a/fwp/mngr/fwp_admctrl.c
+++ b/fwp/mngr/fwp_admctrl.c
@@ -168,13 +168,13 @@ int fwp_admctrl_utilization(struct fres_sa_scenario *scenario, void *priv,
 		fres_contract_id_to_string(id, &c->contract->id, sizeof(id));
 		basic = fres_contract_get_basic(c->contract);
 
-		printf("  processing: id=%s, period=%ld ms, budget=%ld ms\n",
+		frsh_network_budget_to_bytes(FRSH_NETPF_FWP,&basic->budget,&bytes);
+		printf("  processing: id=%s, period=%ld ms, budget=%lu bytes\n",
 		       id,
 		       fosa_rel_time_to_msec(basic->period),
-		       fosa_rel_time_to_msec(basic->budget));
+		       (long unsigned int)bytes);
 
 		/* Calculate protocol overhead */
-		frsh_network_budget_to_bytes(FRSH_NETPF_FWP,&basic->budget,&bytes);
 		fragments = (bytes + MTU - 1) / MTU;
 
 		if (fragments == 0)
diff --git a/fwp/mngr/fwp_mngr.c b/fwp/mngr/fwp_mngr.c
index 02925dd..0261c34 100644
--- a/fwp/mngr/fwp_mngr.c
+++ b/fwp/mngr/fwp_mngr.c
@@ -54,6 +54,7 @@
 #include <stdio.h>
 #include "fwp_admctrl.h"
 
+static
 int dummy_admission_test(struct fres_sa_scenario *scenario, void *priv, 
 				bool *schedulable)
 {