[hipl-commit] [trunk] Rev 4418: Replaced static definition of performance constants with enumeration.
- From: Tim Just <tim.just@xxxxxxxxxxxxxx>
- To: hipl-commit@xxxxxxxxxxxxx
- Date: Tue, 27 Apr 2010 19:39:14 +0300
Committer: Tim Just <tim.just@xxxxxxxxxxxxxx>
Date: 27/04/2010 at 19:39:14
Revision: 4418
Revision-id: tim.just@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
Branch nick: trunk
Log:
Replaced static definition of performance constants with enumeration.
Also removed unneeded measurement slots.
Modified:
M firewall/firewall.c
M hipd/hipd.c
M hipd/input.c
M lib/core/performance.h
=== modified file 'firewall/firewall.c'
--- firewall/firewall.c 2010-04-26 12:21:37 +0000
+++ firewall/firewall.c 2010-04-27 16:38:06 +0000
@@ -805,11 +805,6 @@
*/
static void firewall_close(const int signal)
{
-#ifdef CONFIG_HIP_PERFORMANCE
- HIP_DEBUG("Stop and write PERF_ALL\n");
- hip_perf_stop_benchmark(perf_set, PERF_ALL);
- hip_perf_write_benchmark(perf_set, PERF_ALL);
-#endif
HIP_DEBUG("Closing firewall...\n");
firewall_exit();
exit(signal);
@@ -2130,28 +2125,23 @@
check_and_create_dir("results", DEFAULT_CONFIG_DIR_MODE);
- /* To keep things simple, we use a subset of the performance set
originally created for the HIP daemon. */
+ /* To keep things simple, we use a subset of the performance set originally
+ * created for the HIP daemon. */
hip_perf_set_name(perf_set, PERF_I1, "results/PERF_I1.csv");
hip_perf_set_name(perf_set, PERF_R1, "results/PERF_R1.csv");
hip_perf_set_name(perf_set, PERF_I2, "results/PERF_I2.csv");
hip_perf_set_name(perf_set, PERF_R2, "results/PERF_R2.csv");
hip_perf_set_name(perf_set, PERF_VERIFY, "results/PERF_VERIFY.csv");
hip_perf_set_name(perf_set, PERF_BASE, "results/PERF_BASE.csv");
- hip_perf_set_name(perf_set, PERF_ALL, "results/PERF_ALL.csv");
- hip_perf_set_name(perf_set, PERF_UPDATE_COMPLETE,
"results/PERF_UPDATE_COMPLETE.csv");
-
hip_perf_set_name(perf_set, PERF_CLOSE_SEND,
"results/PERF_CLOSE_SEND.csv");
hip_perf_set_name(perf_set, PERF_HANDLE_CLOSE,
"results/PERF_HANDLE_CLOSE.csv");
hip_perf_set_name(perf_set, PERF_HANDLE_CLOSE_ACK,
"results/PERF_HANDLE_CLOSE_ACK.csv");
- hip_perf_set_name(perf_set, PERF_HANDLE_UPDATE_1,
"results/PERF_HANDLE_UPDATE_1.csv");
hip_perf_set_name(perf_set, PERF_CLOSE_COMPLETE,
"results/PERF_CLOSE_COMPLETE.csv");
hip_perf_set_name(perf_set, PERF_DSA_VERIFY_IMPL,
"results/PERF_DSA_VERIFY_IMPL.csv");
hip_perf_set_name(perf_set, PERF_RSA_VERIFY_IMPL,
"results/PERF_RSA_VERIFY_IMPL.csv");
HIP_DEBUG("Opening perf set\n");
hip_perf_open(perf_set);
- HIP_DEBUG("Start PERF_ALL\n");
- hip_perf_start_benchmark(perf_set, PERF_ALL);
#endif
memset(&default_hit, 0, sizeof(default_hit));
=== modified file 'hipd/hipd.c'
--- hipd/hipd.c 2010-04-25 14:38:43 +0000
+++ hipd/hipd.c 2010-04-27 16:38:06 +0000
@@ -360,7 +360,6 @@
#ifdef CONFIG_HIP_PERFORMANCE
- int bench_set = 0;
HIP_DEBUG("Creating perf set\n");
perf_set = hip_perf_create(PERF_MAX);
@@ -377,18 +376,9 @@
hip_perf_set_name(perf_set, PERF_DSA_SIGN_IMPL,
"results/PERF_DSA_SIGN_IMPL.csv");
hip_perf_set_name(perf_set, PERF_VERIFY, "results/PERF_VERIFY.csv");
hip_perf_set_name(perf_set, PERF_BASE, "results/PERF_BASE.csv");
- hip_perf_set_name(perf_set, PERF_ALL, "results/PERF_ALL.csv");
- hip_perf_set_name(perf_set, PERF_UPDATE_SEND,
"results/PERF_UPDATE_SEND.csv");
- hip_perf_set_name(perf_set, PERF_VERIFY_UPDATE,
"results/PERF_VERIFY_UPDATE.csv");
- hip_perf_set_name(perf_set, PERF_UPDATE_COMPLETE,
"results/PERF_UPDATE_COMPLETE.csv");
- hip_perf_set_name(perf_set, PERF_HANDLE_UPDATE_ESTABLISHED,
"results/PERF_HANDLE_UPDATE_ESTABLISHED.csv");
- hip_perf_set_name(perf_set, PERF_HANDLE_UPDATE_REKEYING,
"results/PERF_HANDLE_UPDATE_REKEYING.csv");
- hip_perf_set_name(perf_set, PERF_UPDATE_FINISH_REKEYING,
"results/PERF_UPDATE_FINISH_REKEYING.csv");
hip_perf_set_name(perf_set, PERF_CLOSE_SEND,
"results/PERF_CLOSE_SEND.csv");
hip_perf_set_name(perf_set, PERF_HANDLE_CLOSE,
"results/PERF_HANDLE_CLOSE.csv");
hip_perf_set_name(perf_set, PERF_HANDLE_CLOSE_ACK,
"results/PERF_HANDLE_CLOSE_ACK.csv");
- hip_perf_set_name(perf_set, PERF_HANDLE_UPDATE_1,
"results/PERF_HANDLE_UPDATE_1.csv");
- hip_perf_set_name(perf_set, PERF_HANDLE_UPDATE_2,
"results/PERF_HANDLE_UPDATE_2.csv");
hip_perf_set_name(perf_set, PERF_CLOSE_COMPLETE,
"results/PERF_CLOSE_COMPLETE.csv");
hip_perf_set_name(perf_set, PERF_DSA_VERIFY_IMPL,
"results/PERF_DSA_VERIFY_IMPL.csv");
hip_perf_set_name(perf_set, PERF_RSA_VERIFY_IMPL,
"results/PERF_RSA_VERIFY_IMPL.csv");
@@ -553,14 +543,6 @@
_HIP_DEBUG("Idle.\n");
goto to_maintenance;
}
-#ifdef CONFIG_HIP_PERFORMANCE
- if (bench_set) { //1 = true; 0 = false
- HIP_DEBUG("Stop and write PERF_ALL\n");
- hip_perf_stop_benchmark(perf_set, PERF_ALL);
- hip_perf_write_benchmark(perf_set, PERF_ALL);
- bench_set = 0;
- }
-#endif
/* see bugzilla bug id 392 to see why */
if (FD_ISSET(hip_raw_sock_input_v6, &read_fdset) &&
@@ -605,12 +587,6 @@
}
} else {
if (FD_ISSET(hip_raw_sock_input_v6, &read_fdset)) {
-#ifdef CONFIG_HIP_PERFORMANCE
- HIP_DEBUG("Start PERF_ALL\n");
- bench_set = 1; //1 = true; 0 = false
- hip_perf_start_benchmark(perf_set, PERF_ALL);
-#endif
-
/* Receiving of a raw HIP message from IPv6 socket. */
struct in6_addr saddr, daddr;
hip_portpair_t pkt_info;
=== modified file 'hipd/input.c'
--- hipd/input.c 2010-04-20 12:15:57 +0000
+++ hipd/input.c 2010-04-27 16:38:06 +0000
@@ -2838,14 +2838,12 @@
HIP_INFO("Reached ESTABLISHED state\n");
HIP_INFO("Handshake completed\n");
-
-
-
#ifdef CONFIG_HIP_PERFORMANCE
HIP_DEBUG("Stop and write PERF_BASE\n");
hip_perf_stop_benchmark(perf_set, PERF_BASE);
hip_perf_write_benchmark(perf_set, PERF_BASE);
#endif
+
if (entry->hip_msg_retrans.buf) {
entry->hip_msg_retrans.count = 0;
memset(entry->hip_msg_retrans.buf, 0, HIP_MAX_NETWORK_PACKET);
=== modified file 'lib/core/performance.h'
--- lib/core/performance.h 2010-04-25 14:38:43 +0000
+++ lib/core/performance.h 2010-04-27 16:38:06 +0000
@@ -50,41 +50,31 @@
int hip_perf_close(perf_set_t *perf_set);
void hip_perf_destroy(perf_set_t *perf_set);
-
-#define PERF_I1 0
-#define PERF_R1 1
-#define PERF_I2 2
-#define PERF_R2 3
-#define PERF_VERIFY 4
-#define PERF_BASE 5
-#define PERF_ALL 6
-#define PERF_UPDATE_COMPLETE 7
-#define PERF_CLOSE_SEND 8
-#define PERF_HANDLE_CLOSE 9
-#define PERF_HANDLE_CLOSE_ACK 10
-#define PERF_HANDLE_UPDATE_1 11
-#define PERF_CLOSE_COMPLETE 12
-#define PERF_DSA_VERIFY_IMPL 13
-#define PERF_RSA_VERIFY_IMPL 14
-
-/* The firewall only uses the sensors given above, hence it has a separate
PERF_MAX. */
-#define PERF_MAX_FIREWALL 15
-
-#define PERF_DH_CREATE 15
-#define PERF_SIGN 16
-#define PERF_DSA_SIGN_IMPL 17
-#define PERF_I1_SEND 18
-#define PERF_UPDATE_SEND 19
-#define PERF_VERIFY_UPDATE 20
-#define PERF_HANDLE_UPDATE_ESTABLISHED 21
-#define PERF_HANDLE_UPDATE_REKEYING 22
-#define PERF_UPDATE_FINISH_REKEYING 23
-#define PERF_HANDLE_UPDATE_2 24
-#define PERF_RSA_SIGN_IMPL 25
-#define PERF_STARTUP 26
-
-/* Number of sensors for the HIP daemon. */
-#define PERF_MAX 27
+enum perf_sensor {PERF_I1,
+ PERF_R1,
+ PERF_I2,
+ PERF_R2,
+ PERF_UPDATE,
+ PERF_VERIFY,
+ PERF_BASE,
+ PERF_CLOSE_SEND,
+ PERF_HANDLE_CLOSE,
+ PERF_HANDLE_CLOSE_ACK,
+ PERF_CLOSE_COMPLETE,
+ PERF_DSA_VERIFY_IMPL,
+ PERF_RSA_VERIFY_IMPL,
+ /* The firewall only uses the sensors given above, hence it
+ * has a separate PERF_MAX. */
+ PERF_MAX_FIREWALL,
+ PERF_DH_CREATE,
+ PERF_SIGN,
+ PERF_DSA_SIGN_IMPL,
+ PERF_I1_SEND,
+ PERF_RSA_SIGN_IMPL,
+ PERF_STARTUP,
+ /* Number of sensors for the HIP daemon. */
+ PERF_MAX
+};
perf_set_t *perf_set;
Other related posts:
- » [hipl-commit] [trunk] Rev 4418: Replaced static definition of performance constants with enumeration. - Tim Just
