fprintf(fp, "threadid=%p max=%i current=%i\n",
(void *)thread_id, max, current);
for(int i=0; i<=current; i++) {
- fprintf(fp, " lock=%p state=%c %s:%i\n",
- lock_list[i].lock, lock_list[i].state,
- lock_list[i].file, lock_list[i].line);
- }
+ fprintf(fp, " lock=%p state=%s %s:%i\n",
+ lock_list[i].lock,
+ (lock_list[i].state=='W')?"Wanted ":"Granted",
+ lock_list[i].file, lock_list[i].line);
+ }
}
void dump(FILE *fp) {
pthread_once_t key_lmgr_once = PTHREAD_ONCE_INIT;
static pthread_key_t lmgr_key; /* used to get lgmr_thread_t object */
-static dlist *global_mgr=NULL; /* used to store all lgmr_thread_t objects */
+static dlist *global_mgr = NULL; /* used to store all lgmr_thread_t objects */
static pthread_mutex_t lmgr_global_mutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_t undertaker;
lmgr_thread_t *n=NULL;
global_mgr = New(dlist(n, &n->link));
- if (pthread_create(&undertaker, NULL, check_deadlock, NULL) != 0) {
+ status = pthread_create(&undertaker, NULL, check_deadlock, NULL);
+ if (status != 0) {
berrno be;
Pmsg1(000, _("pthread_create failed: ERR=%s\n"),
be.bstrerror(status));
pthread_mutex_lock(&lmgr_global_mutex);
{
temp = global_mgr;
- global_mgr=NULL;
+ global_mgr = NULL;
delete temp;
}
pthread_mutex_unlock(&lmgr_global_mutex);