- Put Dmsg() on inside if() to avoid calling subroutine.

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

diff --git a/bacula/src/filed/heartbeat.c b/bacula/src/filed/heartbeat.c
index c13a6feff126abe4708ae922f74148b382f029d1..15c755b4fd18641633b9c1196397ecada4a362a3 100644 (file)
--- a/bacula/src/filed/heartbeat.c
+++ b/bacula/src/filed/heartbeat.c
@@ -9,38 +9,25 @@
  *
  */
 /*
-   Copyright (C) 2003-2004 Kern Sibbald and John Walker
+   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 as
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
+   modify it under the terms of the GNU General Public License
+   version 2 as ammended 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 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.
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
+   the file LICENSE for additional details.
 
  */
 
 #include "bacula.h"
 #include "filed.h"
 
-#if defined(HAVE_CYGWIN) || defined(HAVE_WIN32)
-/* pthread_kill() dies on Cygwin, so disable it */
-#define pthread_kill(x, y)
-/* Use shorter wait interval on Cygwin because no kill */
 #define WAIT_INTERVAL 10
 
-#else  /* Unix systems */
-#define WAIT_INTERVAL 60
-#endif
-
 extern "C" void *sd_heartbeat_thread(void *arg);
 extern "C" void *dir_heartbeat_thread(void *arg);
 extern bool no_signals;
@@ -57,14 +44,19 @@ extern "C" void *sd_heartbeat_thread(void *arg)
    BSOCK *sd, *dir;
    time_t last_heartbeat = time(NULL);
    time_t now;
+   int oflags;
 
    pthread_detach(pthread_self());
 
    /* Get our own local copy */
    sd = dup_bsock(jcr->store_bsock);
+   if ((oflags = fcntl(sd->fd, F_GETFL, 0)) != -1) {
+      fcntl(sd->fd, F_SETFL, oflags|O_NONBLOCK);
+   }
    dir = dup_bsock(jcr->dir_bsock);
 
    jcr->hb_bsock = sd;
+   jcr->hb_dir_bsock = dir;
 
    /* Hang reading the socket to the SD, and every time we get
     *  a heartbeat or we get a wait timeout (1 minute), we
@@ -80,18 +72,22 @@ extern "C" void *sd_heartbeat_thread(void *arg)
            last_heartbeat = now;
         }
       }
+      if (is_bnet_stop(sd)) {
+        break;
+      }
       if (n == 1) {                  /* input waiting */
         bnet_recv(sd);               /* read it -- probably heartbeat from sd */
         if (sd->msglen <= 0) {
-           Dmsg1(100, "Got BNET_SIG %d from SD\n", sd->msglen);
+            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, "Got %d bytes from SD. MSG=%s\n", sd->msglen, sd->msg);
         }
       }
    }
    bnet_close(sd);
    bnet_close(dir);
    jcr->hb_bsock = NULL;
+   jcr->hb_dir_bsock = NULL;
    return NULL;
 }
 
@@ -105,6 +101,7 @@ void start_heartbeat_monitor(JCR *jcr)
     */
    if (!no_signals) {
       jcr->hb_bsock = NULL;
+      jcr->hb_dir_bsock = NULL;
       pthread_create(&jcr->heartbeat_id, NULL, sd_heartbeat_thread, (void *)jcr);
    }
 }
@@ -118,19 +115,28 @@ void stop_heartbeat_monitor(JCR *jcr)
    }
    /* Wait max 10 secs for heartbeat thread to start */
    while (jcr->hb_bsock == NULL && cnt++ < 200) {
-      bmicrosleep(0, 50);            /* avoid race */
+      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_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 */
+   }
+   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) {
-      /* Naturally, Cygwin 1.3.20 craps out on the following */
       pthread_kill(jcr->heartbeat_id, TIMEOUT_SIGNAL); /* make heartbeat thread go away */
-      bmicrosleep(0, 500);
+      bmicrosleep(0, 500000);
+   }
+   if (jcr->hb_bsock) {
    }
 }