kes Simplify locking in the reservations system.

[bacula/bacula] / bacula / src / dird / dird.h

diff --git a/bacula/src/dird/dird.h b/bacula/src/dird/dird.h
index 73623375a496d80f03bb64f0a0fecea28d199125..c0b5393e9227100dd522923f73b8e29b53a49ccb 100644 (file)
--- a/bacula/src/dird/dird.h
+++ b/bacula/src/dird/dird.h
@@ -1,14 +1,7 @@
-/*
- * Includes specific to the Director
- *
- *     Kern Sibbald, December MM
- *
- *    Version $Id$
- */
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2007 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.
@@ -27,11 +20,18 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Bacula® is a registered trademark ofJohn Walker.
+   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.
 */
+/*
+ * Includes specific to the Director
+ *
+ *     Kern Sibbald, December MM
+ *
+ *    Version $Id$
+ */
 
 #include "lib/runscript.h"
 #include "dird_conf.h"
@@ -43,8 +43,6 @@
 #include "jcr.h"
 #include "bsr.h"
 #include "ua.h"
-#include "protos.h"
-
 #include "jobq.h"
 
 /* Globals that dird.c exports */
@@ -52,6 +50,31 @@ extern DIRRES *director;                     /* Director resource */
 extern int FDConnectTimeout;
 extern int SDConnectTimeout;
 
-/* From job.c */
-void dird_free_jcr(JCR *jcr);
-void dird_free_jcr_pointers(JCR *jcr);
+/* Used in ua_prune.c and ua_purge.c */
+
+struct s_count_ctx {
+   int count;
+};
+
+#define MAX_DEL_LIST_LEN 2000000
+
+struct del_ctx {
+   JobId_t *JobId;                    /* array of JobIds */
+   char *PurgedFiles;                 /* Array of PurgedFile flags */
+   int num_ids;                       /* ids stored */
+   int max_ids;                       /* size of array */
+   int num_del;                       /* number deleted */
+   int tot_ids;                       /* total to process */
+};
+
+/* Flags for find_next_volume_for_append() */
+enum {
+  fnv_create_vol    = true,
+  fnv_no_create_vol = false,
+  fnv_prune         = true,
+  fnv_no_prune      = false
+};
+
+     
+
+#include "protos.h"