projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of DEBUG_FLOCK. Just set flock level for tstflock program.
[idzebra-moved-to-github.git]
/
util
/
tstflock.c
diff --git
a/util/tstflock.c
b/util/tstflock.c
index
4abcdbf
..
1c2fedb
100644
(file)
--- a/
util/tstflock.c
+++ b/
util/tstflock.c
@@
-2,7
+2,7
@@
* Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
* Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: tstflock.c,v 1.13 2006-07-03 21:19:13 adam Exp $
+ * $Id: tstflock.c,v 1.14 2006-07-05 12:02:12 adam Exp $
*/
#include <assert.h>
*/
#include <assert.h>
@@
-187,12
+187,9
@@
static void tst()
}
}
}
}
-#if 0
tst_thread(6, 0); /* read locks */
tst_thread(6, 0); /* read locks */
-#endif
-#if 1
+
tst_thread(20, 2); /* random locks */
tst_thread(20, 2); /* random locks */
-#endif
}
void fork_tst()
}
void fork_tst()
@@
-221,7
+218,6
@@
void fork_tst()
#endif
}
#endif
}
-
int main(int argc, char **argv)
{
char logname[220];
int main(int argc, char **argv)
{
char logname[220];
@@
-232,6
+228,9
@@
int main(int argc, char **argv)
yaz_log_time_format("%s:%!");
yaz_log_time_format("%s:%!");
+ /* ensure the flock system logs in our test */
+ yaz_log_init_level(yaz_log_mask_str("flock"));
+
zebra_flock_init();
test_fd = open("tstflock.out", (O_BINARY|O_CREAT|O_RDWR), 0666);
zebra_flock_init();
test_fd = open("tstflock.out", (O_BINARY|O_CREAT|O_RDWR), 0666);