[icinga-checkins] icinga.org: icinga-core/mfriedrich/workers: core: reamove some dead variables and types

git at icinga.org git at icinga.org
Sun Aug 5 23:32:13 CEST 2012


Module: icinga-core
Branch: mfriedrich/workers
Commit: 3956dde54248e80a8388346bfdda84ff68ae3c04
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=3956dde54248e80a8388346bfdda84ff68ae3c04

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sun Aug  5 18:02:41 2012 +0200

core: reamove some dead variables and types

- circular_buffer check_result_buffer
- check_result *check_result_list

---

 base/icinga.c              |    2 --
 base/utils.c               |    4 ----
 include/icinga.h           |   12 ------------
 t-tap/test_icinga_config.c |    3 ---
 t-tap/test_timeperiods.c   |    3 ---
 5 files changed, 0 insertions(+), 24 deletions(-)

diff --git a/base/icinga.c b/base/icinga.c
index 2e3c2d8..77c9241 100644
--- a/base/icinga.c
+++ b/base/icinga.c
@@ -262,8 +262,6 @@ unsigned long	max_check_result_file_age = DEFAULT_MAX_CHECK_RESULT_AGE;
 
 dbuf            check_result_dbuf;
 
-circular_buffer check_result_buffer;
-
 check_stats     check_statistics[MAX_CHECK_STATS_TYPES];
 
 char            *debug_file;
diff --git a/base/utils.c b/base/utils.c
index 1c5ae98..c238fb5 100644
--- a/base/utils.c
+++ b/base/utils.c
@@ -248,14 +248,10 @@ extern char     *tzname[2];
 #endif
 #endif
 
-extern check_result    *check_result_list;
 extern unsigned long   max_check_result_file_age;
 
 extern dbuf            check_result_dbuf;
 
-extern circular_buffer check_result_buffer;
-extern circular_buffer event_broker_buffer;
-
 extern check_stats     check_statistics[MAX_CHECK_STATS_TYPES];
 
 extern char            *debug_file;
diff --git a/include/icinga.h b/include/icinga.h
index 61bcf8e..3cbd0b0 100644
--- a/include/icinga.h
+++ b/include/icinga.h
@@ -357,18 +357,6 @@ typedef struct sched_info_struct{
 
 
 
-/* CIRCULAR_BUFFER structure - used by worker threads */
-typedef struct circular_buffer_struct{
-	void            **buffer;
-	int             tail;
-	int             head;
-	int             items;
-	int		high;		/* highest number of items that has ever been stored in buffer */
-	unsigned long   overflow;
-	pthread_mutex_t buffer_lock;
-        }circular_buffer;
-
-
 /* DBUF structure - dynamic string storage */
 typedef struct dbuf_struct{
 	char *buf;
diff --git a/t-tap/test_icinga_config.c b/t-tap/test_icinga_config.c
index 94a0c93..f968c3b 100644
--- a/t-tap/test_icinga_config.c
+++ b/t-tap/test_icinga_config.c
@@ -227,13 +227,10 @@ extern host 		*host_list;
 notification    *notification_list;
 
 check_result    check_result_info;
-check_result    *check_result_list = NULL;
 unsigned long	max_check_result_file_age = DEFAULT_MAX_CHECK_RESULT_AGE;
 
 dbuf            check_result_dbuf;
 
-circular_buffer check_result_buffer;
-
 check_stats     check_statistics[MAX_CHECK_STATS_TYPES];
 
 char            *debug_file;
diff --git a/t-tap/test_timeperiods.c b/t-tap/test_timeperiods.c
index ff21fd7..6f670fd 100644
--- a/t-tap/test_timeperiods.c
+++ b/t-tap/test_timeperiods.c
@@ -231,13 +231,10 @@ extern host 		*host_list;
 notification    *notification_list;
 
 check_result    check_result_info;
-check_result    *check_result_list = NULL;
 unsigned long	max_check_result_file_age = DEFAULT_MAX_CHECK_RESULT_AGE;
 
 dbuf            check_result_dbuf;
 
-circular_buffer check_result_buffer;
-
 check_stats     check_statistics[MAX_CHECK_STATS_TYPES];
 
 char            *debug_file;





More information about the icinga-checkins mailing list