storage: moved two global variables into stored_global.cc/.h

- extern StorageResource *me - extern char *configfile
bareos · Sep 17, 2018 · 847f456 · 847f456
1 parent b853f3a
commit 847f456
Show file tree

Hide file tree

Showing 27 changed files with 39 additions and 13 deletions.
diff --git a/core/src/stored/CMakeLists.txt b/core/src/stored/CMakeLists.txt
@@ -77,14 +77,14 @@ ENDIF()
 
 set (LIBBAREOSSD_SRCS acquire.cc ansi_label.cc askdir.cc autochanger.cc
          block.cc bsr.cc
-		   butil.cc crc32.cc dev.cc device.cc ebcdic.cc label.cc lock.cc
-		   mount.cc read_record.cc record.cc reserve.cc scan.cc
-		   sd_backends.cc sd_plugins.cc sd_stats.cc spool.cc
-		   stored_conf.cc vol_mgr.cc wait.cc
+         butil.cc crc32.cc dev.cc device.cc ebcdic.cc label.cc lock.cc
+         mount.cc read_record.cc record.cc reserve.cc scan.cc
+         sd_backends.cc sd_plugins.cc sd_stats.cc spool.cc
+         stored_globals.cc stored_conf.cc vol_mgr.cc wait.cc
          ${AVAILABLE_DEVICE_API_SRCS}
     )
 
