/*
- Bacula® - The Network Backup Solution
-
- Copyright (C) 2001-2008 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(R) - The Network Backup Solution
+
+ Copyright (C) 2000-2016 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 Thread Read/Write locking code. It permits
*
* Kern Sibbald, January MMI
*
- * Version $Id$
- *
* This code adapted from "Programming with POSIX Threads", by
* David R. Butenhof
*
*/
-#define _LOCKMGR_COMPLIANT
+#define LOCKMGR_COMPLIANT
#include "bacula.h"
/*
* Returns: 0 on success
* errno on failure
*/
-int rwl_init(brwlock_t *rwl)
+int rwl_init(brwlock_t *rwl, int priority)
{
int stat;
rwl->r_active = rwl->w_active = 0;
rwl->r_wait = rwl->w_wait = 0;
+ rwl->priority = priority;
if ((stat = pthread_mutex_init(&rwl->mutex, NULL)) != 0) {
return stat;
}
* Lock for write access, wait until locked (or error).
* Multiple nested write locking is permitted.
*/
-int rwl_writelock(brwlock_t *rwl)
+int rwl_writelock_p(brwlock_t *rwl, const char *file, int line)
{
int stat;
pthread_mutex_unlock(&rwl->mutex);
return 0;
}
- lmgr_pre_lock(rwl);
+ lmgr_pre_lock(rwl, rwl->priority, file, line);
if (rwl->w_active || rwl->r_active > 0) {
rwl->w_wait++; /* indicate that we are waiting */
pthread_cleanup_push(rwl_write_release, (void *)rwl);
rwl->w_active++; /* we are running */
rwl->writer_id = pthread_self(); /* save writer thread's id */
lmgr_post_lock();
- }
+ }
pthread_mutex_unlock(&rwl->mutex);
return stat;
}
} else {
rwl->w_active = 1; /* we are running */
rwl->writer_id = pthread_self(); /* save writer thread's id */
- lmgr_do_lock(rwl);
+ lmgr_do_lock(rwl, rwl->priority, __FILE__, __LINE__);
}
stat2 = pthread_mutex_unlock(&rwl->mutex);
return (stat == 0 ? stat2 : stat);
return (stat == 0 ? stat2 : stat);
}
+bool is_rwl_valid(brwlock_t *rwl)
+{
+ return (rwl->valid == RWLOCK_VALID);
+}
+
+
#ifdef TEST_RWLOCK
#define THREADS 300
int thread_writes = 0;
int data_writes = 0;
-#ifdef sun
/*
- * On Solaris 2.5, threads are not timesliced. To ensure
- * that our threads can run concurrently, we need to
- * increase the concurrency level to THREADS.
+ * For Solaris 2.5,2.6,7 and 8 threads are not timesliced.
+ * Ensure our threads can run concurrently.
*/
- thr_setconcurrency (THREADS);
-#endif
+ thr_setconcurrency(THREADS); /* Only implemented on Solaris */
/*
* Initialize the shared data.
for (data_count = 0; data_count < DATASIZE; data_count++) {
data[data_count].data = 0;
data[data_count].writes = 0;
- status = rwl_init (&data[data_count].lock);
+ status = rwl_init(&data[data_count].lock);
if (status != 0) {
berrno be;
printf("Init rwlock failed. ERR=%s\n", be.bstrerror(status));
*
* Demonstrate use of non-blocking read-write locks.
*
- * Special notes: On a Solaris system, call thr_setconcurrency()
+ * On older Solaris systems, call thr_setconcurrency()
* to allow interleaved thread execution, since threads are not
* timesliced.
*/
int thread_updates = 0, data_updates = 0;
int status;
-#ifdef sun
/*
- * On Solaris 2.5, threads are not timesliced. To ensure
- * that our threads can run concurrently, we need to
- * increase the concurrency level to THREADS.
+ * For Solaris 2.5,2.6,7 and 8 threads are not timesliced.
+ * Ensure our threads can run concurrently.
*/
DPRINTF (("Setting concurrency level to %d\n", THREADS));
- thr_setconcurrency (THREADS);
-#endif
+ thr_setconcurrency(THREADS); /* Only implemented on Solaris */
/*
* Initialize the shared data.
for (data_count = 0; data_count < DATASIZE; data_count++) {
data[data_count].data = 0;
data[data_count].updates = 0;
- rwl_init (&data[data_count].lock);
+ rwl_init(&data[data_count].lock);
}
/*
projects / bacula / bacula / blobdiff