Massive SD calling sequence reorganization

[bacula/bacula] / bacula / src / stored / stored.c

diff --git a/bacula/src/stored/stored.c b/bacula/src/stored/stored.c
index 865d6bb511aba893ceb53a139be867ccf7ae4538..6f55cc42090f6939e0042a25fb7cecd8fa5e9232 100644 (file)
--- a/bacula/src/stored/stored.c
+++ b/bacula/src/stored/stored.c
@@ -38,7 +38,10 @@
 /* Forward referenced functions */
 void terminate_stored(int sig);
 static void check_config();
-static void *device_allocation(void *arg);
+
+extern "C" void *device_allocation(void *arg);
+
+
 
 #define CONFIG_FILE "bacula-sd.conf"  /* Default config file */
 
@@ -62,6 +65,7 @@ static workq_t dird_workq;          /* queue for processing connections */
 static void usage()
 {
    fprintf(stderr, _(
+"Copyright (C) 2000-2004 Kern Sibbald and John Walker.\n"
 "\nVersion: " VERSION " (" BDATE ")\n\n"
 "Usage: stored [options] [-c config_file] [config_file]\n"
 "        -c <file>   use <file> as configuration file\n"
@@ -94,7 +98,7 @@ int main (int argc, char *argv[])
 
    init_stack_dump();
    my_name_is(argc, argv, "bacula-sd");
-   textdomain("bacula-sd");
+   textdomain("bacula");
    init_msg(NULL, NULL);
    daemon_start_time = time(NULL);
 
@@ -192,8 +196,8 @@ int main (int argc, char *argv[])
       init_stack_dump();             /* pick up new pid */
    }
 
-   create_pid_file(me->pid_directory, "bacula-sd", me->SDport);
-   read_state_file(me->working_directory, "bacula-sd", me->SDport);
+   create_pid_file(me->pid_directory, "bacula-sd", get_first_port_host_order(me->sdaddrs));
+   read_state_file(me->working_directory, "bacula-sd", get_first_port_host_order(me->sdaddrs));
 
    drop(uid, gid);
 
@@ -226,8 +230,8 @@ int main (int argc, char *argv[])
    bmicrosleep(1, 0);
                                 
    /* Single server used for Director and File daemon */
-   bnet_thread_server(me->SDaddr, me->SDport, me->max_concurrent_jobs * 2 + 1,
-                     &dird_workq, connection_request);
+   bnet_thread_server(me->sdaddrs, me->max_concurrent_jobs * 2 + 1,
+                     &dird_workq, handle_connection_request);
    exit(1);                          /* to keep compiler quiet */
 }
 
@@ -295,7 +299,8 @@ static void check_config()
  * We are started as a separate thread.  The
  *  resources are alread locked.
  */
-static void *device_allocation(void *arg)
+extern "C"
+void *device_allocation(void *arg)
 {
    DEVRES *device;
 
@@ -322,9 +327,15 @@ static void *device_allocation(void *arg)
         JCR *jcr;
         DCR *dcr;
         jcr = new_jcr(sizeof(JCR), stored_free_jcr);
+        jcr->JobType = JT_SYSTEM;
+        /* Initialize FD start condition variable */
+        int errstat = pthread_cond_init(&jcr->job_start_wait, NULL);
+        if (errstat != 0) {
+            Jmsg1(jcr, M_ABORT, 0, _("Unable to init job cond variable: ERR=%s\n"), strerror(errstat));
+        }
         jcr->device = device;
         dcr = new_dcr(jcr, device->dev);
-        switch (read_dev_volume_label(jcr, device->dev, dcr->block)) {
+        switch (read_dev_volume_label(dcr)) {
            case VOL_OK:
               break;
            default:
@@ -381,8 +392,8 @@ void terminate_stored(int sig)
       bmicrosleep(0, 500000);        /* give them 1/2 sec to clean up */
    }
 
-   write_state_file(me->working_directory, "bacula-sd", me->SDport);
-   delete_pid_file(me->pid_directory, "bacula-sd", me->SDport);
+   write_state_file(me->working_directory, "bacula-sd", get_first_port_host_order(me->sdaddrs));
+   delete_pid_file(me->pid_directory, "bacula-sd", get_first_port_host_order(me->sdaddrs));
 
    Dmsg1(200, "In terminate_stored() sig=%d\n", sig);
 
@@ -405,6 +416,6 @@ void terminate_stored(int sig)
    stop_watchdog();
    close_memory_pool();
 
-   sm_dump(False);                   /* dump orphaned buffers */
+   sm_dump(false);                   /* dump orphaned buffers */
    exit(sig);
 }