-/*
- * 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.17 2006-10-29 17:20:02 adam Exp $
+ Copyright (C) 1995-2006
+ Index Data ApS
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of 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
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+*/
#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
int test_fd = 0;
-static void small_sleep()
+static void small_sleep(void)
{
#ifdef WIN32
- Sleep(50);
+ Sleep(2);
#else
#if YAZ_POSIX_THREADS
struct timespec abstime;
num, write_flag, seq);
}
-static void tst()
+static void tst(void)
{
tst_thread(4, 1); /* write locks */
if (1)
}
}
-#if 0
tst_thread(6, 0); /* read locks */
-#endif
-#if 1
+
tst_thread(20, 2); /* random locks */
-#endif
}
-void fork_tst()
+void fork_tst(void)
{
#if HAVE_SYS_WAIT_H
pid_t pid[2];
#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();