Add heap stats to Dir and SD -- eliminate #ifdefs

[bacula/bacula] / bacula / src / dird / ua_server.c

diff --git a/bacula/src/dird/ua_server.c b/bacula/src/dird/ua_server.c
index 070a31575dc2f6a08e35729061a07b80fc677b89..415a60e1a63ce44714c93888bf34f66ba6ca7263 100644 (file)
--- a/bacula/src/dird/ua_server.c
+++ b/bacula/src/dird/ua_server.c
@@ -8,7 +8,7 @@
  */
 
 /*
-   Copyright (C) 2000-2003 Kern Sibbald and John Walker
+   Copyright (C) 2000-2004 Kern Sibbald and John Walker
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -48,7 +48,8 @@ int quit_cmd_thread = 0;
 
 /* Forward referenced functions */
 
-static void *connect_thread(void *arg);
+extern "C" void *connect_thread(void *arg);
+
 static void *handle_UA_client_request(void *arg);
 
 
@@ -80,32 +81,35 @@ void start_UA_server(char *UA_addr, int UA_port)
    return;
 }
 
-static void *connect_thread(void *arg)
+extern "C" 
+void *connect_thread(void *arg)
 {
    struct s_addr_port *UA = (struct s_addr_port *)arg;
 
    pthread_detach(pthread_self());
 
-   /*  ****FIXME**** put # 5 on config parameter */
-   bnet_thread_server(UA->addr, UA->port, 5, &ua_workq, handle_UA_client_request);
+   /*  ****FIXME**** put # 10 on config parameter */
+   bnet_thread_server(UA->addr, UA->port, 10, &ua_workq, handle_UA_client_request);
    return NULL;
 }
 
 /*
- * Create a Job Control Record for a console "job" 
+ * Create a Job Control Record for a control "job",
  *   filling in all the appropriate fields.
  */
-static JCR *create_console_jcr()
+JCR *new_control_jcr(const char *base_name, int job_type)
 {
    JCR *jcr;
    jcr = new_jcr(sizeof(JCR), dird_free_jcr);
    jcr->sd_auth_key = bstrdup("dummy"); /* dummy Storage daemon key */
-   create_unique_job_name(jcr, "*Console*");
+   create_unique_job_name(jcr, base_name);
    jcr->sched_time = jcr->start_time;
-   jcr->JobType = JT_CONSOLE;
-   jcr->JobLevel = L_FULL;
+   jcr->JobType = job_type;
+   jcr->JobLevel = L_NONE;
    jcr->JobStatus = JS_Running;
-   /* None of these are really defined for the Console, so we
+   jcr->JobId = 0;
+   /*
+    * None of these are really defined for control JCRs, so we
     * simply take the first of each one. This ensures that there
     * will be no null pointer references.
     */
@@ -134,21 +138,20 @@ static void *handle_UA_client_request(void *arg)
 
    pthread_detach(pthread_self());
 
-   jcr = create_console_jcr();
+   jcr = new_control_jcr("*Console*", JT_CONSOLE);
 
    ua = new_ua_context(jcr);
    ua->UA_sock = UA_sock;
 
    bnet_recv(ua->UA_sock);         /* Get first message */
-   if (!authenticate_user_agent(ua->UA_sock)) {
+   if (!authenticate_user_agent(ua)) {
       goto getout;
    }
 
    while (!ua->quit) {
       stat = bnet_recv(ua->UA_sock);
       if (stat >= 0) {
-        ua->cmd = check_pool_memory_size(ua->cmd, ua->UA_sock->msglen+1);
-        bstrncpy(ua->cmd, ua->UA_sock->msg, ua->UA_sock->msglen+1);
+        pm_strcpy(&ua->cmd, ua->UA_sock->msg);
         parse_ua_args(ua);
          if (ua->argc > 0 && ua->argk[0][0] == '.') {
            do_a_dot_command(ua, ua->cmd);
@@ -176,7 +179,7 @@ static void *handle_UA_client_request(void *arg)
 
 getout:
 
-   close_db(ua);                    /* do this before freeing JCR */
+   close_db(ua);
    free_ua_context(ua);
    free_jcr(jcr);
 
@@ -220,7 +223,6 @@ void free_ua_context(UAContext *ua)
    if (ua->UA_sock) {
       bnet_close(ua->UA_sock);
    }
-
    free(ua);
 }