Drop old semaphore and workq code

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

diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h
index 146fb29a0da77936fdfd8a5df3efc3c33b057ff4..247610f1a5d5ac8a54a06f2c4a9783fa3bdee0f3 100644 (file)
--- a/bacula/src/dird/dird_conf.h
+++ b/bacula/src/dird/dird_conf.h
@@ -146,7 +146,7 @@ struct CLIENT {
    char *password;
    CAT *catalog;                      /* Catalog resource */
    uint32_t MaxConcurrentJobs;        /* Maximume concurrent jobs */
-   semlock_t sem;                     /* client semaphore */
+   uint32_t NumConcurrentJobs;        /* number of concurrent jobs running */
    int enable_ssl;                    /* Use SSL */
 };
 
@@ -165,7 +165,7 @@ struct STORE {
    char *dev_name;   
    int  autochanger;                  /* set if autochanger */
    uint32_t MaxConcurrentJobs;        /* Maximume concurrent jobs */
-   semlock_t sem;                     /* storage semaphore */
+   uint32_t NumConcurrentJobs;        /* number of concurrent jobs running */
    int enable_ssl;                    /* Use SSL */
 };
 
@@ -179,6 +179,7 @@ struct JOB {
 
    int   JobType;                     /* job type (backup, verify, restore */
    int   level;                       /* default backup/verify level */
+   int   Priority;                    /* Job priority */
    int   RestoreJobId;                /* What -- JobId to restore */
    char *RestoreWhere;                /* Where on disk to restore -- directory */
    char *RestoreBootstrap;            /* Bootstrap file */
@@ -204,8 +205,7 @@ struct JOB {
    FILESET   *fileset;                /* What to backup -- Fileset */
    STORE     *storage;                /* Where is device -- Storage daemon */
    POOL      *pool;                   /* Where is media -- Media Pool */
-
-   semlock_t sem;                     /* Job semaphore */
+   uint32_t NumConcurrentJobs;        /* number of concurrent jobs running */
 };
 
 #define MAX_FOPTS 30
@@ -223,9 +223,7 @@ struct INCEXE {
    FOPTS *current_opts;               /* points to current options structure */
    FOPTS **opts_list;                 /* options list */
    int num_opts;                      /* number of options items */
-   char **name_list;                  /* filename list */
-   int max_names;                     /* malloc'ed size of name list */
-   int num_names;                     /* number of names in the list */
+   alist name_list;                   /* filename list -- holds char * */
 };
 
 /* 
@@ -292,7 +290,9 @@ struct POOL {
    int   catalog_files;               /* maintain file entries in catalog */
    int   use_volume_once;             /* write on volume only once */
    int   accept_any_volume;           /* accept any volume */
-   int   purge_oldest_volume;        /* purge oldest volume */
+   int   purge_oldest_volume;         /* purge oldest volume */
+   int   recycle_oldest_volume;       /* attempt to recycle oldest volume */
+   int   recycle_current_volume;      /* attempt recycle of current volume */
    uint32_t max_volumes;              /* max number of volumes */
    utime_t VolRetention;              /* volume retention period in seconds */
    utime_t VolUseDuration;            /* duration volume can be used */
@@ -329,6 +329,7 @@ union URES {
 struct RUN {
    RUN *next;                         /* points to next run record */
    int level;                         /* level override */
+   int Priority;                      /* priority override */
    int job_type;  
    POOL *pool;                        /* Pool override */
    STORE *storage;                    /* Storage override */