nagios/include common.h, 1.56, 1.57 nagios.h, 1.5, 1.6 statusdata.h, 1.6, 1.7

Update of /cvsroot/nagios/nagios/include
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31938/include

Modified Files:
        common.h nagios.h statusdata.h 
Log Message:
Event/check logic updates in prep for freshness check race condition fix

Index: statusdata.h
===================================================================
RCS file: /cvsroot/nagios/nagios/include/statusdata.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** statusdata.h        27 Feb 2006 20:32:12 -0000      1.6
--- statusdata.h        19 Oct 2007 22:46:13 -0000      1.7
***************
*** 3,8 ****
   * STATUSDATA.H - Header for external status data routines
   *
!  * Copyright (c) 2000-2006 Ethan Galstad (nagios@xxxxxxxxxx)
!  * Last Modified:   02-26-2006
   *
   * License:
--- 3,8 ----
   * STATUSDATA.H - Header for external status data routines
   *
!  * Copyright (c) 2000-2007 Ethan Galstad (nagios@xxxxxxxxxx)
!  * Last Modified:   10-19-2007
   *
   * License:
***************
*** 68,71 ****
--- 68,72 ----
        time_t  last_check;
        time_t  next_check;
+       int     check_options;
        int     check_type;
        time_t  last_state_change;
***************
*** 115,118 ****
--- 116,120 ----
        time_t  last_check;
        time_t  next_check;
+       int     check_options;
        int     check_type;
        int     checks_enabled;

Index: common.h
===================================================================
RCS file: /cvsroot/nagios/nagios/include/common.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** common.h    19 Oct 2007 14:56:20 -0000      1.56
--- common.h    19 Oct 2007 22:46:13 -0000      1.57
***************
*** 343,346 ****
--- 343,355 ----
  
  
+ 
+ /********************** HOST/SERVICE CHECK OPTIONS ***********************/
+ 
+ #define CHECK_OPTION_NONE             0       /* no check options */
+ #define CHECK_OPTION_FORCE_EXECUTION  1       /* force execution of a check 
(ignores disabled services/hosts, invalid timeperiods) */
+ #define CHECK_OPTION_FRESHNESS_CHECK    2       /* this is a freshness check 
*/
+ #define CHECK_OPTION_ORPHAN_CHECK       4       /* this is an orphan check */
+ 
+ 
  /**************************** PROGRAM MODES ******************************/
  

Index: nagios.h
===================================================================
RCS file: /cvsroot/nagios/nagios/include/nagios.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** nagios.h    19 Oct 2007 14:56:20 -0000      1.5
--- nagios.h    19 Oct 2007 22:46:13 -0000      1.6
***************
*** 316,326 ****
  
  
- /************** SERVICE CHECK OPTIONS *****************/
- 
- #define CHECK_OPTION_NONE             0       /* no check options */
- #define CHECK_OPTION_FORCE_EXECUTION  1       /* force execution of a service 
check (ignores disabled services, invalid timeperiods) */
- 
- 
- 
  /************ SCHEDULED DOWNTIME TYPES ****************/
  
--- 316,319 ----
***************
*** 342,345 ****
--- 335,339 ----
        void *event_data;
        void *event_args;
+       int event_options;
          struct timed_event_struct *next;
          struct timed_event_struct *prev;
***************
*** 360,363 ****
--- 354,358 ----
        char *service_description;                      /* service description 
*/
        int check_type;                                 /* was this an active 
or passive service check? */
+       int check_options;         
        int scheduled_check;                            /* was this a scheduled 
or an on-demand check? */
        int reschedule_check;                           /* should we reschedule 
the next check */
***************
*** 508,512 ****
  
  /**** Monitoring/Event Handler Functions ****/
! int schedule_new_event(int,int,time_t,int,unsigned long,void *,int,void 
*,void *);    /* schedules a new timed event */
  void reschedule_event(timed_event *,timed_event **,timed_event **);           
        /* reschedules an event */
  void add_event(timed_event *,timed_event **,timed_event **);                  
/* adds an event to the execution queue */
--- 503,507 ----
  
  /**** Monitoring/Event Handler Functions ****/
! int schedule_new_event(int,int,time_t,int,unsigned long,void *,int,void 
*,void *,int);        /* schedules a new timed event */
  void reschedule_event(timed_event *,timed_event **,timed_event **);           
        /* reschedules an event */
  void add_event(timed_event *,timed_event **,timed_event **);                  
/* adds an event to the execution queue */
***************
*** 786,790 ****
  /***** COMMON HOST CHECK FUNCTIONS FOR 2.X and 3.X *****/
  int perform_on_demand_host_check(host *,int *,int,int,unsigned long);
! int perform_scheduled_host_check(host *,double);
  
  
--- 781,785 ----
  /***** COMMON HOST CHECK FUNCTIONS FOR 2.X and 3.X *****/
  int perform_on_demand_host_check(host *,int *,int,int,unsigned long);
! int perform_scheduled_host_check(host *,int,double);
  
  


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/