debugging messages

git-svn-id: http://www.frescor.org/private/svn/frescor/fna/trunk@1445 35b4ef3e-fd22-0410-ab77-dab3279adceb

diff --git a/src_frescan/frescan_bwres.c b/src_frescan/frescan_bwres.c
index f2b0035721708d47d251f55bafbb2f4d264c1cde..43546026dbea09835f1065b53f42b31b3be23274 100644 (file)
--- a/src_frescan/frescan_bwres.c
+++ b/src_frescan/frescan_bwres.c
@@ -136,11 +136,12 @@ int frescan_bwres_init(frescan_network_t net)
                     neg_msg_ss_id = (frescan_ss_t)ret;
 
                     DEBUG(FRESCAN_BWRES_ENABLE_DEBUG,
-                          "manager contract node:%u b:(%d,%d) t:(%d,%d) p:%u\n",
+                          "manager node:%u b:(%d,%d) t:(%d,%d) p:%u ss:%u\n",
                           node,
                           neg_msgs_budget.tv_sec, neg_msgs_budget.tv_nsec,
                           neg_msgs_period.tv_sec, neg_msgs_period.tv_nsec,
-                          FRESCAN_BWRES_NEG_MSG_PRIO);
+                          FRESCAN_BWRES_NEG_MSG_PRIO,
+                          neg_msg_ss_id);
 
                     ret = frescan_bwres_sa_add_contract
                                     (&frescan_data[net].scenario,

diff --git a/src_frescan/frescan_bwres_fna.c b/src_frescan/frescan_bwres_fna.c
index 40bad3396c304bd37b1ad5bc69759eeee814ec33..ff62a4f97c4d2641e0736db7b06d822ad5fab0c1 100644 (file)
--- a/src_frescan/frescan_bwres_fna.c
+++ b/src_frescan/frescan_bwres_fna.c
@@ -101,7 +101,7 @@ int frescan_fna_init(const frsh_resource_id_t resource_id)
 
         // TODO: resource_id must be relative or sth
         // TODO: init_params must be configurable
-        init_params.net = (frescan_network_t)resource_id;
+        init_params.net = 0; // (frescan_network_t)resource_id;
         init_params.node = (frescan_node_t)FRSH_CPU_ID_DEFAULT;
         init_params.tx_fp_max_prio = 10;
         init_params.rx_num_of_channels = 10;

diff --git a/src_frescan/frescan_bwres_messages.c b/src_frescan/frescan_bwres_messages.c
index 63c1493b5eb028eff0fa7ee4c282716136a1badc..9af251c28a2ca1c29c915a3390f4fc7965a2b41f 100644 (file)
--- a/src_frescan/frescan_bwres_messages.c
+++ b/src_frescan/frescan_bwres_messages.c
@@ -641,7 +641,8 @@ static int frescan_rep_gn_message_to_request
                 if (ret != 0) return ret;
 
                 if (ss != data->ss_new->ss[data->ss_new->size]) {
-                        FRESCAN_ERROR("ss from master != ss created\n");
+                        FRESCAN_ERROR("ss from master(%u) != ss created(%u)\n",
+                                      data->ss_new->ss[data->ss_new->size], ss);
                         return -1;
                 }
 

diff --git a/src_frescan/frescan_bwres_threads.c b/src_frescan/frescan_bwres_threads.c
index b72827f2480f158eb0ad02e1558241133da0135a..9ccf58af8606d1f88076dad445f939dc4d758517 100644 (file)
--- a/src_frescan/frescan_bwres_threads.c
+++ b/src_frescan/frescan_bwres_threads.c
@@ -333,6 +333,11 @@ static void frescan_manager_gn_prepare_scenario
 
                 req_data->ss_new->ss[i] = (frescan_ss_t)ret;
 
+                DEBUG(FRESCAN_BWRES_MANAGER_ENABLE_DEBUG,
+                      "prealloc net:%d node:%d ss_new->ss[%d]:%d\n",
+                      req_data->net, req_data->request_node,
+                      i, req_data->ss_new->ss[i]);
+
                 ret = frescan_bwres_sa_add_contract
                                 (scenario,
                                  req_data->ss_new->ss[i],

diff --git a/src_frescan/frescan_config.h b/src_frescan/frescan_config.h
index 8a232457de47b5ed578f81388ef81d7318b755db..b651961e7f7bdbc2ef76a399e69e53cdf28482d9 100644 (file)
--- a/src_frescan/frescan_config.h
+++ b/src_frescan/frescan_config.h
@@ -81,7 +81,7 @@
 #define FRESCAN_BACKGROUND_PRIO   0
 #define FRESCAN_REPL_SIGNAL_NUM   FOSA_SIGNAL_MIN + 10 // real-time signal
 #define FRESCAN_REPL_THREAD_PRIO  60
-#define FRESCAN_MX_NODES          2
+#define FRESCAN_MX_NODES          3
 #define FRESCAN_MX_REPL_OPS       FRESCAN_MX_IDS*10
 
 // Configuration values for FRESCAN_BWRES
@@ -93,7 +93,7 @@
 #define FRESCAN_BWRES_MX_PRIO           60
 #define FRESCAN_BWRES_NEG_THREAD_PRIO   50
 #define FRESCAN_BWRES_ACCEPTOR_PRIO     FRESCAN_BWRES_NEG_THREAD_PRIO - 1
-#define FRESCAN_BWRES_NEG_MSG_PRIO      8
+#define FRESCAN_BWRES_NEG_MSG_PRIO      4
 #define FRESCAN_BWRES_NEG_MSG_BUDGET    5 // packets
 #define FRESCAN_BWRES_NEG_MSG_PERIOD    1000000 // us
 #define FRESCAN_BWRES_NEG_MSG_CHAN      0

diff --git a/src_frescan/frescan_debug.h b/src_frescan/frescan_debug.h
index 3d0bf4158e523ffc1209650dbc858fda7b5b6376..0f2222b373e1fc973d3373868bf60fc1106c136b 100644 (file)
--- a/src_frescan/frescan_debug.h
+++ b/src_frescan/frescan_debug.h
@@ -98,15 +98,15 @@
 #define FRESCAN_HW_BUFFER_ENABLE_DEBUG  false
 #define FRESCAN_REPLENSH_ENABLE_DEBUG   false
 
-#define FRESCAN_BWRES_ENABLE_DEBUG            true
+#define FRESCAN_BWRES_ENABLE_DEBUG            false
 #define FRESCAN_BWRES_ROBJS_ENABLE_DEBUG      false
 #define FRESCAN_BWRES_REQUESTS_ENABLE_DEBUG   false
-#define FRESCAN_BWRES_MANAGER_ENABLE_DEBUG    true
-#define FRESCAN_BWRES_ACCEPTOR_ENABLE_DEBUG   true
-#define FRESCAN_BWRES_MC_ENABLE_DEBUG         true
+#define FRESCAN_BWRES_MANAGER_ENABLE_DEBUG    false
+#define FRESCAN_BWRES_ACCEPTOR_ENABLE_DEBUG   false
+#define FRESCAN_BWRES_MC_ENABLE_DEBUG         false
 #define FRESCAN_BWRES_FNA_ENABLE_DEBUG        false
-#define FRESCAN_BWRES_MESSAGES_ENABLE_DEBUG   true
-#define FRESCAN_BWRES_SA_ENABLE_DEBUG         true
+#define FRESCAN_BWRES_MESSAGES_ENABLE_DEBUG   false
+#define FRESCAN_BWRES_SA_ENABLE_DEBUG         false
 
 /**
  * MEASUREMENT FLAGS