Dummy resource verbosity in now configurable

diff --git a/resources/dummy/Makefile.omk b/resources/dummy/Makefile.omk
index c9b8511bae599a27dc4ec0e9f63ca757ee2b8e8b..afbebe7f871c8579b67e715da94fe6c77e70d2aa 100644 (file)
--- a/resources/dummy/Makefile.omk
+++ b/resources/dummy/Makefile.omk
@@ -1,4 +1,6 @@
-default_CONFIG = CONFIG_RESOURCE_DUMMY=y
+default_CONFIG += CONFIG_RESOURCE_DUMMY=y
+default_CONFIG += CONFIG_RESOURCE_DUMMY_VERBOSE=y
+LOCAL_CONFIG_H = dummy_config.h
 
 bin_PROGRAMS = frm_dummy
 frm_dummy_SOURCES = frm_dummy.c dummy_block.c

diff --git a/resources/dummy/fra_dummy.c b/resources/dummy/fra_dummy.c
index e72ddb9a0b04b7c17e3c44caafd7036f639017be..3cd43a1b028083093beafc960190dfeefe37b832 100644 (file)
--- a/resources/dummy/fra_dummy.c
+++ b/resources/dummy/fra_dummy.c
@@ -59,6 +59,7 @@
 #include <fra_generic.h>
 #include "res_dummy.h"
 #include <stdio.h>
+#include "dummy_config.h"
 
 
 UL_LOG_CUST(ulogd_frs_dummy);
@@ -76,11 +77,13 @@ static int create_vres(fres_vres_t *vres, void *priv)
        fres_contract_id_to_string(id, &vres->id, sizeof(id));
        basic = fres_contract_get_basic(vres->new);
        dummy_sched = fres_contract_get_dummy_sched(vres->new);
+#ifdef CONFIG_RESOURCE_DUMMY_VERBOSE
        printf("Creating VRes #%d (id=%s, period=%ld ms, budget=%ld ms, priority=%d)\n",
               *my_data, id,
               fosa_rel_time_to_msec(basic->period),
               fosa_rel_time_to_msec(basic->budget),
               dummy_sched ? dummy_sched->priority : -1);
+#endif
        return 0;
 }
 
@@ -94,13 +97,13 @@ static int cancel_vres(fres_vres_t *vres, void *priv)
        fres_contract_id_to_string(id, &vres->id, sizeof(id));
        basic = fres_contract_get_basic(vres->allocated);
        dummy_sched = fres_contract_get_dummy_sched(vres->allocated);
-       
+#ifdef CONFIG_RESOURCE_DUMMY_VERBOSE   
        printf("Canceling VRes #%d (id=%s, period=%ld ms, budget=%ld ms, priority=%d)\n",
               *my_data, id,
               fosa_rel_time_to_msec(basic->period),
               fosa_rel_time_to_msec(basic->budget),
               dummy_sched ? dummy_sched->priority : 999);
-
+#endif
        (*my_data)--;
        return 0;
 }

diff --git a/resources/dummy/frm_dummy.c b/resources/dummy/frm_dummy.c
index ed6e3e5b4cb30e4afac028c2c3489a5ab8675294..fafc3060f1a4adb25a2101dec444ec282e3547f9 100644 (file)
--- a/resources/dummy/frm_dummy.c
+++ b/resources/dummy/frm_dummy.c
@@ -64,6 +64,7 @@
 #include <ul_log.h>
 #include "res_dummy.h"
 #include <stdio.h>
+#include "dummy_config.h"
 
 struct dummy_data {
        int some_data;
@@ -75,7 +76,9 @@ int admission_test(struct fres_sa_scenario *scenario, void *priv, bool *schedula
        struct fres_sa_contract *c;
        int ret;
 
+#ifdef CONFIG_RESOURCE_DUMMY_VERBOSE   
        printf("Admission test:\n");
+#endif
        data->some_data++;
 
        fres_sa_scenario_for_each_contract(scenario, c) {
@@ -102,16 +105,18 @@ int admission_test(struct fres_sa_scenario *scenario, void *priv, bool *schedula
                                return -1;
                        }
                }
-
+#ifdef CONFIG_RESOURCE_DUMMY_VERBOSE   
                printf("  %s contract: id=%s, period=%ld ms, budget=%ld ms, priority=%d\n",
                       c->contract == c->new ? "new" : "old", id,
                       fosa_rel_time_to_msec(basic->period),
                       fosa_rel_time_to_msec(basic->budget), dummy_sched->priority);
-
+#endif
 
        }
        *schedulable = scenario->num_contracts <= 3;
+#ifdef CONFIG_RESOURCE_DUMMY_VERBOSE   
        printf("=> %s\n", *schedulable?"schedulable":"not schedulable");
+#endif
                
        return 0;
 }