#include "gnunet-service-ats_reservations.h"
#include "ats.h"
-struct PerformanceMonitorClient
-{
- struct PerformanceMonitorClient *next;
- struct PerformanceMonitorClient *prev;
-
- struct GNUNET_SERVER_Client *client;
-
- uint32_t id;
-};
-
/**
* We keep clients that are interested in performance in a linked list.
*/
*/
struct PerformanceClient *prev;
- struct PerformanceMonitorClient *pm_head;
-
- struct PerformanceMonitorClient *pm_tail;
-
/**
* Actual handle to the client.
*/
GAS_performance_remove_client (struct GNUNET_SERVER_Client *client)
{
struct PerformanceClient *pc;
- struct PerformanceMonitorClient *cur;
- struct PerformanceMonitorClient *next;
+
pc = find_client (client);
if (NULL == pc)
return;
- next = pc->pm_head;
- while (NULL != (cur = next))
- {
- next = cur->next;
- GNUNET_CONTAINER_DLL_remove (pc->pm_head, pc->pm_tail, cur);
- GNUNET_free (cur);
- }
GNUNET_CONTAINER_DLL_remove (pc_head, pc_tail, pc);
- GNUNET_SERVER_client_drop (client);
+ GAS_addresses_preference_client_disconnect (GSA_addresses, client);
GNUNET_free (pc);
}
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
{
struct PerformanceClient *pc;
-
for (pc = pc_head; pc != NULL; pc = pc->next)
if (pc->flag == START_FLAG_PERFORMANCE_WITH_PIC)
{
if (NULL == id)
return;
- if (GNUNET_NO == active)
- return;
-
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Callback for peer `%s' plugin `%s' BW out %llu, BW in %llu \n",
GNUNET_i2s (id),
ntohl (bandwidth_in.value__));
GAS_performance_notify_client(pc,
id,
- plugin_name, plugin_addr, plugin_addr_len,
+ plugin_name,
+ plugin_addr,
+ plugin_addr_len,
active,
atsi, atsi_count,
bandwidth_out, bandwidth_in);
pc = GNUNET_malloc (sizeof (struct PerformanceClient));
pc->client = client;
pc->flag = flag;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Adding performance client %s PIC\n",
+ (flag == START_FLAG_PERFORMANCE_WITH_PIC) ? "with" : "without");
+
GNUNET_SERVER_notification_context_add (nc, client);
- GNUNET_SERVER_client_keep (client);
GNUNET_CONTAINER_DLL_insert (pc_head, pc_tail, pc);
/* Send information about clients */
GAS_addresses_iterate_peers (GSA_addresses, &peer_it, pc);
}
+
static void transmit_req_addr (struct AddressIteration *ai,
const struct GNUNET_PeerIdentity *id,
const char *plugin_name,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
{
-
struct GNUNET_ATS_Information *atsp;
struct PeerInformationMessage *msg;
char *addrp;
}
}
+
/**
* Handle 'address list request' messages from clients.
*
void
GAS_handle_performance_update (struct GNUNET_PeerIdentity *peer,
+ const char *plugin_name,
+ const void *plugin_addr,
+ size_t plugin_addr_len,
+ const int active,
struct GNUNET_ATS_Information *ats,
- uint32_t ats_count)
+ uint32_t ats_count,
+ struct GNUNET_BANDWIDTH_Value32NBO
+ bandwidth_out,
+ struct GNUNET_BANDWIDTH_Value32NBO
+ bandwidth_in)
{
+/* Notify here */
+ GAS_performance_notify_all_clients (peer,
+ plugin_name,
+ plugin_addr, plugin_addr_len,
+ active,
+ ats, ats_count,
+ bandwidth_out, bandwidth_in);
+
+#if 0
struct PerformanceClient *cur;
struct PerformanceMonitorClient *curm;
struct MonitorResponseMessage *mrm;
+ size_t msglen;
+
+ msglen = sizeof (struct MonitorResponseMessage) +
+ ats_count * sizeof (struct GNUNET_ATS_Information);
+ mrm = GNUNET_malloc (msglen);
+
+ mrm->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_MONITOR_RESPONSE);
+ mrm->header.size = htons (msglen);
+ mrm->ats_count = htonl (ats_count);
+ mrm->peer = *peer;
+ memcpy (&mrm[1], ats, ats_count * sizeof (struct GNUNET_ATS_Information));
+
for (cur = pc_head; NULL != cur; cur = cur->next)
for (curm = cur->pm_head; NULL != curm; curm = curm->next)
{
/* Notify client about update */
+ mrm->id = htonl (curm->id);
+ GNUNET_SERVER_notification_context_unicast (nc,
+ cur->client,
+ (struct GNUNET_MessageHeader *) mrm,
+ GNUNET_YES);
}
-}
-
-
-
-void
-GAS_handle_monitor (void *cls,
- struct GNUNET_SERVER_Client *client,
- const struct GNUNET_MessageHeader *message)
-{
- struct PerformanceClient *pc;
- struct PerformanceMonitorClient *res;
- struct MonitorMessage *mm = (struct MonitorMessage *) message;
- size_t msg_size;
- uint32_t id;
- uint32_t op;
-
- pc = find_client (client);
- if (NULL == pc)
- {
- GNUNET_break (0);
- return;
- }
-
- msg_size = ntohs (message->size);
- if (msg_size < sizeof (struct MonitorMessage))
- {
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
-
- id = ntohl (mm->id);
- op = ntohl (mm->op);
-
- for (res = pc->pm_head; NULL != res; res = res->next)
- if ((res->id == id) && (client == res->client))
- break;
-
- if (GNUNET_YES == op)
- {
- /* Start monitoring */
- if (NULL != res)
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return; /* Duplicate*/
- }
- res = GNUNET_malloc (sizeof (struct PerformanceMonitorClient));
- res->client = client;
- res->id = id;
- GNUNET_CONTAINER_DLL_insert (pc->pm_head, pc->pm_tail, res);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Added performance monitoring client %p id %u\n",
- client, id);
- }
- else if (GNUNET_NO == op)
- {
- /* Stop monitoring */
- if (NULL == res)
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return; /* Not existing */
- }
- GNUNET_CONTAINER_DLL_remove (pc->pm_head, pc->pm_tail, res);
- GNUNET_free (res);
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Removed performance monitoring client %p id %u\n",
- client, id);
- }
- else
- {
- GNUNET_break (0);
- GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
- return;
- }
- GNUNET_SERVER_receive_done (client, GNUNET_OK);
+ GNUNET_free (mrm);
+#endif
}
"RESERVATION_REQUEST");
amount = (int32_t) ntohl (msg->amount);
res_delay = GAS_reservations_reserve (&msg->peer, amount);
- if (res_delay.rel_value > 0)
+ if (res_delay.rel_value_us > 0)
amount = 0;
result.header.size = htons (sizeof (struct ReservationResultMessage));
result.header.type = htons (GNUNET_MESSAGE_TYPE_ATS_RESERVATION_RESULT);
1, GNUNET_NO);
pi = (const struct PreferenceInformation *) &msg[1];
for (i = 0; i < nump; i++)
- GAS_addresses_change_preference (GSA_addresses,
+ GAS_addresses_preference_change (GSA_addresses,
+ client,
+ &msg->peer,
+ (enum GNUNET_ATS_PreferenceKind)
+ ntohl (pi[i].preference_kind),
+ pi[i].preference_value);
+ GNUNET_SERVER_receive_done (client, GNUNET_OK);
+}
+
+
+/**
+ * Handle 'preference feedback' messages from clients.
+ *
+ * @param cls unused, NULL
+ * @param client client that sent the request
+ * @param message the request message
+ */
+void
+GAS_handle_preference_feedback (void *cls,
+ struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_MessageHeader *message)
+{
+ const struct FeedbackPreferenceMessage *msg;
+ const struct PreferenceInformation *pi;
+ uint16_t msize;
+ uint32_t nump;
+ uint32_t i;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received `%s' message\n",
+ "PREFERENCE_FEEDBACK");
+ msize = ntohs (message->size);
+ if (msize < sizeof (struct FeedbackPreferenceMessage))
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ msg = (const struct FeedbackPreferenceMessage *) message;
+ nump = ntohl (msg->num_feedback);
+ if (msize !=
+ sizeof (struct FeedbackPreferenceMessage) +
+ nump * sizeof (struct PreferenceInformation))
+ {
+ GNUNET_break (0);
+ GNUNET_SERVER_receive_done (client, GNUNET_SYSERR);
+ return;
+ }
+ GNUNET_STATISTICS_update (GSA_stats, "# preference feedbacks requests processed",
+ 1, GNUNET_NO);
+ pi = (const struct PreferenceInformation *) &msg[1];
+ for (i = 0; i < nump; i++)
+ GAS_addresses_preference_feedback (GSA_addresses,
client,
&msg->peer,
+ GNUNET_TIME_relative_ntoh(msg->scope),
(enum GNUNET_ATS_PreferenceKind)
ntohl (pi[i].preference_kind),
pi[i].preference_value);
}
+
/**
* Initialize performance subsystem.
*
projects / oweals / gnunet.git / blobdiff