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 a0226f28473ebae3887b0e902c225fb0fc40bb65..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,32 +24,12 @@
  *
  *  This code adapted from "Programming with POSIX Threads", by
  *    David R. Butenhof
- *
- */
-/*
-   Copyright (C) 2000, 2001, 2002 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
-   published by the Free Software Foundation; either version 2 of
-   the License, or (at your option) any later version.
-
-   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., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
-
  */
 
-#ifndef __WORKQ_H 
+#ifndef __WORKQ_H
 #define __WORKQ_H 1
 
-/* 
+/*
  * Structure to keep track of work queue request
  */
 typedef struct workq_ele_tag {
@@ -39,12 +37,13 @@ typedef struct workq_ele_tag {
    void                 *data;
 } workq_ele_t;
 
-/* 
+/*
  * Structure describing a work queue
  */
 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 */
@@ -52,7 +51,8 @@ typedef struct workq_tag {
    int               max_workers;     /* max threads */
    int               num_workers;     /* current threads */
    int               idle_workers;    /* idle threads */
-   void              (*engine)(void *arg); /* user engine */
+   int               num_running;     /* Number of jobs running */
+   void             *(*engine)(void *arg); /* user engine */
 } workq_t;
 
 #define WORKQ_VALID  0xdec1992
@@ -60,9 +60,12 @@ typedef struct workq_tag {
 extern int workq_init(
               workq_t *wq,
               int     threads,        /* maximum threads */
-              void    (*engine)(void *)   /* engine routine */
+              void   *(*engine)(void *)   /* engine routine */
                     );
 extern int workq_destroy(workq_t *wq);
-extern int workq_add(workq_t *wq, void *data);
+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 */