]> rtime.felk.cvut.cz Git - frescor/fna.git/commitdiff
some reorganization... now the acceptor is simpler.. everything goes through requests...
authorsangorrin <sangorrin@35b4ef3e-fd22-0410-ab77-dab3279adceb>
Thu, 17 Apr 2008 18:54:04 +0000 (18:54 +0000)
committersangorrin <sangorrin@35b4ef3e-fd22-0410-ab77-dab3279adceb>
Thu, 17 Apr 2008 18:54:04 +0000 (18:54 +0000)
git-svn-id: http://www.frescor.org/private/svn/frescor/fna/trunk@1122 35b4ef3e-fd22-0410-ab77-dab3279adceb

src_frescan/frescan_bwres.c
src_frescan/frescan_bwres_messages.c
src_frescan/frescan_bwres_messages.h
src_frescan/frescan_bwres_requests.h
src_frescan/frescan_bwres_robjs.c
src_frescan/frescan_bwres_threads.c
src_frescan/frescan_debug.h
src_frescan/frescan_servers_replenishments.c

index ac47359dba09dc176f4f5a74c850a8ca374251d8..b85342ceb6118f773f7b58794e7cc1349ff96c0c 100644 (file)
@@ -51,6 +51,9 @@ int frescan_bwres_init(frescan_network_t net)
         ret = frescan_requests_init(FRESCAN_REQUESTS_MX_CEILING);
         if (ret != 0) return ret;
 
+        ret = frescan_messages_init(net);
+        if (ret != 0) return ret;
+
         ret = frescan_manager_thread_create(net);
         if (ret != 0) return ret;
 
