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
Use HAVE_UNISTD_H when including unistd.h.
[idzebra-moved-to-github.git]
/
test
/
api
/
testlib.c
diff --git
a/test/api/testlib.c
b/test/api/testlib.c
index
c0a495b
..
3d1f743
100644
(file)
--- a/
test/api/testlib.c
+++ b/
test/api/testlib.c
@@
-1,4
+1,4
@@
-/* $Id: testlib.c,v 1.20 2005-05-24 11:27:48 adam Exp $
+/* $Id: testlib.c,v 1.23 2005-06-14 20:28:54 adam Exp $
Copyright (C) 1995-2005
Index Data ApS
Copyright (C) 1995-2005
Index Data ApS
@@
-22,6
+22,16
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
/** testlib - utilities for the api tests */
/** testlib - utilities for the api tests */
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#if HAVE_SYS_RESOURCE_H
+#include <sys/resource.h>
+#endif
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
#include <assert.h>
#include <yaz/log.h>
#include <yaz/pquery.h>
#include <assert.h>
#include <yaz/log.h>
#include <yaz/pquery.h>
@@
-34,6
+44,7
@@
int log_level=0; /* not static, t*.c may use it */
void start_log(int argc, char **argv)
{
void start_log(int argc, char **argv)
{
+ int cmd_level = 0;
char logname[2048];
if (!argv)
return;
char logname[2048];
if (!argv)
return;
@@
-43,8
+54,8
@@
void start_log(int argc, char **argv)
yaz_log_init_file(logname);
log_level = yaz_log_mask_str_x(argv[0], 0);
if (argc >= 2)
yaz_log_init_file(logname);
log_level = yaz_log_mask_str_x(argv[0], 0);
if (argc >= 2)
- log_level |= yaz_log_mask_str_x(argv[1], 0);
- yaz_log_init_level(YLOG_DEFAULT_LEVEL | log_level);
+ cmd_level |= yaz_log_mask_str_x(argv[1], 0);
+ yaz_log_init_level(YLOG_DEFAULT_LEVEL | log_level | cmd_level);
yaz_log(log_level, "starting %s", argv[0]);
}
yaz_log(log_level, "starting %s", argv[0]);
}
@@
-58,6
+69,14
@@
void start_log(int argc, char **argv)
*/
ZebraService start_up(char *cfgname, int argc, char **argv)
{
*/
ZebraService start_up(char *cfgname, int argc, char **argv)
{
+#if HAVE_SYS_RESOURCE_H
+#if HAVE_SYS_TIME_H
+ struct rlimit rlim;
+ rlim.rlim_cur = 20;
+ rlim.rlim_max = 20;
+ setrlimit(RLIMIT_CPU, &rlim);
+#endif
+#endif
nmem_init();
start_log(argc, argv);
return start_service(cfgname);
nmem_init();
start_log(argc, argv);
return start_service(cfgname);