jcr->JobStatus == JS_ErrorTerminated || \
jcr->JobStatus == JS_FatalError)
+#define foreach_jcr(jcr) \
+ for ((jcr)=NULL; ((jcr)=get_next_jcr(jcr)); )
+
+
struct JCR;
typedef void (JCR_free_HANDLER)(JCR *jcr);
BSOCK *store_bsock; /* Storage connection socket */
BSOCK *file_bsock; /* File daemon connection socket */
JCR_free_HANDLER *daemon_free_jcr; /* Local free routine */
+ dlist *msg_queue; /* Queued messages */
+ alist job_end_push; /* Job end pushed calls */
+ bool dequeuing; /* dequeuing messages */
POOLMEM *errmsg; /* edited error message */
char Job[MAX_NAME_LENGTH]; /* Unique name of this Job */
uint32_t JobId; /* Director's JobId */
int JobType; /* backup, restore, verify ... */
int JobLevel; /* Job level */
int JobPriority; /* Job priority */
- int authenticated; /* set when client authenticated */
time_t sched_time; /* job schedule time, i.e. when it should start */
time_t start_time; /* when job actually started */
time_t run_time; /* used for computing speed */
MSGS *jcr_msgs; /* Copy of message resource -- actually used */
uint32_t ClientId; /* Client associated with Job */
char *where; /* prefix to restore files to */
- int prefix_links; /* Prefix links with Where path */
int cached_pnl; /* cached path length */
POOLMEM *cached_path; /* cached path */
+ bool prefix_links; /* Prefix links with Where path */
+ bool gui; /* set if gui using console */
+ bool authenticated; /* set when client authenticated */
/* Daemon specific part of JCR */
/* This should be empty in the library */
uint32_t SDErrors; /* Number of non-fatal errors */
volatile int SDJobStatus; /* Storage Job Status */
volatile int FDJobStatus; /* File daemon Job Status */
+ uint32_t ExpectedFiles; /* Expected restore files */
B_DB *db; /* database pointer */
uint32_t MediaId; /* DB record IDs associated with this job */
uint32_t PoolId; /* Pool record id */
FileId_t FileId; /* Last file id inserted */
uint32_t FileIndex; /* Last FileIndex processed */
POOLMEM *fname; /* name to put into catalog */
- int fn_printed; /* printed filename */
POOLMEM *stime; /* start time for incremental/differential */
JOB_DBR jr; /* Job DB record for current job */
JOB_DBR *verify_jr; /* Pointer to target job */
uint32_t RestoreJobId; /* Id specified by UA */
POOLMEM *client_uname; /* client uname */
int replace; /* Replace option */
- bool acquired_resource_locks; /* set if resource locks acquired */
+ int saveMaxConcurrentJobs; /* save for restore jobs */
int NumVols; /* Number of Volume used in pool */
int reschedule_count; /* Number of times rescheduled */
+ bool spool_data; /* Spool data in SD */
+ bool acquired_resource_locks; /* set if resource locks acquired */
+ bool term_wait_inited; /* Set when cond var inited */
+ bool fn_printed; /* printed filename */
#endif /* DIRECTOR_DAEMON */
/*********FIXME********* add missing files and files to be retried */
int incremental; /* set if incremental for SINCE */
time_t mtime; /* begin time for SINCE */
- int mtime_only; /* compare only mtime and not ctime as well */
int listing; /* job listing in estimate */
long Ticket; /* Ticket */
char *big_buf; /* I/O buffer */
JCR *prev_dev; /* previous JCR attached to device */
pthread_cond_t job_start_wait; /* Wait for FD to start Job */
int type;
- DEVRES *device; /* device to use */
+ DCR *dcr; /* device context record */
+ DEVRES *device; /* device resource to use */
VOLUME_CAT_INFO VolCatInfo; /* Catalog info for desired volume */
POOLMEM *job_name; /* base Job name (not unique) */
POOLMEM *fileset_name; /* FileSet */
VOL_LIST *VolList; /* list to read */
int32_t NumVolumes; /* number of volumes used */
int32_t CurVolume; /* current volume number */
- int spool_attributes; /* set if spooling attributes */
- int no_attributes; /* set if no attributes wanted */
int label_status; /* device volume label status */
int label_errors; /* count of label errors */
- int session_opened;
- DEV_RECORD rec; /* Read/Write record */
+ bool session_opened;
long Ticket; /* ticket for this job */
- uint32_t VolFirstIndex; /* First file index this Volume */
- uint32_t VolLastIndex; /* Last file index this Volume */
- uint32_t FileIndex; /* Current File Index */
- uint32_t EndFile; /* End file written */
- uint32_t StartFile; /* Start write file */
- uint32_t StartBlock; /* Start write block */
- uint32_t EndBlock; /* Ending block written */
- bool NewVol; /* set when new Volume mounted */
- bool WroteVol; /* set when Volume written */
- bool NewFile; /* set when EOF written */
+ bool ignore_label_errors; /* ignore Volume label errors */
+ bool spool_attributes; /* set if spooling attributes */
+ bool no_attributes; /* set if no attributes wanted */
+ bool spool_data; /* set to spool data */
int CurVol; /* Current Volume count */
uint32_t FileId; /* Last file id inserted */
*/
struct s_last_job {
dlink link;
- int NumJobs;
+ int Errors; /* FD/SD errors */
int JobType;
int JobStatus;
int JobLevel;
extern void set_jcr_job_status(JCR *jcr, int JobStatus);
#ifdef DEBUG
-extern void b_free_jcr(char *file, int line, JCR *jcr);
+extern void b_free_jcr(const char *file, int line, JCR *jcr);
#define free_jcr(jcr) b_free_jcr(__FILE__, __LINE__, (jcr))
#else
extern void free_jcr(JCR *jcr);