/* Forward referenced functions */
void terminate_stored(int sig);
static void check_config();
+static void *device_allocation(void *arg);
#define CONFIG_FILE "bacula-sd.conf" /* Default config file */
/* Global variables exported */
-struct s_shm *shm; /* memory shared with children */
-BSHM bshm; /* shared memory control packet */
-
-
/* This is our own global resource */
STORES *me;
static uint32_t VolSessionId = 0;
uint32_t VolSessionTime;
-static char *configfile;
+char *configfile;
static int foreground = 0;
static workq_t dird_workq; /* queue for processing connections */
*/
int main (int argc, char *argv[])
{
- int ch, i;
+ int ch;
int no_signals = FALSE;
int test_config = FALSE;
- DEVRES *device;
+ pthread_t thid;
init_stack_dump();
my_name_is(argc, argv, "stored");
parse_config(configfile);
check_config();
- bshm.size = 0;
if (test_config) {
terminate_stored(0);
}
create_pid_file(me->pid_directory, "bacula-sd", me->SDport);
- /* ****FIXME**** clean this up */
- /* Create and attach to shared memory. This is a
- * hold over from the days of child processes.
- * Note, in reality all memory is shared. This
- * is just a global buffer for the device packets.
- */
- shm = (s_shm *) malloc(sizeof(struct s_shm));
- /* Zero shared memory */
- memset(shm, 0, sizeof(struct s_shm));
-
/* Ensure that Volume Session Time and Id are both
* set and are both non-zero.
*/
Emsg0(M_ABORT, 0, _("Volume Session Time is ZERO!\n"));
}
+ /* Make sure on Solaris we can run concurrent, watch dog + servers + misc */
+ set_thread_concurrency(me->max_concurrent_jobs * 2 + 4);
+
+ /*
+ * Here we lock the resources then fire off the device allocation
+ * thread. That thread will release the resources when all the
+ * devices are allocated. This allows use to start the server
+ * right away, but any jobs will wait until the resources are
+ * unlocked.
+ */
LockRes();
- for (device=NULL,i=0; (device=(DEVRES *)GetNextRes(R_DEVICE, (RES *)device)); i++) {
- if (i >= MAX_DEVICES) {
- UnlockRes();
- Emsg1(M_ABORT, 0, _("Too many Device Resources. Max=%d\n"), MAX_DEVICES);
- }
- Dmsg1(90, "calling init_dev %s\n", device->device_name);
- device->dev = init_dev(&shm->dev[i], device->device_name);
- /* Copy some attributes from the Device Resource to the DEV structure */
- if (device->dev) {
- device->dev->capabilities = device->cap_bits;
- device->dev->min_block_size = device->min_block_size;
- device->dev->max_block_size = device->max_block_size;
- device->dev->max_volume_jobs = device->max_volume_jobs;
- device->dev->max_volume_files = device->max_volume_files;
- device->dev->max_volume_size = device->max_volume_size;
- device->dev->max_file_size = device->max_file_size;
- device->dev->volume_capacity = device->volume_capacity;
- device->dev->max_rewind_wait = device->max_rewind_wait;
- device->dev->max_open_wait = device->max_open_wait;
- device->dev->device = device;
- }
- Dmsg1(10, "SD init done %s\n", device->device_name);
- if (!device->dev) {
- Emsg1(M_ERROR, 0, _("Could not initialize %s\n"), device->device_name);
- }
- if (device->cap_bits & CAP_ALWAYSOPEN) {
- Dmsg1(20, "calling open_device %s\n", device->device_name);
- if (!open_device(device->dev)) {
- Emsg1(M_ERROR, 0, _("Could not open device %s\n"), device->device_name);
- }
- }
- if (device->cap_bits & CAP_AUTOMOUNT && device->dev &&
- device->dev->state & ST_OPENED) {
- DEV_BLOCK *block;
- JCR *jcr;
- block = new_block(device->dev);
- jcr = new_jcr(sizeof(JCR), stored_free_jcr);
- switch (read_dev_volume_label(jcr, device->dev, block)) {
- case VOL_OK:
- break;
- default:
- Emsg1(M_WARNING, 0, _("Could not mount device %s\n"), device->device_name);
- break;
- }
- free_jcr(jcr);
- free_block(block);
- }
- }
- UnlockRes();
- device = NULL;
+ if (pthread_create(&thid, NULL, device_allocation, NULL) != 0) {
+ Emsg1(M_ABORT, 0, _("Unable to create thread. ERR=%s\n"), strerror(errno));
+ }
+
- set_thread_concurrency(me->max_concurrent_jobs * 2 +
- 4 /* watch dog + servers + misc */);
start_watchdog(); /* start watchdog thread */
me = (STORES *)GetNextRes(R_STORAGE, NULL);
if (!me) {
UnlockRes();
- Emsg1(M_ABORT, 0, _("No Storage resource defined in %s. Cannot continue.\n"),
+ Emsg1(M_ERROR_TERM, 0, _("No Storage resource defined in %s. Cannot continue.\n"),
configfile);
}
if (GetNextRes(R_STORAGE, (RES *)me) != NULL) {
UnlockRes();
- Emsg1(M_ABORT, 0, _("Only one Storage resource permitted in %s\n"),
+ Emsg1(M_ERROR_TERM, 0, _("Only one Storage resource permitted in %s\n"),
configfile);
}
if (GetNextRes(R_DIRECTOR, NULL) == NULL) {
UnlockRes();
- Emsg1(M_ABORT, 0, _("No Director resource defined in %s. Cannot continue.\n"),
+ Emsg1(M_ERROR_TERM, 0, _("No Director resource defined in %s. Cannot continue.\n"),
configfile);
}
if (GetNextRes(R_DEVICE, NULL) == NULL){
UnlockRes();
- Emsg1(M_ABORT, 0, _("No Device resource defined in %s. Cannot continue.\n"),
+ Emsg1(M_ERROR_TERM, 0, _("No Device resource defined in %s. Cannot continue.\n"),
configfile);
}
if (!me->messages) {
me->messages = (MSGS *)GetNextRes(R_MSGS, NULL);
if (!me->messages) {
- Emsg1(M_ABORT, 0, _("No Messages resource defined in %s. Cannot continue.\n"),
+ Emsg1(M_ERROR_TERM, 0, _("No Messages resource defined in %s. Cannot continue.\n"),
configfile);
}
}
UnlockRes();
if (!me->working_directory) {
- Emsg1(M_ABORT, 0, _("No Working Directory defined in %s. Cannot continue.\n"),
+ Emsg1(M_ERROR_TERM, 0, _("No Working Directory defined in %s. Cannot continue.\n"),
configfile);
}
if (stat(me->working_directory, &stat_buf) != 0) {
- Emsg1(M_ABORT, 0, _("Working Directory: %s not found. Cannot continue.\n"),
+ Emsg1(M_ERROR_TERM, 0, _("Working Directory: %s not found. Cannot continue.\n"),
me->working_directory);
}
if (!S_ISDIR(stat_buf.st_mode)) {
- Emsg1(M_ABORT, 0, _("Working Directory: %s is not a directory. Cannot continue.\n"),
+ Emsg1(M_ERROR_TERM, 0, _("Working Directory: %s is not a directory. Cannot continue.\n"),
me->working_directory);
}
working_directory = me->working_directory;
}
+/*
+ * We are started as a separate thread. The
+ * resources are alread locked.
+ */
+static void *device_allocation(void *arg)
+{
+ int i;
+ DEVRES *device;
+
+ pthread_detach(pthread_self());
+
+ /* LockRes() alread done */
+ for (device=NULL,i=0; (device=(DEVRES *)GetNextRes(R_DEVICE, (RES *)device)); i++) {
+ Dmsg1(90, "calling init_dev %s\n", device->device_name);
+ device->dev = init_dev(NULL, device);
+ Dmsg1(10, "SD init done %s\n", device->device_name);
+ if (!device->dev) {
+ Emsg1(M_ERROR, 0, _("Could not initialize %s\n"), device->device_name);
+ }
+ if (device->cap_bits & CAP_ALWAYSOPEN) {
+ Dmsg1(20, "calling open_device %s\n", device->device_name);
+ if (!open_device(device->dev)) {
+ Emsg1(M_ERROR, 0, _("Could not open device %s\n"), device->device_name);
+ }
+ }
+ if (device->cap_bits & CAP_AUTOMOUNT && device->dev &&
+ device->dev->state & ST_OPENED) {
+ DEV_BLOCK *block;
+ JCR *jcr;
+ block = new_block(device->dev);
+ jcr = new_jcr(sizeof(JCR), stored_free_jcr);
+ switch (read_dev_volume_label(jcr, device->dev, block)) {
+ case VOL_OK:
+ break;
+ default:
+ Emsg1(M_WARNING, 0, _("Could not mount device %s\n"), device->device_name);
+ break;
+ }
+ free_jcr(jcr);
+ free_block(block);
+ }
+ }
+ UnlockRes();
+ return NULL;
+}
+
+
/* Clean up and then exit */
void terminate_stored(int sig)
{
term_msg();
close_memory_pool();
- if (shm) {
- free(shm);
- }
-
sm_dump(False); /* dump orphaned buffers */
exit(1);
}