Add cancel point in acquire_resources() + Documentation

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@465 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/dird/job.c b/bacula/src/dird/job.c
index 79ca09e87041ab5874fac7d5ea801f00923ee908..139e88f7140e2152e036e92fd336a87c65ad6833 100644 (file)
--- a/bacula/src/dird/job.c
+++ b/bacula/src/dird/job.c
@@ -279,6 +279,9 @@ static int acquire_resource_locks(JCR *jcr)
            jcr->sched_time - now);
       bmicrosleep(jcr->sched_time - now, 0);
       now = time(NULL);
+      if (job_canceled(jcr)) {
+        return 0;
+      }
    }
 
 
@@ -338,6 +341,9 @@ static int acquire_resource_locks(JCR *jcr)
       break;
 
 wait:
+      if (job_canceled(jcr)) {
+        return 0;
+      }
       P(mutex);
       /*
        * Wait for a resource to be released either by backoff or

diff --git a/bacula/src/version.h b/bacula/src/version.h
index 6d893e7386f2e38909e6583d45bf08e85d60d339..17f450a791d928fedfca6355baf80eb195603130 100644 (file)
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #define VERSION "1.30"
 #define VSTRING "1"
-#define BDATE   "24 April 2003"
-#define LSMDATE "24Apr03"
+#define BDATE   "28 April 2003"
+#define LSMDATE "28Apr03"
 
 /* Debug flags */
 #define DEBUG 1