diff options
author | erdgeist <> | 2007-12-03 01:20:44 +0000 |
---|---|---|
committer | erdgeist <> | 2007-12-03 01:20:44 +0000 |
commit | bb9ffc7e618b2d496536b08a97ee330034a12e3e (patch) | |
tree | b7b49e37fe560d1c669eba648bbb38909b23eef0 | |
parent | d3b8375080887f50354cb87f8a9220a075e3634c (diff) |
Fix a broken merge result
-rw-r--r-- | ot_stats.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -5,6 +5,7 @@ | |||
5 | #include <stdlib.h> | 5 | #include <stdlib.h> |
6 | #include <arpa/inet.h> | 6 | #include <arpa/inet.h> |
7 | #include <sys/types.h> | 7 | #include <sys/types.h> |
8 | #include <sys/uio.h> | ||
8 | #include <sys/mman.h> | 9 | #include <sys/mman.h> |
9 | #include <stdio.h> | 10 | #include <stdio.h> |
10 | #include <string.h> | 11 | #include <string.h> |
@@ -299,8 +300,6 @@ void stats_issue_event( ot_status_event event, int is_tcp, size_t event_data ) { | |||
299 | break; | 300 | break; |
300 | case EVENT_SCRAPE: | 301 | case EVENT_SCRAPE: |
301 | if( is_tcp ) ot_overall_tcp_successfulscrapes++; else ot_overall_udp_successfulscrapes++; | 302 | if( is_tcp ) ot_overall_tcp_successfulscrapes++; else ot_overall_udp_successfulscrapes++; |
302 | case EVENT_CONNECT: | ||
303 | if( is_tcp ) ot_overall_tcp_connects++; else ot_overall_udp_connects++; | ||
304 | case EVENT_FULLSCRAPE: | 303 | case EVENT_FULLSCRAPE: |
305 | ot_full_scrape_count++; | 304 | ot_full_scrape_count++; |
306 | ot_full_scrape_size += event_data; | 305 | ot_full_scrape_size += event_data; |