Remove old bdb files + change DQUEUE to use dlist

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

diff --git a/bacula/src/lib/workq.h b/bacula/src/lib/workq.h
index 92c66e1f5003c6b69133076faaf4aac7fecc600a..6ca118209ce0ff92c5d171fda35f37b75e07bf38 100644 (file)
--- a/bacula/src/lib/workq.h
+++ b/bacula/src/lib/workq.h
@@ -1,3 +1,30 @@
+/*
+   Bacula® - The Network Backup Solution
+
+   Copyright (C) 2001-2009 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 of Kern Sibbald.
+   The licensor of Bacula is the Free Software Foundation Europe
+   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
+   Switzerland, email:ftf@fsfeurope.org.
+*/
 /*
  * Bacula work queue routines. Permits passing work to
  *  multiple threads.
@@ -9,61 +36,43 @@
  *
  *   Version $Id$
  */
-/*
-   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 {
    struct workq_ele_tag *next;
-   void                *data;
+   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_attr_t    attr;           /* create detached threads */
-   workq_ele_t      *first, *last;   /* work queue */
-   int              valid;           /* queue initialized */
-   int              quit;            /* workq 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 */
+   workq_ele_t       *first, *last;   /* work queue */
+   int               valid;           /* queue initialized */
+   int               quit;            /* workq should quit */
+   int               max_workers;     /* max threads */
+   int               num_workers;     /* current threads */
+   int               idle_workers;    /* idle threads */
+   void             *(*engine)(void *arg); /* user engine */
 } workq_t;
 
 #define WORKQ_VALID  0xdec1992
 
 extern int workq_init(
-             workq_t *wq,
-             int     threads,        /* maximum threads */
-             void    (*engine)(void *)   /* engine routine */
-                   );
+              workq_t *wq,
+              int     threads,        /* maximum threads */
+              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);
 
 #endif /* __WORKQ_H */