dhb Medialist : created context menu function and moved lines which create

[bacula/bacula] / bacula / src / lib / watchdog.c

diff --git a/bacula/src/lib/watchdog.c b/bacula/src/lib/watchdog.c
old mode 100755 (executable)
new mode 100644 (file)
index 7784681..e28be11
--- a/bacula/src/lib/watchdog.c
+++ b/bacula/src/lib/watchdog.c
@@ -7,24 +7,32 @@
  *
  */
 /*
-   Copyright (C) 2000-2005 Kern Sibbald
+   Bacula® - The Network Backup Solution
 
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   Copyright (C) 2002-2006 Free Software Foundation Europe e.V.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   The main author of Bacula is Kern Sibbald, with contributions from
+   many others, a complete list can be found in the file AUTHORS.
+   This program is Free Software; you can redistribute it and/or
+   modify it under the terms of version two of the GNU General Public
+   License as published by the Free Software Foundation plus additions
+   that are listed in the file LICENSE.
+
+   This program is distributed in the hope that it will be useful, but
+   WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
    General Public License for more details.
 
-   You should have received a copy of the GNU General Public
-   License along with this program; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
- */
+   Bacula® is a registered trademark of John Walker.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
 
 #include "bacula.h"
 #include "jcr.h"
@@ -76,11 +84,11 @@ int start_watchdog(void)
    }
    wd_queue = New(dlist(dummy, &dummy->link));
    wd_inactive = New(dlist(dummy, &dummy->link));
+   wd_is_init = true;
 
    if ((stat = pthread_create(&wd_tid, NULL, watchdog_thread, NULL)) != 0) {
       return stat;
    }
-   wd_is_init = true;
    return 0;
 }
 
@@ -262,6 +270,7 @@ walk_list:
       foreach_dlist(p, wd_queue) {
          if (p->next_fire <= watchdog_time) {
             /* Run the callback */
+            Dmsg2(3400, "Watchdog callback p=0x%p fire=%d\n", p, p->next_fire);
             p->callback(p);
 
             /* Reschedule (or move to inactive list if it's a one-shot timer) */
@@ -273,7 +282,7 @@ walk_list:
                p->next_fire = watchdog_time + p->interval;
             }
          }
-         if (p->next_fire < next_time) {
+         if (p->next_fire <= next_time) {
             next_time = p->next_fire;
          }
       }