From 70a2d5dcc9a9a5848ce9195d1cdf8a4f8d587ffb Mon Sep 17 00:00:00 2001 From: Frank Ueberschar Date: Wed, 6 Nov 2019 12:24:35 +0100 Subject: [PATCH] jcr: separate file for JobStatus and JobTypes --- core/src/include/jcr.h | 50 ++---------------------------- core/src/include/job_status.h | 58 +++++++++++++++++++++++++++++++++++ core/src/include/job_types.h | 44 ++++++++++++++++++++++++++ 3 files changed, 104 insertions(+), 48 deletions(-) create mode 100644 core/src/include/job_status.h create mode 100644 core/src/include/job_types.h diff --git a/core/src/include/jcr.h b/core/src/include/jcr.h index 7617d08b8a0..442e42c6319 100644 --- a/core/src/include/jcr.h +++ b/core/src/include/jcr.h @@ -36,6 +36,8 @@ #include #include +#include +#include #include "lib/tls_conf.h" #ifdef DIRECTOR_DAEMON @@ -49,54 +51,6 @@ typedef struct s_tree_root TREE_ROOT; class dlist; -/** - * 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 'U' /**< console program */ -#define JT_SYSTEM 'I' /**< internal system "job" */ -#define JT_ADMIN 'D' /**< admin job */ -#define JT_ARCHIVE 'A' /**< Archive Job */ -#define JT_JOB_COPY 'C' /**< Copy of a Job */ -#define JT_COPY 'c' /**< Copy Job */ -#define JT_MIGRATE 'g' /**< Migration Job */ -#define JT_SCAN 'S' /**< Scan Job */ -#define JT_CONSOLIDATE 'O' /**< Always Incremental Consolidate Job */ - -/** - * Job Status. Some of these are stored in the DB - */ -#define JS_Canceled 'A' /**< Canceled by user */ -#define JS_Blocked 'B' /**< Blocked */ -#define JS_Created 'C' /**< Created but not yet running */ -#define JS_Differences 'D' /**< Verify differences */ -#define JS_ErrorTerminated 'E' /**< Job terminated in error */ -#define JS_WaitFD 'F' /**< Waiting on File daemon */ -#define JS_Incomplete 'I' /**< Incomplete Job */ -#define JS_DataCommitting 'L' /**< Committing data (last despool) */ -#define JS_WaitMount 'M' /**< Waiting for Mount */ -#define JS_Running 'R' /**< Running */ -#define JS_WaitSD 'S' /**< Waiting on the Storage daemon */ -#define JS_Terminated 'T' /**< Terminated normally */ -#define JS_Warnings 'W' /**< Terminated normally with warnings */ - -#define JS_AttrDespooling 'a' /**< SD despooling attributes */ -#define JS_WaitClientRes 'c' /**< Waiting for Client resource */ -#define JS_WaitMaxJobs 'd' /**< Waiting for maximum jobs */ -#define JS_Error 'e' /**< Non-fatal error */ -#define JS_FatalError 'f' /**< Fatal error */ -#define JS_AttrInserting 'i' /**< Doing batch insert file records */ -#define JS_WaitJobRes 'j' /**< Waiting for job resource */ -#define JS_DataDespooling 'l' /**< Doing data despooling */ -#define JS_WaitMedia 'm' /**< Waiting for new media */ -#define JS_WaitPriority 'p' /**< Waiting for higher priority jobs to finish */ -#define JS_WaitDevice 'q' /**< Queued waiting for device */ -#define JS_WaitStoreRes 's' /**< Waiting for storage resource */ -#define JS_WaitStartTime 't' /**< Waiting for start time */ - /** * Protocol types */ diff --git a/core/src/include/job_status.h b/core/src/include/job_status.h new file mode 100644 index 00000000000..8f03afa80bb --- /dev/null +++ b/core/src/include/job_status.h @@ -0,0 +1,58 @@ +/* + BAREOS® - Backup Archiving REcovery Open Sourced + + Copyright (C) 2000-2012 Free Software Foundation Europe e.V. + Copyright (C) 2011-2012 Planets Communications B.V. + Copyright (C) 2013-2019 Bareos GmbH & Co. KG + + This program is Free Software; you can redistribute it and/or + modify it under the terms of version three of the GNU Affero General Public + License as published by the Free Software Foundation and included + in the file LICENSE. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#ifndef BAREOS_SRC_INCLUDE_JOB_STATUS_H_ +#define BAREOS_SRC_INCLUDE_JOB_STATUS_H_ + +enum JobStatus : char +{ + JS_Canceled = 'A', /**< Canceled by user */ + JS_Blocked = 'B', /**< Blocked */ + JS_Created = 'C', /**< Created but not yet running */ + JS_Differences = 'D', /**< Verify differences */ + JS_ErrorTerminated = 'E', /**< Job terminated in error */ + JS_WaitFD = 'F', /**< Waiting on File daemon */ + JS_Incomplete = 'I', /**< Incomplete Job */ + JS_DataCommitting = 'L', /**< Committing data (last despool) */ + JS_WaitMount = 'M', /**< Waiting for Mount */ + JS_Running = 'R', /**< Running */ + JS_WaitSD = 'S', /**< Waiting on the Storage daemon */ + JS_Terminated = 'T', /**< Terminated normally */ + JS_Warnings = 'W', /**< Terminated normally with warnings */ + + JS_AttrDespooling = 'a', /**< SD despooling attributes */ + JS_WaitClientRes = 'c', /**< Waiting for Client resource */ + JS_WaitMaxJobs = 'd', /**< Waiting for maximum jobs */ + JS_Error = 'e', /**< Non-fatal error */ + JS_FatalError = 'f', /**< Fatal error */ + JS_AttrInserting = 'i', /**< Doing batch insert file records */ + JS_WaitJobRes = 'j', /**< Waiting for job resource */ + JS_DataDespooling = 'l', /**< Doing data despooling */ + JS_WaitMedia = 'm', /**< Waiting for new media */ + JS_WaitPriority = 'p', /**< Waiting for higher priority jobs to finish */ + JS_WaitDevice = 'q', /**< Queued waiting for device */ + JS_WaitStoreRes = 's', /**< Waiting for storage resource */ + JS_WaitStartTime = 't' /**< Waiting for start time */ +}; + +#endif // BAREOS_SRC_INCLUDE_JOB_STATUS_H_ diff --git a/core/src/include/job_types.h b/core/src/include/job_types.h new file mode 100644 index 00000000000..1c0d2b54049 --- /dev/null +++ b/core/src/include/job_types.h @@ -0,0 +1,44 @@ +/* + BAREOS® - Backup Archiving REcovery Open Sourced + + Copyright (C) 2000-2012 Free Software Foundation Europe e.V. + Copyright (C) 2011-2012 Planets Communications B.V. + Copyright (C) 2013-2019 Bareos GmbH & Co. KG + + This program is Free Software; you can redistribute it and/or + modify it under the terms of version three of the GNU Affero General Public + License as published by the Free Software Foundation and included + in the file LICENSE. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. +*/ + +#ifndef BAREOS_SRC_INCLUDE_JOB_TYPES_H_ +#define BAREOS_SRC_INCLUDE_JOB_TYPES_H_ + +enum JobTypes : char +{ + JT_BACKUP = 'B', /**< Backup Job */ + JT_MIGRATED_JOB = 'M', /**< A previous backup job that was migrated */ + JT_VERIFY = 'V', /**< Verify Job */ + JT_RESTORE = 'R', /**< Restore Job */ + JT_CONSOLE = 'U', /**< console program */ + JT_SYSTEM = 'I', /**< internal system "job" */ + JT_ADMIN = 'D', /**< admin job */ + JT_ARCHIVE = 'A', /**< Archive Job */ + JT_JOB_COPY = 'C', /**< Copy of a Job */ + JT_COPY = 'c', /**< Copy Job */ + JT_MIGRATE = 'g', /**< Migration Job */ + JT_SCAN = 'S', /**< Scan Job */ + JT_CONSOLIDATE = 'O' /**< Always Incremental Consolidate Job */ +}; + +#endif // BAREOS_SRC_INCLUDE_JOB_TYPES_H_