ebl use tokyocabinet by default instead of htable

[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..47e90cf
--- a/bacula/src/lib/watchdog.c
+++ b/bacula/src/lib/watchdog.c
@@ -1,29 +1,37 @@
 /*
- * Bacula thread watchdog routine. General routine that 
- *  allows setting a watchdog timer with a callback that is
- *  called when the timer goes off.
- *
- *  Kern Sibbald, January MMII
- *
- */
-/*
-   Copyright (C) 2000-2005 Kern Sibbald
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2002-2007 Free Software Foundation Europe e.V.
 
-   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.
+   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 and included
+   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
+   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.
+*/
+/*
+ * Bacula thread watchdog routine. General routine that 
+ *  allows setting a watchdog timer with a callback that is
+ *  called when the timer goes off.
+ *
+ *  Kern Sibbald, January MMII
+ *
  */
 
 #include "bacula.h"
@@ -71,16 +79,17 @@ int start_watchdog(void)
    watchdog_time = time(NULL);
 
    if ((errstat=rwl_init(&lock)) != 0) {
+      berrno be;
       Emsg1(M_ABORT, 0, _("Unable to initialize watchdog lock. ERR=%s\n"),
-            strerror(errstat));
+            be.bstrerror(errstat));
    }
    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;
 }
 
@@ -93,6 +102,7 @@ static void ping_watchdog()
    P(timer_mutex);
    pthread_cond_signal(&timer);
    V(timer_mutex);
+   bmicrosleep(0, 100);
 }
 
 /*
@@ -111,9 +121,8 @@ int stop_watchdog(void)
    }
 
    quit = true;                       /* notify watchdog thread to stop */
-   wd_is_init = false;
-
    ping_watchdog();
+
    stat = pthread_join(wd_tid, NULL);
 
    while (!wd_queue->empty()) {
@@ -140,6 +149,7 @@ int stop_watchdog(void)
    delete wd_inactive;
    wd_inactive = NULL;
    rwl_destroy(&lock);
+   wd_is_init = false;
 
    return stat;
 }
@@ -262,6 +272,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 +284,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;
          }
       }
@@ -310,8 +321,9 @@ static void wd_lock()
 {
    int errstat;
    if ((errstat=rwl_writelock(&lock)) != 0) {
+      berrno be;
       Emsg1(M_ABORT, 0, _("rwl_writelock failure. ERR=%s\n"),
-           strerror(errstat));
+           be.bstrerror(errstat));
    }
 }
 
@@ -324,7 +336,8 @@ static void wd_unlock()
 {
    int errstat;
    if ((errstat=rwl_writeunlock(&lock)) != 0) {
+      berrno be;
       Emsg1(M_ABORT, 0, _("rwl_writeunlock failure. ERR=%s\n"),
-           strerror(errstat));
+           be.bstrerror(errstat));
    }
 }