@@ -92,6 +95,7 @@ int frescan_bwres_negotiate(frescan_network_t net,
         req_data->req          = req;
         req_data->contract     = (frescan_contract_t *)contract;
         req_data->request_node = the_networks[net].local_node;
+        req_data->net          = net;
 
         ret = frescan_bwres_robjs_alloc(&req_data->robj, FRESCAN_BWRES_MX_PRIO);
         if (ret != 0) return ret;
index 2d1cd8d4145102696a1268508cb752b1054a8043..29d1d0dd1b51b336348be5fe1048fbea56c097eb 100644 (file)
 #include "frescan_config.h"
 #include "frescan_debug.h"
 
+/**
+ * frescan_messages_init()
+ */
+
+static frescan_send_params_t send_params[FRESCAN_MX_NETWORKS];
+static frescan_recv_params_t recv_params[FRESCAN_MX_NETWORKS];
+
+int frescan_messages_init(frescan_network_t net)
+{
+        DEBUG(FRESCAN_MESSAGES_ENABLE_DEBUG, "initialization\n");
+
+        send_params[net].net     = net;
+        send_params[net].channel = FRESCAN_NEG_CHANNEL;
+        send_params[net].flags   = FRESCAN_SS | FRESCAN_ASYNC;
+        send_params[net].ss      = the_networks[net].neg_messages_ss_id;
+        send_params[net].to      = FRESCAN_NEG_MASTER_NODE;
+
+        recv_params[net].net     = net;
+        recv_params[net].channel = FRESCAN_NEG_CHANNEL;
+        recv_params[net].flags   = FRESCAN_SYNC;
+
+        return 0;
+}
+
 /**
  *
  *  FRESCAN_REQ_NEG MESSAGE
@@ -60,7 +84,7 @@ static int frescan_request_to_neg_message(const frescan_request_data_t *data,
         neg_msg->ss       = data->ss;
         neg_msg->contract = *(data->contract);
 
-        return 0;
+        return sizeof(struct frescan_req_neg_message_t);
 }
 
 static int frescan_neg_message_to_request(const uint8_t *msg,
@@ -115,7 +139,7 @@ static int frescan_request_to_reneg_message(const frescan_request_data_t *data,
         reneg_msg->ss       = data->ss;
         reneg_msg->contract = *(data->contract);
 
-        return 0;
+        return sizeof(struct frescan_req_reneg_message_t);
 }
 
 static int frescan_reneg_message_to_request(const uint8_t *msg,
@@ -162,7 +186,7 @@ static int frescan_request_to_cancel_message(const frescan_request_data_t *data,
         cancel_msg->type     = FRESCAN_REQ_CANCEL;
         cancel_msg->ss       = data->ss;
 
-        return 0;
+        return sizeof(struct frescan_req_cancel_message_t);
 }
 
 static int frescan_cancel_message_to_request(const uint8_t *msg,
@@ -211,7 +235,7 @@ static int frescan_request_to_repneg_message(const frescan_request_data_t *data,
         repneg_msg->req          = data->req;
         repneg_msg->return_value = data->return_value;
 
-        return 0;
+        return sizeof(struct frescan_rep_neg_message_t);
 }
 
 static int frescan_repneg_message_to_request(const uint8_t *msg,
@@ -229,49 +253,90 @@ static int frescan_repneg_message_to_request(const uint8_t *msg,
 }
 
 /**
- * frescan_request_to_message() - converts a request into a network message
+ * frescan_messages_send_request()
  *
  * this function converts a request with the necessary data into a message
- * that can be sent through the network.
+ * and sends it.
  *
- * @req_data: the request data to fill the message bytes (in)
- * @msg: buffer with the bytes that will be sent to the network (out)
+ * @req_data: the request to be sent (NOTE: the network is in req_data)
  *
  */
 
-int frescan_request_to_message(const frescan_request_data_t *req_data,
-                               uint8_t *msg)
+int frescan_messages_send_request(const frescan_request_data_t *req_data)
 {
+        int ret;
+        uint8_t msg[2000]; // TODO: use a constant for max neg message size
+        size_t size;
+
         switch(req_data->type) {
                 case FRESCAN_REQ_NEG:
-                        return frescan_request_to_neg_message(req_data, msg);
+                        size = frescan_request_to_neg_message(req_data, msg);
+                        break;
                 case FRESCAN_REQ_RENEG:
-                        return frescan_request_to_reneg_message(req_data, msg);
+                        size = frescan_request_to_reneg_message(req_data, msg);
+                        break;
                 case FRESCAN_REQ_CANCEL:
-                        return frescan_request_to_cancel_message(req_data, msg);
+                        size = frescan_request_to_cancel_message(req_data, msg);
+                        break;
                 case FRESCAN_REP_NEG:
-                        return frescan_request_to_repneg_message(req_data, msg);
+                        size = frescan_request_to_repneg_message(req_data, msg);
+                        break;
                 default:
                         ERROR("request type not supported\n");
                         return -1;
         }
+
+        ret = frescan_send(&send_params[req_data->net], msg, size);
+        if (ret != 0) return ret;
+
+        return 0;
 }
 
 /**
- * frescan_message_to_request() - converts a network message into a request
+ * frescan_messages_recv_request()
  *
- * this function is the opposite to the previous one. It will be used by
- * the acceptor threads to transform messages received from the network
- * into requests.
+ * this function BLOCKS the calling thread until receives a message
+ * and transforms it into a request.
  *
- * @msg: buffer with the bytes received from the network (in)
  * @req_data: the request data to fill from the message bytes (out)
  *
  */
 
-int frescan_message_to_request(const uint8_t *msg,
-                               frescan_request_data_t *req_data)
+int frescan_messages_recv_request(frescan_network_t    net,
+                                  frescan_request_id_t *req)
 {
+        int ret;
+        uint8_t msg[2000]; // TODO: use a constant with the max neg message size
+        size_t recv_bytes;
+        frescan_node_t from;
+        frescan_prio_t prio;
+        frescan_request_data_t *req_data;
+
+        ret = frescan_requests_alloc(req);
+        if (ret != 0) return ret;
+
+        ret = frescan_requests_get_data(*req, &req_data);
+        if (ret != 0) return ret;
+
+        DEBUG(FRESCAN_MESSAGES_ENABLE_DEBUG,
+              "wait for a msg, net:%u chan:%u flags:%u\n",
+              net, recv_params[net].channel, recv_params[net].flags);
+
+        ret = frescan_recv(&recv_params[net],
+                            msg,
+                            sizeof(msg),
+                            &recv_bytes,
+                            &from,
+                            &prio);
+        if (ret != 0) return ret;
+
+        DEBUG(FRESCAN_MESSAGES_ENABLE_DEBUG,
+              "msg received, from:%u size:%u prio:%u\n",
+              from, recv_bytes, prio);
+
+        req_data->request_node = from;
+        req_data->net = net;
+
         switch(*((frescan_request_type_t *)msg)) {
                 case FRESCAN_REQ_NEG:
                         return frescan_neg_message_to_request(msg, req_data);
index 74d3ee2c21f5df7e1444f6b4d4d7b976c603cb60..bc3ec29805b8529e4d4bc6eeccd4aa70ddfbba23 100644 (file)
  *
  */
 
-#ifndef _FRESCAN_NEGOTIATION_MESSAGES_H_
-#define _FRESCAN_NEGOTIATION_MESSAGES_H_
+#ifndef _FRESCAN_BWRES_MESSAGES_H_
+#define _FRESCAN_BWRES_MESSAGES_H_
 
 #include <stdint.h>
 #include "frescan_bwres_requests.h"
 #include "frescan_data.h"
 
 /**
- * frescan_request_to_message() - converts a request into a network message
+ * frescan_messages_init() - initialization function for the module
+ */
+
+extern int frescan_messages_init(frescan_network_t net);
+
+/**
+ * frescan_messages_send_request()
  *
  * this function converts a request with the necessary data into a message
- * that can be sent through the network.
+ * and sends it.
  *
- * @req_data: the request data to fill the message bytes (in)
- * @msg: buffer with the bytes that will be sent to the network (out)
+ * @req_data: the request to be sent (NOTE: the network is in req_data)
  *
  */
 
-extern int frescan_request_to_message(const frescan_request_data_t *req_data,
-                                      uint8_t *msg);
+extern int frescan_messages_send_request(const frescan_request_data_t *req_data);
 
 /**
- * frescan_message_to_request() - converts a network message into a request
+ * frescan_messages_recv_request()
  *
- * this function is the opposite to the previous one. It will be used by
- * the acceptor threads to transform messages received from the network
- * into requests.
+ * this function BLOCKS the calling thread until receives a message
+ * and transforms it into a request.
  *
- * @msg: buffer with the bytes received from the network (in)
- * @req_data: the request data to fill from the message bytes (out)
+ * @net: network from where we want to wait messages
+ * @req: the request received (it must be freed)
  *
  */
 
-extern int frescan_message_to_request(const uint8_t *msg,
-                                      frescan_request_data_t *req_data);
+extern int frescan_messages_recv_request(frescan_network_t    net,
+                                         frescan_request_id_t *req);
 
-#endif // _FRESCAN_NEGOTIATION_MESSAGES_H_
+#endif // _FRESCAN_BWRES_MESSAGES_H_
index cb635b675c8d12c65d2944ea12d0d13b79eb155d..b25e2031345b31ad00f833e3fd4ae513aec14b25 100644 (file)
@@ -33,6 +33,7 @@
  * @request_node: the node that performed the request
  * @req: the request id of the SLAVE to identify the request in the reply
  * @return_value: the value returned in a Reply
+ * @net: the network instance where this request belongs to
  * @robj: a reply object to wait until a negotiation is completed
  *
  */
@@ -59,6 +60,7 @@ typedef struct {
         frescan_node_t           request_node;
         frescan_request_id_t     req;
         frescan_request_retval_t return_value;
+        frescan_network_t        net;
         frescan_robj_id_t        robj;
 } frescan_request_data_t;
 
index 01e051b4c11d19a7b1bd13b95d055e7f6929cc9f..54db76f2112776f2936cc9dd64384ed8634d0c42 100644 (file)
@@ -82,7 +82,7 @@ int frescan_bwres_robjs_alloc(frescan_robj_id_t *id, int ceiling)
 {
         int err, pos;
 
-        DEBUG(FRESCAN_REPLYOBJ_ENABLE_DEBUG,
+        DEBUG(FRESCAN_ROBJS_ENABLE_DEBUG,
               "allocating reply object, is_initialized=%d\n", is_initialized);
 
         if (is_initialized == false) return -1;
@@ -105,7 +105,7 @@ int frescan_bwres_robjs_alloc(frescan_robj_id_t *id, int ceiling)
         err = fosa_mutex_init(&the_reply_objects[pos].mutex, ceiling);
         if (err != 0) return err;
 
-        DEBUG(FRESCAN_REPLYOBJ_ENABLE_DEBUG,
+        DEBUG(FRESCAN_ROBJS_ENABLE_DEBUG,
               "reply object allocated, id=%d\n", *id);
 
         return 0;
@@ -126,7 +126,7 @@ int frescan_bwres_robjs_free(frescan_robj_id_t id)
 {
         int err;
 
-        DEBUG(FRESCAN_REPLYOBJ_ENABLE_DEBUG,
+        DEBUG(FRESCAN_ROBJS_ENABLE_DEBUG,
               "free reply id=%d, is_initialized=%d\n", id, is_initialized);
 
         if (is_initialized == false) return -1;
@@ -166,18 +166,18 @@ int frescan_bwres_robjs_signal(frescan_robj_id_t id)
 {
         int err;
 
-        DEBUG(FRESCAN_REPLYOBJ_ENABLE_DEBUG,
+        DEBUG(FRESCAN_ROBJS_ENABLE_DEBUG,
               "is_initialized=%d\n", is_initialized);
         if (is_initialized == false) return -1;
 
-        DEBUG(FRESCAN_REPLYOBJ_ENABLE_DEBUG,
+        DEBUG(FRESCAN_ROBJS_ENABLE_DEBUG,
               "taking mutex of the reply id=%d\n", id);
         err = fosa_mutex_lock(&the_reply_objects[id].mutex);
         if (err != 0) return err;
 
                 the_reply_objects[id].is_work_done = true;
 
-                DEBUG(FRESCAN_REPLYOBJ_ENABLE_DEBUG,
+                DEBUG(FRESCAN_ROBJS_ENABLE_DEBUG,
                       "signal the cond variable\n");
                 err = fosa_cond_signal(&the_reply_objects[id].cond);
                 if (err != 0) goto locked_error;
index 2f78a87ddc257711d9c56bff0abe430c5c6ed069..a083d3eb060c776e461eacbc002b2244a8ae6600 100644 (file)
@@ -92,10 +92,10 @@ int frescan_acceptor_thread_create(frescan_network_t net)
  * frescan_manager_thread
  */
 
-static int frescan_manager_neg(frescan_request_data_t *req_data);
-static int frescan_manager_reneg(frescan_request_data_t *req_data);
-static int frescan_manager_cancel(frescan_request_data_t *req_data);
-static int frescan_manager_repneg(frescan_request_data_t *req_data);
+static void frescan_manager_neg(frescan_request_data_t *req_data);
+static void frescan_manager_reneg(frescan_request_data_t *req_data);
+static void frescan_manager_cancel(frescan_request_data_t *req_data);
+static void frescan_manager_repneg(frescan_request_data_t *req_data);
 
 static void *frescan_manager_thread(void *arg)
 {
@@ -117,20 +117,16 @@ static void *frescan_manager_thread(void *arg)
 
                 switch(req_data->type) {
                         case FRESCAN_REQ_NEG:
-                                ret = frescan_manager_neg(req_data);
-                                assert(ret == 0);
+                                frescan_manager_neg(req_data);
                                 break;
                         case FRESCAN_REQ_RENEG:
-                                ret = frescan_manager_reneg(req_data);
-                                assert(ret == 0);
+                                frescan_manager_reneg(req_data);
                                 break;
                         case FRESCAN_REQ_CANCEL:
-                                ret = frescan_manager_cancel(req_data);
-                                assert(ret == 0);
+                                frescan_manager_cancel(req_data);
                                 break;
                         case FRESCAN_REP_NEG:
-                                ret = frescan_manager_repneg(req_data);
-                                assert(ret == 0);
+                                frescan_manager_repneg(req_data);
                                 break;
                         default:
                                 ERROR("request type not supported\n");
@@ -151,48 +147,15 @@ static void *frescan_manager_thread(void *arg)
 static void *frescan_acceptor_thread(void *arg)
 {
         int ret;
-        frescan_recv_params_t recv_params;
-        uint8_t msg[2000]; // TODO: use a constant with the max neg message size
-        size_t recv_bytes;
-        frescan_node_t from;
-        frescan_prio_t prio;
         frescan_request_id_t req;
-        frescan_request_data_t *req_data;
-
-        DEBUG(FRESCAN_ACCEPTOR_THREAD_ENABLE_DEBUG, "acceptor th starts\n");
+        frescan_network_t net = (uint32_t)arg;
 
-        recv_params.net     = (frescan_network_t)(uint32_t)arg;
-        recv_params.channel = FRESCAN_NEG_CHANNEL;
-        recv_params.flags   = FRESCAN_SYNC;
+        DEBUG(FRESCAN_ACCEPTOR_ENABLE_DEBUG, "acceptor thread starts\n");
 
         while(1) {
-                DEBUG(FRESCAN_ACCEPTOR_THREAD_ENABLE_DEBUG,
-                      "waiting for a msg, net:%u chan:%u flags:%u\n",
-                      recv_params.net, recv_params.channel, recv_params.flags);
-
-                ret = frescan_recv(&recv_params,
-                                   msg,
-                                   sizeof(msg),
-                                   &recv_bytes,
-                                   &from,
-                                   &prio);
-                assert(ret == 0);
-
-                DEBUG(FRESCAN_ACCEPTOR_THREAD_ENABLE_DEBUG,
-                      "msg received, from:%u size:%u prio:%u\n",
-                      from, recv_bytes, prio);
-
-                ret = frescan_requests_alloc(&req);
+                ret = frescan_messages_recv_request(net, &req);
                 assert(ret == 0);
 
-                ret = frescan_requests_get_data(req, &req_data);
-                assert(ret == 0);
-
-                ret = frescan_message_to_request(msg, req_data);
-                assert(ret == 0);
-
-                req_data->request_node = from;
-
                 ret = frescan_requests_enqueue(req);
                 assert(ret == 0);
         }
@@ -204,38 +167,66 @@ static void *frescan_acceptor_thread(void *arg)
  * frescan_manager_neg
  */
 
-static int frescan_manager_neg(frescan_request_data_t *req_data)
+static void frescan_manager_neg(frescan_request_data_t *req_data)
 {
+        int ret;
+        bool accepted;
+
         DEBUG(FRESCAN_MANAGER_ENABLE_DEBUG, "negotiation request\n");
-        return 0;
+
+        if (the_networks[req_data->net].local_node == FRESCAN_NEG_MASTER_NODE) {
+
+                accepted = true; // TODO: sched analysis
+                ret = 0;  // TODO: sched analysis
+
+                if (accepted) {
+                        req_data->return_value = FRESCAN_REQ_ACCEPTED;
+                } else {
+                        req_data->return_value = (ret == 0) ?
+                                                  FRESCAN_REQ_NOT_ACCEPTED :
+                                                  FRESCAN_REQ_ERROR;
+                }
+
+                if (req_data->request_node == FRESCAN_NEG_MASTER_NODE) {
+                        DEBUG(FRESCAN_MANAGER_ENABLE_DEBUG, "local\n");
+                        ret = frescan_bwres_robjs_signal(req_data->robj);
+                        assert(ret == 0);
+                } else {
+                        DEBUG(FRESCAN_MANAGER_ENABLE_DEBUG, "external\n");
+                        req_data->type = FRESCAN_REP_NEG;
+
+                        ret = frescan_messages_send_request(req_data);
+                        assert(ret == 0);
+                }
+        } else {
+                ret = frescan_messages_send_request(req_data);
+                assert(ret == 0);
+        }
 }
 
 /**
  * frescan_manager_neg
  */
 
-static int frescan_manager_reneg(frescan_request_data_t *req_data)
+static void frescan_manager_reneg(frescan_request_data_t *req_data)
 {
         DEBUG(FRESCAN_MANAGER_ENABLE_DEBUG, "renegotiation request\n");
-        return 0;
 }
 
 /**
  * frescan_manager_neg
  */
 
-static int frescan_manager_cancel(frescan_request_data_t *req_data)
+static void frescan_manager_cancel(frescan_request_data_t *req_data)
 {
         DEBUG(FRESCAN_MANAGER_ENABLE_DEBUG, "cancel request\n");
-        return 0;
 }
 
 /**
  * frescan_manager_neg
  */
 
-static int frescan_manager_repneg(frescan_request_data_t *req_data)
+static void frescan_manager_repneg(frescan_request_data_t *req_data)
 {
         DEBUG(FRESCAN_MANAGER_ENABLE_DEBUG, "reply to neg request\n");
-        return 0;
 }
index 668f875a24614bfeb33efb70f4a933af41de0a66..63f96b8addd42a03c7d3752c84ceb451cadb0371 100644 (file)
  * DEBUGGING FLAGS to enable/disable debugging messages
  **/
 
-#define FRESCAN_SERVERS_ENABLE_DEBUG false
+#define FRESCAN_SERVERS_ENABLE_DEBUG    false
 #define FRESCAN_PACKETPOOL_ENABLE_DEBUG false
-#define FRESCAN_FRAG_ENABLE_DEBUG false
-#define FRESCAN_INIT_ENABLE_DEBUG false
-#define FRESCAN_SEND_ENABLE_DEBUG false
-#define FRESCAN_RECV_ENABLE_DEBUG false
-#define FRESCAN_RX_HOOK_ENABLE_DEBUG false
-#define FRESCAN_SENT_HOOK_ENABLE_DEBUG false
-#define FRESCAN_QUEUES_ENABLE_DEBUG false
-#define FRESCAN_HW_BUFFER_ENABLE_DEBUG false
-#define FRESCAN_REPL_ENABLE_DEBUG false
-#define FRESCAN_REPLYOBJ_ENABLE_DEBUG false
-#define FRESCAN_BWRES_ENABLE_DEBUG false
-#define FRESCAN_REQUESTS_ENABLE_DEBUG false
-#define FRESCAN_MANAGER_ENABLE_DEBUG false
-#define FRESCAN_ACCEPTOR_THREAD_ENABLE_DEBUG false
-#define FRESCAN_NEG_MESSAGES_ENABLE_DEBUG false
-#define FRESCAN_FNA_ENABLE_DEBUG false
+#define FRESCAN_FRAG_ENABLE_DEBUG       false
+#define FRESCAN_INIT_ENABLE_DEBUG       false
+#define FRESCAN_SEND_ENABLE_DEBUG       false
+#define FRESCAN_RECV_ENABLE_DEBUG       false
+#define FRESCAN_RX_HOOK_ENABLE_DEBUG    false
+#define FRESCAN_SENT_HOOK_ENABLE_DEBUG  false
+#define FRESCAN_QUEUES_ENABLE_DEBUG     false
+#define FRESCAN_HW_BUFFER_ENABLE_DEBUG  false
+#define FRESCAN_REPLENSH_ENABLE_DEBUG   false
+#define FRESCAN_ROBJS_ENABLE_DEBUG      false
+#define FRESCAN_BWRES_ENABLE_DEBUG      true
+#define FRESCAN_REQUESTS_ENABLE_DEBUG   false
+#define FRESCAN_MANAGER_ENABLE_DEBUG    true
+#define FRESCAN_ACCEPTOR_ENABLE_DEBUG   true
+#define FRESCAN_FNA_ENABLE_DEBUG        false
+#define FRESCAN_MESSAGES_ENABLE_DEBUG   false
 
 #endif // _MARTE_FRESCAN_DEBUG_H_
index c47fb1846d3e09c4a77d1e970b1841d61f4d544a..58d76a401d75803b2f7af89ae623b775279785e0 100644 (file)
@@ -105,7 +105,7 @@ static void *frescan_repl_thread(void *arg)
 
                 if (siginfo.si_signo != FRESCAN_REPL_SIGNAL_NUM) continue;
 
-                DEBUG(FRESCAN_REPL_ENABLE_DEBUG,
+                DEBUG(FRESCAN_REPLENSH_ENABLE_DEBUG,
                       "net:%u signal:%d code:%d value(server_id):%d\n",
                       net,
                       siginfo.si_signo,            // FRESCAN_REPL_SIGNAL_NUM
@@ -115,7 +115,7 @@ static void *frescan_repl_thread(void *arg)
                 id = siginfo.si_value.sival_int;
                 server = &the_servers_pool[net][id];
 
-                DEBUG(FRESCAN_REPL_ENABLE_DEBUG,
+                DEBUG(FRESCAN_REPLENSH_ENABLE_DEBUG,
                       "id:%u, current_budget:%u, budget:%u, current_prio:%u\n",
                       id,
                       server->current_budget,
@@ -128,7 +128,7 @@ static void *frescan_repl_thread(void *arg)
                         server->current_priority = server->params.prio;
                 }
 
-                DEBUG(FRESCAN_REPL_ENABLE_DEBUG,
+                DEBUG(FRESCAN_REPLENSH_ENABLE_DEBUG,
                       "now... current_budget:%u, current_prio:%u\n",
                       server->current_budget,
                       server->current_priority);
@@ -157,7 +157,7 @@ static void *frescan_repl_thread(void *arg)
 
                 timerdata.it_value = repl->when;
 
-                DEBUG(FRESCAN_REPL_ENABLE_DEBUG,
+                DEBUG(FRESCAN_REPLENSH_ENABLE_DEBUG,
                       "set timer to %d sec, %d nsec\n",
                       repl->when.tv_sec, repl->when.tv_nsec);
 
@@ -254,7 +254,7 @@ int frescan_replenishment_program(frescan_network_t net,
         server = &the_servers_pool[net][ss];
 
         if (server->current_priority == FRESCAN_BACKGROUND_PRIO) {
-                DEBUG(FRESCAN_REPL_ENABLE_DEBUG, "ss in background\n");
+                DEBUG(FRESCAN_REPLENSH_ENABLE_DEBUG, "ss in background\n");
                 return 0;
         }
 
@@ -269,7 +269,7 @@ int frescan_replenishment_program(frescan_network_t net,
         repl->amount = 1;
 
         empty = list_empty(&server->replenishments.repl_list);
-        DEBUG(FRESCAN_REPL_ENABLE_DEBUG, "ss:%u, empty:%u\n", ss, empty);
+        DEBUG(FRESCAN_REPLENSH_ENABLE_DEBUG, "ss:%u, empty:%u\n", ss, empty);
 
         list_add_tail(&repl->repl_list,
                       &server->replenishments.repl_list);
@@ -279,7 +279,7 @@ int frescan_replenishment_program(frescan_network_t net,
                 timerdata.it_interval.tv_nsec = 0;
                 timerdata.it_value = repl->when;
 
-                DEBUG(FRESCAN_REPL_ENABLE_DEBUG,
+                DEBUG(FRESCAN_REPLENSH_ENABLE_DEBUG,
                       "set timer to %d sec, %d nsec\n",
                       repl->when.tv_sec, repl->when.tv_nsec);