projects
/
idzebra-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d2a2cd0
)
Disable debug mode
author
Adam Dickmeiss
<adam@indexdata.dk>
Fri, 30 Jun 2006 15:10:20 +0000
(15:10 +0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Fri, 30 Jun 2006 15:10:20 +0000
(15:10 +0000)
util/flock.c
patch
|
blob
|
history
diff --git
a/util/flock.c
b/util/flock.c
index
f936730
..
42dd067
100644
(file)
--- a/
util/flock.c
+++ b/
util/flock.c
@@
-1,4
+1,4
@@
-/* $Id: flock.c,v 1.12 2006-06-30 14:01:22 adam Exp $
+/* $Id: flock.c,v 1.13 2006-06-30 15:10:20 adam Exp $
Copyright (C) 1995-2006
Index Data ApS
Copyright (C) 1995-2006
Index Data ApS
@@
-50,7
+50,7
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#define ZEBRA_FLOCK_EXTRA_RDWR_LOCKS 1
/** whether this module should debug */
#define ZEBRA_FLOCK_EXTRA_RDWR_LOCKS 1
/** whether this module should debug */
-#define DEBUG_FLOCK 1
+#define DEBUG_FLOCK 0
/** have this module (mutex) been initialized? */
static int initialized = 0;
/** have this module (mutex) been initialized? */
static int initialized = 0;
@@
-266,7
+266,6
@@
int zebra_lock_w(ZebraLockHandle h)
yaz_log(log_level, "zebra_lock_w fd=%d p=%p fname=%s begin",
h->p->fd, h, h->p->fname);
yaz_log(log_level, "zebra_lock_w fd=%d p=%p fname=%s begin",
h->p->fd, h, h->p->fname);
-
#ifdef WIN32
while ((r = _locking(h->p->fd, _LK_LOCK, 1)))
;
#ifdef WIN32
while ((r = _locking(h->p->fd, _LK_LOCK, 1)))
;
@@
-281,14
+280,10
@@
int zebra_lock_w(ZebraLockHandle h)
h->p->no_file_write_lock++;
if (do_lock)
{
h->p->no_file_write_lock++;
if (do_lock)
{
- yaz_log(log_level, "zebra_lock_w fd=%d p=%p fname=%s 2",
- h->p->fd, h, h->p->fname);
/* if there is already a read lock.. upgrade to write lock */
r = unixLock(h->p->fd, F_WRLCK, F_SETLKW);
}
zebra_mutex_unlock(&h->p->file_mutex);
/* if there is already a read lock.. upgrade to write lock */
r = unixLock(h->p->fd, F_WRLCK, F_SETLKW);
}
zebra_mutex_unlock(&h->p->file_mutex);
- yaz_log(log_level, "zebra_lock_w fd=%d p=%p fname=%s 3",
- h->p->fd, h, h->p->fname);
h->write_flag = 1;
yaz_log(log_level, "zebra_lock_w fd=%d p=%p fname=%s end",
h->write_flag = 1;
yaz_log(log_level, "zebra_lock_w fd=%d p=%p fname=%s end",