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:
38241cb
)
Updates to tstflock for Windows
author
Adam Dickmeiss
<adam@indexdata.dk>
Wed, 5 Jul 2006 12:33:38 +0000
(12:33 +0000)
committer
Adam Dickmeiss
<adam@indexdata.dk>
Wed, 5 Jul 2006 12:33:38 +0000
(12:33 +0000)
util/tstflock.c
patch
|
blob
|
history
diff --git
a/util/tstflock.c
b/util/tstflock.c
index
1c2fedb
..
ae4861c
100644
(file)
--- a/
util/tstflock.c
+++ b/
util/tstflock.c
@@
-2,14
+2,16
@@
* 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.14 2006-07-05 12:02:12 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>
*/
#include <assert.h>
#include <stdlib.h>
#include <yaz/test.h>
#include <yaz/log.h>
+#if HAVE_SYS_TIME_H
#include <sys/time.h>
#include <sys/time.h>
+#endif
#include <time.h>
#if HAVE_SYS_STAT_H
#include <time.h>
#if HAVE_SYS_STAT_H
@@
-27,6
+29,10
@@
#include <fcntl.h>
#include <fcntl.h>
+#ifdef WIN32
+#include <io.h>
+#endif
+
#if YAZ_POSIX_THREADS
#include <pthread.h>
#endif
#if YAZ_POSIX_THREADS
#include <pthread.h>
#endif
@@
-53,7
+59,7
@@
int test_fd = 0;
static void small_sleep()
{
#ifdef WIN32
static void small_sleep()
{
#ifdef WIN32
- Sleep(50);
+ Sleep(2);
#else
#if YAZ_POSIX_THREADS
struct timespec abstime;
#else
#if YAZ_POSIX_THREADS
struct timespec abstime;
@@
-226,7
+232,8
@@
int main(int argc, char **argv)
sprintf(logname, "%.200s.log", argv[0]);
yaz_log_init_file(logname);
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"));
/* ensure the flock system logs in our test */
yaz_log_init_level(yaz_log_mask_str("flock"));