/*
Bacula® - The Network Backup Solution
- Copyright (C) 2001-2010 Free Software Foundation Europe e.V.
+ Copyright (C) 2001-2011 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
+ modify it under the terms of version three of the GNU Affero General Public
License as published by the Free Software Foundation and included
in the file LICENSE.
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
+ You should have received a copy of the GNU Affero 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.
*
* Kern Sibbald, January MMI
*
- * Version $Id$
- *
* This code adapted from "Programming with POSIX Threads", by
* David R. Butenhof
*
* 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, rwl->priority, __FILE__, __LINE__);
+ 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);
int thread_writes = 0;
int data_writes = 0;
-#ifdef sun
+#ifdef USE_THR_SETCONCURRENCY
/*
- * On Solaris 2.5, threads are not timesliced. To ensure
+ * On Solaris 2.5,2.6,7 and 8 threads are not timesliced. To ensure
* that our threads can run concurrently, we need to
* increase the concurrency level to THREADS.
*/
*
* Demonstrate use of non-blocking read-write locks.
*
- * Special notes: On a Solaris system, call thr_setconcurrency()
+ * Special notes: On older Solaris system, call thr_setconcurrency()
* to allow interleaved thread execution, since threads are not
* timesliced.
*/
int thread_updates = 0, data_updates = 0;
int status;
-#ifdef sun
+#ifdef USE_THR_SETCONCURRENCY
/*
- * On Solaris 2.5, threads are not timesliced. To ensure
+ * On Solaris 2.5,2.6,7 and 8 threads are not timesliced. To ensure
* that our threads can run concurrently, we need to
* increase the concurrency level to THREADS.
*/