[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r35110 - gnunet/src/ats
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r35110 - gnunet/src/ats |
|
Date: |
Thu, 5 Feb 2015 20:55:31 +0100 |
Author: grothoff
Date: 2015-02-05 20:55:31 +0100 (Thu, 05 Feb 2015)
New Revision: 35110
Modified:
gnunet/src/ats/gnunet-service-ats_addresses.c
gnunet/src/ats/gnunet-service-ats_addresses.h
gnunet/src/ats/gnunet-service-ats_feedback.c
gnunet/src/ats/gnunet-service-ats_performance.c
gnunet/src/ats/gnunet-service-ats_performance.h
gnunet/src/ats/gnunet-service-ats_plugins.c
gnunet/src/ats/gnunet-service-ats_plugins.h
gnunet/src/ats/gnunet-service-ats_reservations.c
gnunet/src/ats/gnunet-service-ats_scheduling.c
Log:
-misc cleanups
Modified: gnunet/src/ats/gnunet-service-ats_addresses.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.c 2015-02-05 19:48:15 UTC
(rev 35109)
+++ gnunet/src/ats/gnunet-service-ats_addresses.c 2015-02-05 19:55:31 UTC
(rev 35110)
@@ -25,14 +25,9 @@
* @author Christian Grothoff
*/
#include "platform.h"
-#include "gnunet_ats_service.h"
-#include "gnunet-service-ats.h"
#include "gnunet-service-ats_addresses.h"
-#include "gnunet-service-ats_normalization.h"
#include "gnunet-service-ats_performance.h"
#include "gnunet-service-ats_plugins.h"
-#include "gnunet-service-ats_scheduling.h"
-#include "gnunet-service-ats_reservations.h"
/**
Modified: gnunet/src/ats/gnunet-service-ats_addresses.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_addresses.h 2015-02-05 19:48:15 UTC
(rev 35109)
+++ gnunet/src/ats/gnunet-service-ats_addresses.h 2015-02-05 19:55:31 UTC
(rev 35110)
@@ -30,8 +30,6 @@
#include "gnunet_util_lib.h"
#include "gnunet_ats_service.h"
#include "gnunet-service-ats.h"
-#include "gnunet_statistics_service.h"
-#include "ats.h"
/**
* NOTE: Do not change this documentation. This documentation is based on
Modified: gnunet/src/ats/gnunet-service-ats_feedback.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_feedback.c 2015-02-05 19:48:15 UTC
(rev 35109)
+++ gnunet/src/ats/gnunet-service-ats_feedback.c 2015-02-05 19:55:31 UTC
(rev 35110)
@@ -24,7 +24,6 @@
* @author Christian Grothoff
*/
#include "platform.h"
-#include "gnunet-service-ats.h"
#include "gnunet-service-ats_plugins.h"
#include "gnunet-service-ats_feedback.h"
#include "ats.h"
Modified: gnunet/src/ats/gnunet-service-ats_performance.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_performance.c 2015-02-05 19:48:15 UTC
(rev 35109)
+++ gnunet/src/ats/gnunet-service-ats_performance.c 2015-02-05 19:55:31 UTC
(rev 35110)
@@ -27,7 +27,6 @@
#include "gnunet-service-ats.h"
#include "gnunet-service-ats_addresses.h"
#include "gnunet-service-ats_performance.h"
-#include "gnunet-service-ats_reservations.h"
#include "ats.h"
@@ -60,17 +59,17 @@
* @param bandwidth_out assigned outbound bandwidth
* @param bandwidth_in assigned inbound bandwidth
*/
-void
-GAS_performance_notify_client (struct GNUNET_SERVER_Client *client,
- const struct GNUNET_PeerIdentity *peer,
- const char *plugin_name,
- const void *plugin_addr,
- size_t plugin_addr_len,
- int active,
- const struct GNUNET_ATS_Information *atsi,
- uint32_t atsi_count,
- struct GNUNET_BANDWIDTH_Value32NBO
bandwidth_out,
- struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
+static void
+notify_client (struct GNUNET_SERVER_Client *client,
+ const struct GNUNET_PeerIdentity *peer,
+ const char *plugin_name,
+ const void *plugin_addr,
+ size_t plugin_addr_len,
+ int active,
+ const struct GNUNET_ATS_Information *atsi,
+ uint32_t atsi_count,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
+ struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
{
struct PeerInformationMessage *msg;
size_t plugin_name_length = strlen (plugin_name) + 1;
@@ -146,15 +145,15 @@
struct GNUNET_BANDWIDTH_Value32NBO
bandwidth_out,
struct GNUNET_BANDWIDTH_Value32NBO
bandwidth_in)
{
- GAS_performance_notify_client (NULL,
- peer,
- plugin_name,
- plugin_addr,
- plugin_addr_len,
- active,
- atsi, atsi_count,
- bandwidth_out,
- bandwidth_in);
+ notify_client (NULL,
+ peer,
+ plugin_name,
+ plugin_addr,
+ plugin_addr_len,
+ active,
+ atsi, atsi_count,
+ bandwidth_out,
+ bandwidth_in);
GNUNET_STATISTICS_update (GSA_stats,
"# performance updates given to clients",
1,
@@ -198,15 +197,15 @@
plugin_name,
(unsigned int) ntohl (bandwidth_out.value__),
(unsigned int) ntohl (bandwidth_in.value__));
- GAS_performance_notify_client (client,
- id,
- plugin_name,
- plugin_addr,
- plugin_addr_len,
- active,
- atsi, atsi_count,
- bandwidth_out,
- bandwidth_in);
+ notify_client (client,
+ id,
+ plugin_name,
+ plugin_addr,
+ plugin_addr_len,
+ active,
+ atsi, atsi_count,
+ bandwidth_out,
+ bandwidth_in);
}
Modified: gnunet/src/ats/gnunet-service-ats_performance.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_performance.h 2015-02-05 19:48:15 UTC
(rev 35109)
+++ gnunet/src/ats/gnunet-service-ats_performance.h 2015-02-05 19:55:31 UTC
(rev 35110)
@@ -31,17 +31,7 @@
#include "gnunet_ats_service.h"
#include "ats.h"
-/**
- * Register a new performance client.
- *
- * @param client handle of the new client
- * @param flag flag specifying the type of the client
- */
-void
-GAS_performance_add_client (struct GNUNET_SERVER_Client *client,
- enum StartFlag flag);
-
/**
* Transmit the given performance information to all performance
* clients.
@@ -72,6 +62,17 @@
/**
+ * Register a new performance client.
+ *
+ * @param client handle of the new client
+ * @param flag flag specifying the type of the client
+ */
+void
+GAS_performance_add_client (struct GNUNET_SERVER_Client *client,
+ enum StartFlag flag);
+
+
+/**
* Initialize performance subsystem.
*
* @param server handle to our server
Modified: gnunet/src/ats/gnunet-service-ats_plugins.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_plugins.c 2015-02-05 19:48:15 UTC (rev
35109)
+++ gnunet/src/ats/gnunet-service-ats_plugins.c 2015-02-05 19:55:31 UTC (rev
35110)
@@ -25,21 +25,14 @@
* @author Christian Grothoff
*/
#include "platform.h"
-#include "gnunet_util_lib.h"
-#include "gnunet_ats_service.h"
-#include "gnunet-service-ats.h"
-#include "gnunet_statistics_service.h"
#include "gnunet_ats_plugin.h"
-#include "gnunet-service-ats_addresses.h"
#include "gnunet-service-ats_performance.h"
#include "gnunet-service-ats_preferences.h"
#include "gnunet-service-ats_plugins.h"
#include "gnunet-service-ats_scheduling.h"
#include "gnunet-service-ats_normalization.h"
-#include "ats.h"
-
/**
* Configured ATS solver
*/
Modified: gnunet/src/ats/gnunet-service-ats_plugins.h
===================================================================
--- gnunet/src/ats/gnunet-service-ats_plugins.h 2015-02-05 19:48:15 UTC (rev
35109)
+++ gnunet/src/ats/gnunet-service-ats_plugins.h 2015-02-05 19:55:31 UTC (rev
35110)
@@ -27,12 +27,7 @@
#ifndef GNUNET_SERVICE_ATS_PLUGINS_H
#define GNUNET_SERVICE_ATS_PLUGINS_H
-#include "gnunet_util_lib.h"
-#include "gnunet_ats_service.h"
-#include "gnunet-service-ats.h"
#include "gnunet-service-ats_addresses.h"
-#include "gnunet_statistics_service.h"
-#include "ats.h"
/**
Modified: gnunet/src/ats/gnunet-service-ats_reservations.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_reservations.c 2015-02-05 19:48:15 UTC
(rev 35109)
+++ gnunet/src/ats/gnunet-service-ats_reservations.c 2015-02-05 19:55:31 UTC
(rev 35110)
@@ -17,7 +17,6 @@
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA.
*/
-
/**
* @file ats/gnunet-service-ats_reservations.c
* @brief ats service, inbound bandwidth reservation management
@@ -36,7 +35,7 @@
/**
- * Map of peer identities to 'struct GNUNET_BANDWIDTH_Tracker *'s
+ * Map of peer identities to `struct GNUNET_BANDWIDTH_Tracker *`s
*/
static struct GNUNET_CONTAINER_MultiPeerMap *trackers;
Modified: gnunet/src/ats/gnunet-service-ats_scheduling.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_scheduling.c 2015-02-05 19:48:15 UTC
(rev 35109)
+++ gnunet/src/ats/gnunet-service-ats_scheduling.c 2015-02-05 19:55:31 UTC
(rev 35110)
@@ -25,7 +25,6 @@
* @author Christian Grothoff
*/
#include "platform.h"
-#include "gnunet-service-ats.h"
#include "gnunet-service-ats_addresses.h"
#include "gnunet-service-ats_scheduling.h"
#include "ats.h"
@@ -99,7 +98,7 @@
if (NULL == my_client)
return;
GNUNET_STATISTICS_update (GSA_stats,
- "# address suggestions made",
+ "# address suggestions made",
1,
GNUNET_NO);
msg.header.size = htons (sizeof (struct AddressSuggestionMessage));
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r35110 - gnunet/src/ats,
gnunet <=