X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fjcr.h;h=6f037c77abcca813c78a3ea9dcba439bf558da33;hb=e2c4a73ab70ed8a6e4c6c5cb6508a156e29ff710;hp=6f8994fe518caf6b1c5ab075d0f7d19ad49fa605;hpb=05ff9f2cd22324a6c5e141809cf6b26b89edeeb0;p=bacula%2Fbacula diff --git a/bacula/src/jcr.h b/bacula/src/jcr.h index 6f8994fe51..6f037c77ab 100644 --- a/bacula/src/jcr.h +++ b/bacula/src/jcr.h @@ -10,7 +10,7 @@ */ /* - Copyright (C) 2000, 2001, 2002 Kern Sibbald and John Walker + Copyright (C) 2000-2004 Kern Sibbald and John Walker This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -81,6 +81,10 @@ 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); @@ -97,6 +101,10 @@ struct 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 */ + int reload_id; /* SIGHUP reload table id */ + 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 */ @@ -123,7 +131,8 @@ struct JCR { 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 */ + bool prefix_links; /* Prefix links with Where path */ + bool gui; /* set if gui using console */ int cached_pnl; /* cached path length */ POOLMEM *cached_path; /* cached path */ @@ -141,6 +150,9 @@ struct JCR { STORE *store; /* Storage resource */ CLIENT *client; /* Client resource */ POOL *pool; /* Pool resource */ + POOL *full_pool; /* Full backup pool resource */ + POOL *inc_pool; /* Incremental backup pool resource */ + POOL *dif_pool; /* Differential backup pool resource */ FILESET *fileset; /* FileSet resource */ CAT *catalog; /* Catalog resource */ MSGS *messages; /* Default message handler */ @@ -149,6 +161,7 @@ struct JCR { 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 */ @@ -165,6 +178,7 @@ struct JCR { bool acquired_resource_locks; /* set if resource locks acquired */ int NumVols; /* Number of Volume used in pool */ int reschedule_count; /* Number of times rescheduled */ + bool spool_data; /* Spool data in SD */ #endif /* DIRECTOR_DAEMON */ @@ -175,7 +189,6 @@ struct JCR { /*********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 */ @@ -201,7 +214,8 @@ struct JCR { 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 */ @@ -213,23 +227,14 @@ struct JCR { 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 */ @@ -255,7 +260,7 @@ struct JCR { */ struct s_last_job { dlink link; - int NumJobs; + int xNumJobs; /* no longer used */ int JobType; int JobStatus; int JobLevel; @@ -287,7 +292,7 @@ extern void unlock_jcr_chain(); 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);