/* Job Types. These are stored in the DB */
#define JT_BACKUP 'B' /* Backup Job */
+#define JT_MIGRATED_JOB 'M' /* A previous backup job that was migrated */
#define JT_VERIFY 'V' /* Verify Job */
#define JT_RESTORE 'R' /* Restore Job */
#define JT_CONSOLE 'c' /* console program */
#define JT_ADMIN 'D' /* admin job */
#define JT_ARCHIVE 'A' /* Archive Job */
#define JT_COPY 'C' /* Copy Job */
-#define JT_MIGRATE 'M' /* Migration Job */
+#define JT_MIGRATE 'g' /* Migration Job */
#define JT_SCAN 'S' /* Scan Job */
/* Job Status. Some of these are stored in the DB */
pthread_mutex_t mutex; /* jcr mutex */
volatile int _use_count; /* use count */
public:
- void inc_use_count(void) {P(mutex); _use_count++; V(mutex); };
- void dec_use_count(void) {P(mutex); _use_count--; V(mutex); };
+ void lock() {P(mutex); };
+ void unlock() {V(mutex); };
+ void inc_use_count(void) {lock(); _use_count++; unlock(); };
+ void dec_use_count(void) {lock(); _use_count--; unlock(); };
int use_count() { return _use_count; };
void init_mutex(void) {pthread_mutex_init(&mutex, NULL); };
void destroy_mutex(void) {pthread_mutex_destroy(&mutex); };
- void lock() {P(mutex); };
- void unlock() {V(mutex); };
bool is_job_canceled() {return job_canceled(this); };
/* Global part of JCR common to all daemons */
BSOCK *ua; /* User agent */
JOB *job; /* Job resource */
JOB *verify_job; /* Job resource of verify previous job */
- alist *storage; /* Storage possibilities */
- STORE *store; /* Storage daemon selected */
+ alist *rstorage; /* Read storage possibilities */
+ STORE *rstore; /* Selected read storage */
+ alist *wstorage; /* Write storage possibilities */
+ STORE *wstore; /* Selected write storage */
CLIENT *client; /* Client resource */
POOL *pool; /* Pool resource */
POOL *full_pool; /* Full backup pool resource */
JOB_DBR jr; /* Job DB record for current job */
JOB_DBR previous_jr; /* previous job database record */
JOB *previous_job; /* Job resource of migration previous job */
- JCR *previous_jcr; /* previous job control record */
+ JCR *mig_jcr; /* JCR for migration/copy job */
char FSCreateTime[MAX_TIME_LENGTH]; /* FileSet CreateTime as returned from DB */
char since[MAX_TIME_LENGTH]; /* since time */
union {
};
extern struct s_last_job last_job;
-extern dlist *last_jobs;
+extern dlist * DLL_IMP_EXP last_jobs;
/* The following routines are found in lib/jcr.c */
extern JCR *get_jcr_by_full_name(char *Job);
extern JCR *get_next_jcr(JCR *jcr);
extern void set_jcr_job_status(JCR *jcr, int JobStatus);
+extern int DLL_IMP_EXP num_jobs_run;
#ifdef DEBUG
extern void b_free_jcr(const char *file, int line, JCR *jcr);