[Nagios-checkins] SF.net SVN: nagios:[2047] nagioscore/trunk

ageric at users.sourceforge.net ageric at users.sourceforge.net
Thu Aug 2 00:49:34 UTC 2012


Revision: 2047
          http://nagios.svn.sourceforge.net/nagios/?rev=2047&view=rev
Author:   ageric
Date:     2012-08-02 00:49:33 +0000 (Thu, 02 Aug 2012)
Log Message:
-----------
core: Remove some dead variables and types

The circular_buffer struct is no more. None of the variables of that
type is used anymore, so this commit consigns them and the type
declaration to oblivion.

Signed-off-by: Andreas Ericsson <ae at op5.se>

Modified Paths:
--------------
    nagioscore/trunk/base/nagios.c
    nagioscore/trunk/base/utils.c
    nagioscore/trunk/include/nagios.h
    nagioscore/trunk/t-tap/test_nagios_config.c
    nagioscore/trunk/t-tap/test_timeperiods.c

Modified: nagioscore/trunk/base/nagios.c
===================================================================
--- nagioscore/trunk/base/nagios.c	2012-08-02 00:49:08 UTC (rev 2046)
+++ nagioscore/trunk/base/nagios.c	2012-08-02 00:49:33 UTC (rev 2047)
@@ -253,7 +253,6 @@
 
 dbuf            check_result_dbuf;
 
-circular_buffer check_result_buffer;
 pthread_t       worker_threads[TOTAL_WORKER_THREADS];
 
 check_stats     check_statistics[MAX_CHECK_STATS_TYPES];

Modified: nagioscore/trunk/base/utils.c
===================================================================
--- nagioscore/trunk/base/utils.c	2012-08-02 00:49:08 UTC (rev 2046)
+++ nagioscore/trunk/base/utils.c	2012-08-02 00:49:33 UTC (rev 2047)
@@ -247,14 +247,11 @@
 #endif
 #endif
 
-extern check_result    *check_result_list;
 extern unsigned long   max_check_result_file_age;
 
 extern dbuf            check_result_dbuf;
 
 extern pthread_t       worker_threads[TOTAL_WORKER_THREADS];
-extern circular_buffer check_result_buffer;
-extern circular_buffer event_broker_buffer;
 
 extern check_stats     check_statistics[MAX_CHECK_STATS_TYPES];
 

Modified: nagioscore/trunk/include/nagios.h
===================================================================
--- nagioscore/trunk/include/nagios.h	2012-08-02 00:49:08 UTC (rev 2046)
+++ nagioscore/trunk/include/nagios.h	2012-08-02 00:49:33 UTC (rev 2047)
@@ -360,18 +360,6 @@
 	} passive_check_result;
 
 
-/* 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;

Modified: nagioscore/trunk/t-tap/test_nagios_config.c
===================================================================
--- nagioscore/trunk/t-tap/test_nagios_config.c	2012-08-02 00:49:08 UTC (rev 2046)
+++ nagioscore/trunk/t-tap/test_nagios_config.c	2012-08-02 00:49:33 UTC (rev 2047)
@@ -240,12 +240,10 @@
 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;
 pthread_t       worker_threads[TOTAL_WORKER_THREADS];
 
 check_stats     check_statistics[MAX_CHECK_STATS_TYPES];

Modified: nagioscore/trunk/t-tap/test_timeperiods.c
===================================================================
--- nagioscore/trunk/t-tap/test_timeperiods.c	2012-08-02 00:49:08 UTC (rev 2046)
+++ nagioscore/trunk/t-tap/test_timeperiods.c	2012-08-02 00:49:33 UTC (rev 2047)
@@ -239,7 +239,6 @@
 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;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Nagios-commits mailing list