X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fkey_block.c;h=9ca9e7de7383ef1e96bf790e9ef9a39355d9295c;hb=3e96aa60be900d8b3b8e9825409f811b16f72823;hp=1cc8351066622c3493e59f134bbba91616d56ce2;hpb=21183d937806badd59032ea24773a1eb85918835;p=idzebra-moved-to-github.git

diff --git a/index/key_block.c b/index/key_block.c
index 1cc8351..9ca9e7d 100644
--- a/index/key_block.c
+++ b/index/key_block.c
@@ -1,5 +1,5 @@
-/* $Id: key_block.c,v 1.5 2006-11-28 08:43:53 adam Exp $
-   Copyright (C) 1995-2006
+/* $Id: key_block.c,v 1.9 2007-02-06 09:33:31 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -65,8 +65,6 @@ struct encode_info {
     char buf[ENCODE_BUFLEN];
 };
 
-static int log_level = 0;
-
 #define USE_SHELLSORT 0
 
 #if USE_SHELLSORT
@@ -188,6 +186,11 @@ zebra_key_block_t key_block_create(int mem, const char *key_tmp_dir,
 {
     zebra_key_block_t p = xmalloc(sizeof(*p));
 
+#if YAZ_POSIX_THREADS
+    /* we'll be making two memory areas so cut in half */
+    if (use_threads)
+        mem = mem / 2;
+#endif
     p->key_buf = (char**) xmalloc (mem);
     p->ptr_top = mem/sizeof(char*);
     p->ptr_i = 0;
@@ -209,7 +212,7 @@ zebra_key_block_t key_block_create(int mem, const char *key_tmp_dir,
         p->alt_buf = (char**) xmalloc (mem);
 #endif
     }
-    yaz_log(YLOG_LOG, "key_block_create t=%d", p->use_threads);
+    yaz_log(YLOG_DEBUG, "key_block_create t=%d", p->use_threads);
     return p;
 }
 
@@ -307,7 +310,7 @@ void key_block_flush_int(zebra_key_block_t p,
     struct encode_info encode_info;
 
     (p->key_file_no)++;
-    yaz_log(YLOG_LOG, "sorting section %d", (p->key_file_no));
+    yaz_log(YLOG_DEBUG, "sorting section %d", (p->key_file_no));
 
 #if USE_SHELLSORT
     shellsort(key_buf + ptr_top - ptr_i, ptr_i,
@@ -323,7 +326,7 @@ void key_block_flush_int(zebra_key_block_t p,
         yaz_log (YLOG_FATAL|YLOG_ERRNO, "fopen %s", out_fname);
         zebra_exit("key_block_flush");
     }
-    yaz_log(YLOG_LOG, "writing section %d", p->key_file_no);
+    yaz_log(YLOG_DEBUG, "writing section %d", p->key_file_no);
     prevcp = cp = (key_buf)[ptr_top - ptr_i];
     
     encode_key_init (&encode_info);
@@ -348,7 +351,7 @@ void key_block_flush_int(zebra_key_block_t p,
         yaz_log (YLOG_FATAL|YLOG_ERRNO, "fclose %s", out_fname);
         zebra_exit("key_block_flush");
     }
-    yaz_log(YLOG_LOG, "finished section %d", p->key_file_no);
+    yaz_log(YLOG_DEBUG, "finished section %d", p->key_file_no);
 }
 
 void key_block_flush(zebra_key_block_t p, int is_final)