Minor tweaks to Migration

[bacula/bacula] / bacula / src / dird / jobq.h

diff --git a/bacula/src/dird/jobq.h b/bacula/src/dird/jobq.h
index 47922ef28376284d7671e7e5341f723eb768a9ee..1a919df00a32f8529947a5cae256142176344c07 100644 (file)
--- a/bacula/src/dird/jobq.h
+++ b/bacula/src/dird/jobq.h
@@ -1,5 +1,5 @@
 /*
- * Bacula job queue routines. 
+ * Bacula job queue routines.
  *
  *  Kern Sibbald, July MMIII
  *
@@ -10,7 +10,7 @@
  *   Version $Id$
  */
 /*
-   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
@@ -29,10 +29,10 @@
 
  */
 
-#ifndef __JOBQ_H 
+#ifndef __JOBQ_H
 #define __JOBQ_H 1
 
-/* 
+/*
  * Structure to keep track of job queue request
  */
 struct jobq_item_t {
@@ -40,29 +40,31 @@ struct jobq_item_t {
    JCR *jcr;
 };
 
-/* 
+/*
  * Structure describing a work queue
  */
 struct jobq_t {
-   pthread_mutex_t   mutex;           /* queue access control */
-   pthread_cond_t    work;            /* wait for work */
-   pthread_attr_t    attr;            /* create detached threads */
-   dlist             list;            /* list of jobs */
-   int               valid;           /* queue initialized */
-   bool              quit;            /* jobq should quit */
-   int               max_workers;     /* max threads */
-   int               num_workers;     /* current threads */
-   int               idle_workers;    /* idle threads */
-   void             *(*engine)(void *arg); /* user engine */
+   pthread_mutex_t   mutex;          /* queue access control */
+   pthread_cond_t    work;           /* wait for work */
+   pthread_attr_t    attr;           /* create detached threads */
+   dlist           *waiting_jobs;    /* list of jobs waiting */
+   dlist           *running_jobs;    /* jobs running */
+   dlist           *ready_jobs;      /* jobs ready to run */
+   int              valid;           /* queue initialized */
+   bool             quit;            /* jobq should quit */
+   int              max_workers;     /* max threads */
+   int              num_workers;     /* current threads */
+   int              idle_workers;    /* idle threads */
+   void            *(*engine)(void *arg); /* user engine */
 };
 
 #define JOBQ_VALID  0xdec1993
 
 extern int jobq_init(
-              jobq_t *wq,
-              int     threads,            /* maximum threads */
-              void   *(*engine)(void *)   /* engine routine */
-                    );
+             jobq_t *wq,
+             int     threads,            /* maximum threads */
+             void   *(*engine)(void *)   /* engine routine */
+                   );
 extern int jobq_destroy(jobq_t *wq);
 extern int jobq_add(jobq_t *wq, JCR *jcr);
 extern int jobq_remove(jobq_t *wq, JCR *jcr);