changes to use the FRSH FSA module to do the analysis and spare capacity. TODO: finis...

[frescor/fna.git] / src_frescan / frescan_servers.c

diff --git a/src_frescan/frescan_servers.c b/src_frescan/frescan_servers.c
index 04fd14f689e9fc026bd5628315112c7716b3a9ef..c133ee4b12da7e6636a6a127d998d0086b152cb1 100644 (file)
--- a/src_frescan/frescan_servers.c
+++ b/src_frescan/frescan_servers.c
@@ -72,10 +72,10 @@
 #include "frescan_servers_replenishments.h" // frescan_replenishments_xxx
 #include "frescan_debug.h"
 #include "frescan_data.h"
-#include <misc/linux_list.h>
-#include <misc/timespec_operations.h>
 #include <signal.h>
 #include <time.h>
+#include <misc/linux_list.h>
+#include "fosa_time_timespec.h" // smaller_timespec
 
 /**
  * frescan_servers_init() - initialize server structures
@@ -98,7 +98,7 @@ int frescan_servers_init(frescan_network_t net)
 
         ret = frescan_replenishments_init(net);
         if (ret != 0) {
-                ERROR("could not initialize the replenishments\n");
+                FRESCAN_ERROR("could not initialize the replenishments\n");
                 return -1;
         }
 
@@ -128,7 +128,7 @@ int frescan_servers_create(frescan_network_t net,
         FRESCAN_RELEASE_LOCK(&the_networks[net].lock);
 
         if (pos == -1) {
-                ERROR("could not allocate servers\n");
+                FRESCAN_ERROR("could not allocate servers\n");
                 return -1;
         }
 
@@ -139,7 +139,7 @@ int frescan_servers_create(frescan_network_t net,
         server->net = net;
         server->id  = *id;
         server->params = *params;
-        server->current_budget = params->values.budget;
+        server->current_budget = params->budget;
         server->current_priority = params->prio;
         server->pending_packets = 0;
 
@@ -151,7 +151,7 @@ int frescan_servers_create(frescan_network_t net,
 
         // allocate the replenishment capacity queue
         INIT_LIST_HEAD(&server->replenishments.repl_list);
-        for (i=0; i < params->values.budget; i++) {
+        for (i=0; i < params->budget; i++) {
                 repl = frescan_repl_op_alloc();
                 repl->when = server->act_time;
                 repl->amount = 1;
@@ -166,13 +166,13 @@ int frescan_servers_create(frescan_network_t net,
 
         ret = timer_create (CLOCK_MONOTONIC, &evp, &server->repl_timer);
         if (ret != 0) {
-                ERROR("could not create timer\n");
+                FRESCAN_ERROR("could not create timer\n");
                 return ret;
         }
 
         DEBUG(FRESCAN_SERVERS_ENABLE_DEBUG,
               "server created, id:%u budget:%u prio:%u\n",
-              *id, server->params.values.budget, server->params.prio);
+              *id, server->params.budget, server->params.prio);
 
         return 0;
 }
@@ -211,7 +211,7 @@ int frescan_servers_destroy(frescan_network_t net, frescan_ss_t id)
 
         ret = timer_delete (the_servers_pool[net][id].repl_timer);
         if (ret != 0) {
-                ERROR("could not delete timer\n");
+                FRESCAN_ERROR("could not delete timer\n");
                 return ret;
         }
 
@@ -221,7 +221,7 @@ int frescan_servers_destroy(frescan_network_t net, frescan_ss_t id)
         ret = freelist_free(&the_servers_pool_freelist[net], id);
         FRESCAN_RELEASE_LOCK(&the_networks[net].lock);
         if (ret != 0) {
-                ERROR("could not free server data from pool\n");
+                FRESCAN_ERROR("could not free server data from pool\n");
                 return ret;
         }
 
@@ -330,7 +330,7 @@ int frescan_servers_frame_sent(frescan_network_t net,
         server = &the_servers_pool[net][id];
 
         if (server->current_priority != FRESCAN_BACKGROUND_PRIO) {
-                if (smaller_timespec(&packet->timestamp, &server->act_time)) {
+                if (smaller_timespec(packet->timestamp, server->act_time)) {
                         repl_time = &server->act_time;
                 } else {
                         repl_time = &packet->timestamp;