* 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.15 2006-07-05 12:33:38 adam Exp $
*/
#include <assert.h>
#include <stdlib.h>
#include <yaz/test.h>
#include <yaz/log.h>
+#if HAVE_SYS_TIME_H
#include <sys/time.h>
+#endif
#include <time.h>
#if HAVE_SYS_STAT_H
#include <fcntl.h>
+#ifdef WIN32
+#include <io.h>
+#endif
+
#if YAZ_POSIX_THREADS
#include <pthread.h>
#endif
static void small_sleep()
{
#ifdef WIN32
- Sleep(50);
+ Sleep(2);
#else
#if YAZ_POSIX_THREADS
struct timespec abstime;
}
}
-#if 0
tst_thread(6, 0); /* read locks */
-#endif
-#if 1
+
tst_thread(20, 2); /* random locks */
-#endif
}
void fork_tst()
#endif
}
-
int main(int argc, char **argv)
{
char logname[220];
sprintf(logname, "%.200s.log", argv[0]);
yaz_log_init_file(logname);
- yaz_log_time_format("%s:%!");
+ /* log time + thread id (%!) */
+ yaz_log_time_format("%c:%!");
+
+ /* ensure the flock system logs in our test */
+ yaz_log_init_level(yaz_log_mask_str("flock"));
zebra_flock_init();