Big backport from Enterprise

[bacula/bacula] / bacula / src / lib / workq.h

diff --git a/bacula/src/lib/workq.h b/bacula/src/lib/workq.h
index 12af195b1a79c7e29c25d2db1eb9796def7edde1..8952cceac593bf0a070b38556b3eed025922cb74 100644 (file)
--- a/bacula/src/lib/workq.h
+++ b/bacula/src/lib/workq.h
@@ -1,3 +1,21 @@
+/*
+   Bacula(R) - The Network Backup Solution
+
+   Copyright (C) 2000-2017 Kern Sibbald
+
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
+
+   You may use this file and others of this release according to the
+   license defined in the LICENSE file, which includes the Affero General
+   Public License, v3.0 ("AGPLv3") and some additional permissions and
+   terms pursuant to its AGPLv3 Section 7.
+
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
+*/
 /*
  * Bacula work queue routines. Permits passing work to
  *  multiple threads.
@@ -6,36 +24,7 @@
  *
  *  This code adapted from "Programming with POSIX Threads", by
  *    David R. Butenhof
- *
- *   Version $Id$
  */
-/*
-   Bacula® - The Network Backup Solution
-
-   Copyright (C) 2001-2006 Free Software Foundation Europe e.V.
-
-   The main author of Bacula is Kern Sibbald, with contributions from
-   many others, a complete list can be found in the file AUTHORS.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version two of the GNU General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-   Bacula® is a registered trademark ofJohn Walker.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
-*/
 
 #ifndef __WORKQ_H
 #define __WORKQ_H 1
@@ -54,6 +43,7 @@ typedef struct workq_ele_tag {
 typedef struct workq_tag {
    pthread_mutex_t   mutex;           /* queue access control */
    pthread_cond_t    work;            /* wait for work */
+   pthread_cond_t    idle;            /* wait for idle */
    pthread_attr_t    attr;            /* create detached threads */
    workq_ele_t       *first, *last;   /* work queue */
    int               valid;           /* queue initialized */
@@ -61,6 +51,7 @@ typedef struct workq_tag {
    int               max_workers;     /* max threads */
    int               num_workers;     /* current threads */
    int               idle_workers;    /* idle threads */
+   int               num_running;     /* Number of jobs running */
    void             *(*engine)(void *arg); /* user engine */
 } workq_t;
 
@@ -74,5 +65,7 @@ extern int workq_init(
 extern int workq_destroy(workq_t *wq);
 extern int workq_add(workq_t *wq, void *element, workq_ele_t **work_item, int priority);
 extern int workq_remove(workq_t *wq, workq_ele_t *work_item);
+extern int workq_wait_idle(workq_t *wq);
+
 
 #endif /* __WORKQ_H */