-set(SDSRCS stored_globals.cc append.cc askdir.cc authenticate.cc dir_cmd.cc fd_cmds.cc
+set(SDSRCS append.cc askdir.cc authenticate.cc dir_cmd.cc fd_cmds.cc
          job.cc mac.cc ndmp_tape.cc read.cc sd_cmds.cc sd_stats.cc
          socket_server.cc status.cc )
 

diff --git a/core/src/stored/ansi_label.cc b/core/src/stored/ansi_label.cc
@@ -30,6 +30,7 @@
 
 #include "include/bareos.h"                   /* pull in global headers */
 #include "stored/stored.h"                   /* pull in Storage Daemon headers */
+#include "stored/stored_globals.h"
 #include "stored/label.h"
 #include "stored/ebcdic.h"
 #include "include/jcr.h"

diff --git a/core/src/stored/askdir.cc b/core/src/stored/askdir.cc
@@ -29,8 +29,9 @@
  * Reqests/commands from the Director are handled in dircmd.c
  */
 
-#include "include/bareos.h"                   /* pull in global headers */
-#include "stored/stored.h"                   /* pull in Storage Daemon headers */
+#include "include/bareos.h"
+#include "stored/stored.h"
+#include "stored/stored_globals.h"
 
 #include "include/jcr.h"
 #include "lib/crypto_cache.h"

diff --git a/core/src/stored/authenticate.cc b/core/src/stored/authenticate.cc
@@ -29,6 +29,7 @@
 
 #include "include/bareos.h"
 #include "stored/stored.h"
+#include "stored/stored_globals.h"
 #include "include/jcr.h"
 
 namespace storagedaemon {

diff --git a/core/src/stored/backends/chunked_device.cc b/core/src/stored/backends/chunked_device.cc
@@ -37,6 +37,8 @@
 #endif
 #endif
 
+#include "stored/stored_globals.h"
+
 namespace storagedaemon {
 
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;

diff --git a/core/src/stored/backends/unix_file_device.cc b/core/src/stored/backends/unix_file_device.cc
@@ -31,6 +31,7 @@
 
 #include "include/bareos.h"
 #include "stored/stored.h"
+#include "stored/stored_globals.h"
 #include "unix_file_device.h"
 #include "lib/util.h"
 

diff --git a/core/src/stored/bcopy.cc b/core/src/stored/bcopy.cc
@@ -30,6 +30,7 @@
 
 #include "include/bareos.h"
 #include "stored/stored.h"
+#include "stored/stored_globals.h"
 #include "lib/crypto_cache.h"
 #include "stored/acquire.h"
 #include "stored/butil.h"

diff --git a/core/src/stored/bextract.cc b/core/src/stored/bextract.cc
@@ -30,6 +30,7 @@
 
 #include "include/bareos.h"
 #include "stored/stored.h"
+#include "stored/stored_globals.h"
 #include "lib/crypto_cache.h"
 #include "stored/acquire.h"
 #include "stored/butil.h"

diff --git a/core/src/stored/bls.cc b/core/src/stored/bls.cc
@@ -30,6 +30,7 @@
 
 #include "include/bareos.h"
 #include "stored/stored.h"
+#include "stored/stored_globals.h"
 #include "lib/crypto_cache.h"
 #include "findlib/find.h"
 #include "stored/acquire.h"

diff --git a/core/src/stored/bscan.cc b/core/src/stored/bscan.cc
@@ -32,6 +32,7 @@
 
 #include "include/bareos.h"
 #include "stored/stored.h"
+#include "stored/stored_globals.h"
 #include "lib/crypto_cache.h"
 #include "findlib/find.h"
 #include "cats/cats.h"

diff --git a/core/src/stored/btape.cc b/core/src/stored/btape.cc
@@ -36,6 +36,7 @@
 
 #include "include/bareos.h"
 #include "stored/stored.h"
+#include "stored/stored_globals.h"
 #include "lib/crypto_cache.h"
 #include "stored/acquire.h"
 #include "stored/autochanger.h"

diff --git a/core/src/stored/butil.cc b/core/src/stored/butil.cc
@@ -35,6 +35,7 @@
 
 #include "include/bareos.h"
 #include "stored/stored.h"
+#include "stored/stored_globals.h"
 #include "stored/acquire.h"
 #include "stored/autochanger.h"
 #include "stored/device.h"
@@ -52,10 +53,6 @@ static bool setup_to_access_device(DeviceControlRecord *dcr, JobControlRecord *j
 static DeviceResource *find_device_res(char *device_name, bool readonly);
 static void MyFreeJcr(JobControlRecord *jcr);
 
-/* Global variables */
-char SD_IMP_EXP *configfile;
-StorageResource SD_IMP_EXP *me = NULL;         /* Our Global resource */
-
 /**
  * Setup a "daemon" JobControlRecord for the various standalone tools (e.g. bls, bextract, bscan, ...)
  */

diff --git a/core/src/stored/label.cc b/core/src/stored/label.cc
@@ -30,6 +30,7 @@
 
 #include "include/bareos.h"                   /* pull in global headers */
 #include "stored/stored.h"                   /* pull in Storage Daemon headers */
+#include "stored/stored_globals.h"
 #include "stored/dev.h"
 #include "stored/device.h"
 #include "stored/label.h"

diff --git a/core/src/stored/mac.cc b/core/src/stored/mac.cc
@@ -31,6 +31,7 @@
 
 #include "include/bareos.h"
 #include "stored/stored.h"
+#include "stored/stored_globals.h"
 #include "stored/acquire.h"
 #include "stored/bsr.h"
 #include "stored/append.h"

diff --git a/core/src/stored/ndmp_tape.cc b/core/src/stored/ndmp_tape.cc
@@ -40,6 +40,7 @@
 #if HAVE_NDMP
 
 #include "stored/stored.h"
+#include "stored/stored_globals.h"
 
 #include "ndmp/ndmagents.h"
 #include "stored/acquire.h"

diff --git a/core/src/stored/reserve.cc b/core/src/stored/reserve.cc
@@ -30,6 +30,7 @@
 
 #include "include/bareos.h"
 #include "stored/stored.h"
+#include "stored/stored_globals.h"
 #include "stored/acquire.h"
 #include "stored/autochanger.h"
 #include "stored/wait.h"

diff --git a/core/src/stored/sd_cmds.cc b/core/src/stored/sd_cmds.cc
@@ -35,6 +35,7 @@
 
 #include "include/bareos.h"
 #include "stored/stored.h"
+#include "stored/stored_globals.h"
 #include "stored/append.h"
 #include "stored/authenticate.h"
 #include "stored/sd_stats.h"

diff --git a/core/src/stored/sd_plugins.cc b/core/src/stored/sd_plugins.cc
@@ -30,6 +30,7 @@
  */
 #include "include/bareos.h"
 #include "stored/stored.h"
+#include "stored/stored_globals.h"
 #include "sd_plugins.h"
 #include "lib/crypto_cache.h"
 #include "stored/sd_stats.h"

diff --git a/core/src/stored/sd_stats.cc b/core/src/stored/sd_stats.cc
@@ -27,6 +27,7 @@
 
 #include "include/bareos.h"
 #include "stored/stored.h"
+#include "stored/stored_globals.h"
 #include "lib/util.h"
 #include "include/jcr.h"
 

diff --git a/core/src/stored/socket_server.cc b/core/src/stored/socket_server.cc
@@ -31,6 +31,7 @@
 #include "include/bareos.h"
 #include "stored/autochanger.h"
 #include "stored/stored.h"
+#include "stored/stored_globals.h"
 #include "stored/dir_cmd.h"
 #include "stored/fd_cmds.h"
 #include "stored/sd_cmds.h"

diff --git a/core/src/stored/spool.cc b/core/src/stored/spool.cc
@@ -29,6 +29,7 @@
 
 #include "include/bareos.h"
 #include "stored/stored.h"
+#include "stored/stored_globals.h"
 #include "stored/acquire.h"
 #include "stored/device.h"
 #include "lib/edit.h"

diff --git a/core/src/stored/stored.h b/core/src/stored/stored.h
@@ -82,9 +82,7 @@ extern ConfigurationParser SD_IMP_EXP *my_config;  /* Our Global config */
 
 namespace storagedaemon {
 
-extern char SD_IMP_EXP *configfile;
 extern bool SD_IMP_EXP forge_on;      /* Proceed inspite of I/O errors */
-extern StorageResource SD_IMP_EXP *me;         /* "Global" daemon resource */
 uint32_t new_VolSessionId();
 
 } /* namespace storagedaemon */

diff --git a/core/src/stored/stored_conf.cc b/core/src/stored/stored_conf.cc
@@ -31,6 +31,7 @@
 #define NEED_JANSSON_NAMESPACE 1
 #include "include/bareos.h"
 #include "stored/stored.h"
+#include "stored/stored_globals.h"
 #include "stored/sd_backends.h"
 
 namespace storagedaemon {

diff --git a/core/src/stored/stored_globals.cc b/core/src/stored/stored_globals.cc
@@ -25,6 +25,9 @@
 
 namespace storagedaemon {
 
+StorageResource *me;
+char *configfile;
+
 void *start_heap = nullptr;
 bool  init_done = false;
 uint32_t vol_session_time;

diff --git a/core/src/stored/stored_globals.h b/core/src/stored/stored_globals.h
@@ -28,6 +28,11 @@
 
 namespace storagedaemon {
 
+class StorageResource;
+extern StorageResource *me;
+
+extern char *configfile;
+
 extern void *start_heap;
 extern bool init_done;
 extern uint32_t vol_session_time;

diff --git a/core/src/stored/vol_mgr.cc b/core/src/stored/vol_mgr.cc
@@ -30,6 +30,7 @@
 
 #include "include/bareos.h"
 #include "stored/stored.h"
+#include "stored/stored_globals.h"
 #include "stored/autochanger.h"
 #include "include/jcr.h"
 

diff --git a/core/src/stored/wait.cc b/core/src/stored/wait.cc
@@ -32,6 +32,7 @@
 
 #include "include/bareos.h"                   /* pull in global headers */
 #include "stored/stored.h"                   /* pull in Storage Daemon headers */
+#include "stored/stored_globals.h"
 #include "lib/edit.h"
 #include "include/jcr.h"