From 51e07f73c4e327eb87322682b2f857ad914a471c Mon Sep 17 00:00:00 2001 From: sangorrin Date: Tue, 15 Apr 2008 07:47:57 +0000 Subject: [PATCH] update the names and add acceptor thread id to the general data git-svn-id: http://www.frescor.org/private/svn/frescor/fna/trunk@1108 35b4ef3e-fd22-0410-ab77-dab3279adceb --- src_frescan/frescan_bandwidth_reservation.c | 5 ++--- src_frescan/frescan_data.h | 4 +++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src_frescan/frescan_bandwidth_reservation.c b/src_frescan/frescan_bandwidth_reservation.c index 28bec59..b77f8c5 100644 --- a/src_frescan/frescan_bandwidth_reservation.c +++ b/src_frescan/frescan_bandwidth_reservation.c @@ -17,12 +17,11 @@ #include "frescan_bandwidth_reservation.h" #include "frescan_data.h" #include "frescan_requests_queue.h" // frescan_requests_init -#include "frescan_negotiator_thread.h" // frescan_negotiator_thread_create #include "frescan_debug.h" #include "frescan_config.h" -#include "frescan_acceptor_threads.h" #include "frescan_servers.h" #include "frescan_negotiation_messages.h" +#include "frescan_negotiation_threads.h" /** * frescan_bwres_init() @@ -57,7 +56,7 @@ int frescan_bwres_init(frescan_network_t net) if (the_networks[net].local_node == FRESCAN_NEG_MASTER_NODE) { DEBUG(FRESCAN_BWRES_ENABLE_DEBUG, "i am master node (%u)\n", the_networks[net].local_node); - ret = frescan_negotiator_thread_create(net); + ret = frescan_master_neg_thread_create(net); if (ret != 0) { ERROR("could not initialize the negotiator thread\n"); return ret; diff --git a/src_frescan/frescan_data.h b/src_frescan/frescan_data.h index ccb727a..dbae6cc 100644 --- a/src_frescan/frescan_data.h +++ b/src_frescan/frescan_data.h @@ -170,7 +170,8 @@ typedef struct { * support several interfaces for the same network. * @fd: file descriptor associated to /dev/canXX * @repl_thread_id: replenishment thread id - * @neg_thread_id: negotiator thread id (only master node has it) + * @neg_thread_id: master local negotiator thread id (only master node has it) + * @acceptor_thread_id: acceptor negotiation thread id (all nodes have one) * @neg_messages_ss_id: sporadic server for negotiation messages * @queues: the queues of this network instance * @last_packet: pointer to the last packet from which a frame was inserted @@ -194,6 +195,7 @@ typedef struct { int fd; fosa_thread_id_t repl_thread_id; fosa_thread_id_t neg_thread_id; + fosa_thread_id_t acceptor_thread_id; frescan_ss_t neg_messages_ss_id; frescan_queues_t queues; frescan_packet_t *last_packet; -- 2.39.2