/*
Bacula® - The Network Backup Solution
- Copyright (C) 2001-2007 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.
- Bacula® is a registered trademark of John Walker.
+ 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.
*
* Kern Sibbald, January MMI
*
- * Version $Id$
- *
* This code adapted from "Programming with POSIX Threads", by
* David R. Butenhof
*
*/
+#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, 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);
while (rwl->w_active || rwl->r_active > 0) {
if ((stat = pthread_cond_wait(&rwl->write, &rwl->mutex)) != 0) {
+ lmgr_do_unlock(rwl);
break; /* error, bail out */
}
}
if (stat == 0) {
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, rwl->priority, __FILE__, __LINE__);
}
stat2 = pthread_mutex_unlock(&rwl->mutex);
return (stat == 0 ? stat2 : stat);
return stat;
}
if (rwl->w_active <= 0) {
- Emsg0(M_ABORT, 0, _("rwl_writeunlock called too many times.\n"));
+ pthread_mutex_unlock(&rwl->mutex);
+ Jmsg0(NULL, M_ABORT, 0, _("rwl_writeunlock called too many times.\n"));
}
rwl->w_active--;
if (!pthread_equal(pthread_self(), rwl->writer_id)) {
- Emsg0(M_ABORT, 0, _("rwl_writeunlock by non-owner.\n"));
+ pthread_mutex_unlock(&rwl->mutex);
+ Jmsg0(NULL, M_ABORT, 0, _("rwl_writeunlock by non-owner.\n"));
}
if (rwl->w_active > 0) {
stat = 0; /* writers still active */
} else {
+ lmgr_do_unlock(rwl);
/* No more writers, awaken someone */
if (rwl->r_wait > 0) { /* if readers waiting */
stat = pthread_cond_broadcast(&rwl->read);
#ifdef TEST_RWLOCK
-#define THREADS 5
+#define THREADS 300
#define DATASIZE 15
-#define ITERATIONS 10000
+#define ITERATIONS 1000000
/*
* Keep statics for each thread.
int writes;
} data_t;
-thread_t threads[THREADS];
-data_t data[DATASIZE];
+static thread_t threads[THREADS];
+static data_t data[DATASIZE];
/*
* Thread start routine that uses read/write locks.
* update operation (write lock instead of read
* lock).
*/
- if ((iteration % self->interval) == 0) {
+// if ((iteration % self->interval) == 0) {
+ status = rwl_writelock(&data[element].lock);
+ if (status != 0) {
+ berrno be;
+ printf("Write lock failed. ERR=%s\n", be.bstrerror(status));
+ exit(1);
+ }
+ data[element].data = self->thread_num;
+ data[element].writes++;
+ self->writes++;
status = rwl_writelock(&data[element].lock);
if (status != 0) {
berrno be;
- Emsg1(M_ABORT, 0, _("Write lock failed. ERR=%s\n"), be.bstrerror(status));
+ printf("Write lock failed. ERR=%s\n", be.bstrerror(status));
+ exit(1);
}
data[element].data = self->thread_num;
data[element].writes++;
status = rwl_writeunlock(&data[element].lock);
if (status != 0) {
berrno be;
- Emsg1(M_ABORT, 0, _("Write unlock failed. ERR=%s\n"), be.bstrerror(status));
+ printf("Write unlock failed. ERR=%s\n", be.bstrerror(status));
+ exit(1);
+ }
+ status = rwl_writeunlock(&data[element].lock);
+ if (status != 0) {
+ berrno be;
+ printf("Write unlock failed. ERR=%s\n", be.bstrerror(status));
+ exit(1);
}
+
+#ifdef xxx
} else {
/*
* Look at the current data element to see whether
status = rwl_readlock(&data[element].lock);
if (status != 0) {
berrno be;
- Emsg1(M_ABORT, 0, _("Read lock failed. ERR=%s\n"), be.bstrerror(status));
+ printf("Read lock failed. ERR=%s\n", be.bstrerror(status));
+ exit(1);
}
self->reads++;
if (data[element].data == self->thread_num)
status = rwl_readunlock(&data[element].lock);
if (status != 0) {
berrno be;
- Emsg1(M_ABORT, 0, _("Read unlock failed. ERR=%s\n"), be.bstrerror(status));
+ printf("Read unlock failed. ERR=%s\n", be.bstrerror(status));
+ exit(1);
}
}
+#endif
element++;
if (element >= DATASIZE) {
element = 0;
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.
*/
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;
- Emsg1(M_ABORT, 0, _("Init rwlock failed. ERR=%s\n"), be.bstrerror(status));
+ printf("Init rwlock failed. ERR=%s\n", be.bstrerror(status));
+ exit(1);
}
}
threads[count].thread_num = count + 1;
threads[count].writes = 0;
threads[count].reads = 0;
- threads[count].interval = rand_r (&seed) % 71;
+ threads[count].interval = rand_r(&seed) % 71;
+ if (threads[count].interval <= 0) {
+ threads[count].interval = 1;
+ }
status = pthread_create (&threads[count].thread_id,
NULL, thread_routine, (void*)&threads[count]);
- if (status != 0) {
+ if (status != 0 || (int)threads[count].thread_id == 0) {
berrno be;
- Emsg1(M_ABORT, 0, _("Create thread failed. ERR=%s\n"), be.bstrerror(status));
+ printf("Create thread failed. ERR=%s\n", be.bstrerror(status));
+ exit(1);
}
}
status = pthread_join (threads[count].thread_id, NULL);
if (status != 0) {
berrno be;
- Emsg1(M_ABORT, 0, _("Join thread failed. ERR=%s\n"), be.bstrerror(status));
+ printf("Join thread failed. ERR=%s\n", be.bstrerror(status));
+ exit(1);
}
thread_writes += threads[count].writes;
printf (_("%02d: interval %d, writes %d, reads %d\n"),
*
* 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 iteration;
int element;
int status;
-
+ lmgr_init_thread();
element = 0; /* Current data element */
for (iteration = 0; iteration < ITERATIONS; iteration++) {
if (element >= DATASIZE)
element = 0;
}
+ lmgr_cleanup_thread();
return NULL;
}
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.
*/
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