New overhaul of xattr code.

[bacula/bacula] / bacula / src / filed / heartbeat.c

diff --git a/bacula/src/filed/heartbeat.c b/bacula/src/filed/heartbeat.c
index 7a77621610d61c67b9b5b065f3aaff355b4e029f..b27e8998b94105d3e20c61343af37e2fbf3ba5b5 100644 (file)
--- a/bacula/src/filed/heartbeat.c
+++ b/bacula/src/filed/heartbeat.c
@@ -1,3 +1,30 @@
+/*
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2003-2008 Free Software Foundation Europe e.V.
+
+   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 three of the GNU Affero 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
+   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 Affero 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 Kern Sibbald.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
 /*
  *  Bacula File Daemon heartbeat routines
  *    Listens for heartbeats coming from the SD
@@ -8,20 +35,6 @@
  *   Version $Id$
  *
  */
-/*
-   Copyright (C) 2003-2005 Kern Sibbald
-
-   This program is free software; you can redistribute it and/or
-   modify it under the terms of the GNU General Public License
-   version 2 as amended with additional clauses defined in the
-   file LICENSE in the main source directory.
-
-   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 
-   the file LICENSE for additional details.
-
- */
 
 #include "bacula.h"
 #include "filed.h"
@@ -52,6 +65,7 @@ extern "C" void *sd_heartbeat_thread(void *arg)
    dir = dup_bsock(jcr->dir_bsock);
 
    jcr->hb_bsock = sd;
+   jcr->hb_started = true;
    jcr->hb_dir_bsock = dir;
 
    /* Hang reading the socket to the SD, and every time we get
@@ -72,18 +86,19 @@ extern "C" void *sd_heartbeat_thread(void *arg)
          break;
       }
       if (n == 1) {                   /* input waiting */
-         bnet_recv(sd);               /* read it -- probably heartbeat from sd */
+         sd->recv();                  /* read it -- probably heartbeat from sd */
          if (sd->msglen <= 0) {
             Dmsg1(100, "Got BNET_SIG %d from SD\n", sd->msglen);
          } else {
             Dmsg2(100, "Got %d bytes from SD. MSG=%s\n", sd->msglen, sd->msg);
          }
       }
-      Dmsg2(100, "wait_intr=%d stop=%d\n", n, is_bnet_stop(sd));
+      Dmsg2(200, "wait_intr=%d stop=%d\n", n, is_bnet_stop(sd));
    }
-   bnet_close(sd);
-   bnet_close(dir);
+   sd->close();
+   dir->close();
    jcr->hb_bsock = NULL;
+   jcr->hb_started = false;
    jcr->hb_dir_bsock = NULL;
    return NULL;
 }
@@ -98,6 +113,7 @@ void start_heartbeat_monitor(JCR *jcr)
     */
    if (!no_signals) {
       jcr->hb_bsock = NULL;
+      jcr->hb_started = false;
       jcr->hb_dir_bsock = NULL;
       pthread_create(&jcr->heartbeat_id, NULL, sd_heartbeat_thread, (void *)jcr);
    }
@@ -111,25 +127,26 @@ void stop_heartbeat_monitor(JCR *jcr)
       return;
    }
    /* Wait max 10 secs for heartbeat thread to start */
-   while (jcr->hb_bsock == NULL && cnt++ < 200) {
+   while (!jcr->hb_started && cnt++ < 200) {
       bmicrosleep(0, 50000);         /* wait for start */
    }
-   if (!jcr->hb_bsock) {
-   }
 
-   if (jcr->hb_bsock) {
-      jcr->hb_bsock->timed_out = 1;   /* set timed_out to terminate read */
-      jcr->hb_bsock->terminated = 1;  /* set to terminate read */
+   if (jcr->hb_started) {
+      jcr->hb_bsock->set_timed_out();       /* set timed_out to terminate read */
+      jcr->hb_bsock->set_terminated();      /* set to terminate read */
    }
    if (jcr->hb_dir_bsock) {
-      jcr->hb_dir_bsock->timed_out = 1;   /* set timed_out to terminate read */
-      jcr->hb_dir_bsock->terminated = 1;  /* set to terminate read */
+      jcr->hb_dir_bsock->set_timed_out();     /* set timed_out to terminate read */
+      jcr->hb_dir_bsock->set_terminated();    /* set to terminate read */
+   }
+   if (jcr->hb_started) {
+      Dmsg0(100, "Send kill to heartbeat id\n");
+      pthread_kill(jcr->heartbeat_id, TIMEOUT_SIGNAL);  /* make heartbeat thread go away */
+      bmicrosleep(0, 50000);
    }
-   pthread_kill(jcr->heartbeat_id, TIMEOUT_SIGNAL);  /* make heartbeat thread go away */
-   bmicrosleep(0, 50000);
    cnt = 0;
    /* Wait max 100 secs for heartbeat thread to stop */
-   while (jcr->hb_bsock && cnt++ < 200) {
+   while (jcr->hb_started && cnt++ < 200) {
       pthread_kill(jcr->heartbeat_id, TIMEOUT_SIGNAL);  /* make heartbeat thread go away */
       bmicrosleep(0, 500000);
    }
@@ -152,6 +169,7 @@ extern "C" void *dir_heartbeat_thread(void *arg)
    dir = dup_bsock(jcr->dir_bsock);
 
    jcr->hb_bsock = dir;
+   jcr->hb_started = true;
 
    for ( ; !is_bnet_stop(dir); ) {
       time_t now, next;
@@ -159,13 +177,14 @@ extern "C" void *dir_heartbeat_thread(void *arg)
       now = time(NULL);
       next = now - last_heartbeat;
       if (next >= me->heartbeat_interval) {
-         bnet_sig(dir, BNET_HEARTBEAT);
+         dir->signal(BNET_HEARTBEAT);
          last_heartbeat = now;
       }
       bmicrosleep(next, 0);
    }
-   bnet_close(dir);
+   dir->close();
    jcr->hb_bsock = NULL;
+   jcr->hb_started = false;
    return NULL;
 }
 
@@ -175,6 +194,7 @@ extern "C" void *dir_heartbeat_thread(void *arg)
 void start_dir_heartbeat(JCR *jcr)
 {
    if (me->heartbeat_interval) {
+      jcr->dir_bsock->set_locking();
       pthread_create(&jcr->heartbeat_id, NULL, dir_heartbeat_thread, (void *)jcr);
    }
 }