#include "frescan_servers.h"
#include "frescan_servers_replenishments.h" // frescan_replenishments_xxx
#include "frescan_debug.h"
+#include "frescan_packets.h"
#include "frescan_data.h"
#include <signal.h>
#include <time.h>
DEBUG(FRESCAN_SERVERS_ENABLE_DEBUG, "initializing servers\n");
- ret = freelist_init(&the_servers_pool_freelist[net], FRESCAN_MX_IDS);
+ ret = freelist_init(&frescan_data[net].ss_id_freelist, FRESCAN_MX_IDS);
if (ret != 0) return ret;
for (i=0; i<FRESCAN_MX_NETWORKS; i++) {
- INIT_LIST_HEAD(&the_active_servers[net].servers_list);
+ INIT_LIST_HEAD(&frescan_data[net].ss_active_head.servers_list);
}
ret = frescan_replenishments_init(net);
{
int i, ret, pos;
struct sigevent evp;
- frescan_server_data_t *server;
+ frescan_ss_data_t *server;
frescan_repl_op_t *repl;
- FRESCAN_ACQUIRE_LOCK(&the_networks[net].lock);
- pos = freelist_alloc(&the_servers_pool_freelist[net]);
- FRESCAN_RELEASE_LOCK(&the_networks[net].lock);
+ FRESCAN_ACQUIRE_LOCK(&frescan_data[net].lock);
+ pos = freelist_alloc(&frescan_data[net].ss_id_freelist);
+ FRESCAN_RELEASE_LOCK(&frescan_data[net].lock);
if (pos == -1) {
FRESCAN_ERROR("could not allocate servers\n");
*id = (frescan_ss_t)pos;
- server = &the_servers_pool[net][*id];
+ server = &frescan_data[net].ss_data[*id];
server->net = net;
server->id = *id;
- server->params = *params;
+ server->committed_params = *params;
+ server->perceived_params = server->committed_params;
server->current_priority = params->prio;
- server->pending_packets = 0;
+ server->pending_packets = 0;
// the first act_time is set to the server creation time
clock_gettime (CLOCK_MONOTONIC, &server->act_time);
DEBUG(FRESCAN_SERVERS_ENABLE_DEBUG,
"server created, id:%u budget:%u prio:%u\n",
- *id, server->params.budget, server->params.prio);
+ *id, server->committed_params.budget,
+ server->committed_params.prio);
return 0;
}
const frescan_server_params_t *params,
frescan_ss_t id)
{
- frescan_server_data_t *server;
-
- server = &the_servers_pool[net][id];
-
- server->old_params = server->params;
- server->params = *params;
-
+ frescan_data[net].ss_data[id].perceived_params = *params;
return 0;
}
frescan_ss_t id)
{
int i, ret;
- frescan_server_data_t *server;
+ frescan_ss_data_t *server;
int budget_variation;
- frescan_repl_op_t *repl;
+ frescan_repl_op_t *repl = NULL;
struct list_head *pos;
- server = &the_servers_pool[net][id];
- budget_variation = server->params.budget - server->old_params.budget;
+ server = &frescan_data[net].ss_data[id];
+ budget_variation = server->perceived_params.budget -
+ server->committed_params.budget;
if (budget_variation > 0) {
// we have more budget: add repl ops to the tail
}
}
+ server->committed_params = server->perceived_params;
+
return 0;
}
int ret;
frescan_repl_op_t *repl;
frescan_packet_t *packet;
- frescan_server_data_t *server;
+ frescan_ss_data_t *server;
- server = &the_servers_pool[net][id];
+ server = &frescan_data[net].ss_data[id];
ret = timer_delete (server->repl_timer);
if (ret != 0) {
}
INIT_LIST_HEAD(&server->replenishments.repl_list);
- FRESCAN_ACQUIRE_LOCK(&the_networks[net].lock);
+ FRESCAN_ACQUIRE_LOCK(&frescan_data[net].lock);
list_del(&server->servers_list);
- ret = freelist_free(&the_servers_pool_freelist[net], id);
- FRESCAN_RELEASE_LOCK(&the_networks[net].lock);
+ ret = freelist_free(&frescan_data[net].ss_id_freelist, id);
+ FRESCAN_RELEASE_LOCK(&frescan_data[net].lock);
if (ret != 0) {
FRESCAN_ERROR("could not free server data from pool\n");
frescan_server_params_t *params,
frescan_ss_t id)
{
- *params = the_servers_pool[net][id].params;
+ *params = frescan_data[net].ss_data[id].perceived_params;
return 0;
}
* @current_budget: the current budget of the server
*
* Traverse the capacity queue until we find a replenishment operation
- * that was programmed for a time later than now.
+ * that was programmed for a time later than now. The number of iterations
+ * is the budget in the capacity queue.
+ *
+ * That budget must be modified if the perceived budget has not been
+ * committed yet.
*
*/
{
struct timespec now;
frescan_repl_op_t *repl;
- frescan_server_data_t *server;
+ frescan_ss_data_t *server;
+ int count;
- server = &the_servers_pool[net][id];
+ server = &frescan_data[net].ss_data[id];
+ // first we get the current real budget in the capacity queue
clock_gettime (CLOCK_MONOTONIC, &now);
- *current_budget = 0;
-
+ count = 0;
list_for_each_entry(repl,
&server->replenishments.repl_list,
repl_list) {
if (smaller_timespec(now, repl->when)) break;
- *current_budget = *current_budget + 1;
+ count = count + 1;
}
+ // if the perceived budget is less than the real budget
+ // we have to give a _perceived_ current budget
+ if (server->perceived_params.budget < server->committed_params.budget) {
+ count = server->perceived_params.budget -
+ (server->committed_params.budget - count);
+ if (count < 0) count = 0;
+ }
+
+ *current_budget = (frescan_budget_t)count;
+
return 0;
}
frescan_ss_t *id,
frescan_prio_t *prio)
{
- frescan_server_data_t *server;
+ frescan_ss_data_t *server;
- if (list_empty(&the_active_servers->servers_list)) {
+ if (list_empty(&frescan_data[net].ss_active_head.servers_list)) {
DEBUG(FRESCAN_SERVERS_ENABLE_DEBUG, "server list is empty\n");
*id = FRESCAN_MX_IDS;
return 0;
}
*prio = 0;
- list_for_each_entry(server, &the_active_servers[net].servers_list,
+ list_for_each_entry(server,
+ &frescan_data[net].ss_active_head.servers_list,
servers_list) {
if (server->current_priority >= *prio) {
*id = server->id;
{
int ret;
struct timespec *repl_time;
- frescan_server_data_t *server;
+ frescan_ss_data_t *server;
- server = &the_servers_pool[net][id];
+ server = &frescan_data[net].ss_data[id];
if (server->current_priority != FRESCAN_BACKGROUND_PRIO) {
if (smaller_timespec(packet->timestamp, server->act_time)) {
projects / frescor / fna.git / blobdiff