Add SD heartbeat

[bacula/bacula] / bacula / src / jcr.h

diff --git a/bacula/src/jcr.h b/bacula/src/jcr.h
index 0669b5e63f37138ddfacb3f33e60490a971404bb..ed4d390a5a08da3d5b773bdef107060718603539 100644 (file)
--- a/bacula/src/jcr.h
+++ b/bacula/src/jcr.h
@@ -60,17 +60,23 @@
 #define JS_Error                 'e'  /* Non-fatal error */
 #define JS_FatalError            'f'  /* Fatal error */
 #define JS_Differences           'D'  /* Verify differences */
-#define JS_Cancelled             'A'  /* cancelled by user */
+#define JS_Canceled              'A'  /* canceled by user */
 #define JS_WaitFD                'F'  /* waiting on File daemon */
 #define JS_WaitSD                'S'  /* waiting on the Storage daemon */
 #define JS_WaitMedia             'm'  /* waiting for new media */
 #define JS_WaitMount             'M'  /* waiting for Mount */
+#define JS_WaitStoreRes          's'  /* Waiting for storage resource */
+#define JS_WaitJobRes            'j'  /* Waiting for job resource */
+#define JS_WaitClientRes         'c'  /* Waiting for Client resource */
+#define JS_WaitMaxJobs           'd'  /* Waiting for maximum jobs */
+#define JS_WaitStartTime         't'  /* Waiting for start time */
 
-#define job_cancelled(jcr) \
-  (jcr->JobStatus == JS_Cancelled || \
+#define job_canceled(jcr) \
+  (jcr->JobStatus == JS_Canceled || \
    jcr->JobStatus == JS_ErrorTerminated || \
    jcr->JobStatus == JS_FatalError)
 
+
 typedef void (JCR_free_HANDLER)(struct s_jcr *jcr);
 
 /* Job Control Record (JCR) */
@@ -145,6 +151,7 @@ struct s_jcr {
    int replace;                       /* Replace option */
 #endif /* DIRECTOR_DAEMON */
 
+
 #ifdef FILE_DAEMON
    /* File Daemon specific part of JCR */
    uint32_t num_files_examined;       /* files examined this job */
@@ -169,8 +176,12 @@ struct s_jcr {
    uint32_t EndFile;
    uint32_t StartBlock;
    uint32_t EndBlock;
+   int use_win_backup_api;            /* set to use native Win API */
+   pthread_t heartbeat_id;            /* id of heartbeat thread */
+   BSOCK *duped_sd;                   /* duped SD socket */
 #endif /* FILE_DAEMON */
 
+
 #ifdef STORAGE_DAEMON
    /* Storage Daemon specific part of JCR */
    struct s_jcr *next_dev;            /* next JCR attached to device */