X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=index%2Finvstat.c;h=dede37fcce4941c3f83679182a33340495d2aa5c;hp=76b99a3ae762ccdcc3a07ff148f298c0487ade0a;hb=5d536c8cf5400b1e4da91061cf736a9ab53e5bd1;hpb=4d7345f0e28b1e56658c26a31ffaee95dcf502c0

diff --git a/index/invstat.c b/index/invstat.c
index 76b99a3..dede37f 100644
--- a/index/invstat.c
+++ b/index/invstat.c
@@ -1,8 +1,5 @@
-/* $Id: invstat.c,v 1.47 2006-02-20 12:41:42 adam Exp $
-   Copyright (C) 1995-2005
-   Index Data ApS
-
-This file is part of the Zebra server.
+/* This file is part of the Zebra server.
+   Copyright (C) 1994-2011 Index Data
 
 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
@@ -15,12 +12,15 @@ 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 Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
@@ -51,14 +51,14 @@ static void print_dict_item (ZebraHandle zh, const char *s, zint count,
     char dst[IT_MAX_WORD+1];
     int ord;
     int len = key_SU_decode(&ord, (const unsigned char *) s);
-    int index_type;
+    const char *index_type;
     const char *db = 0;
 
     if (!zh)
 	*dst = '\0';
     else
     {
-        zebraExplain_lookup_ord (zh->reg->zei, ord, &index_type, &db, 0, 0);
+        zebraExplain_lookup_ord (zh->reg->zei, ord, &index_type, &db, 0);
 
         zebra_term_untrans(zh, index_type, dst, s + len);
     }
@@ -120,7 +120,7 @@ static int inv_stat_handle (char *name, const char *info, int pos,
     {
         ISAMB_PP pp;
         struct it_key key;
-        int cat = (int) (isam_p & 3);
+        int cat = CAST_ZINT_TO_INT(isam_p & 3);
         int level;
         zint size;
         zint blocks;
@@ -149,6 +149,28 @@ static int inv_stat_handle (char *name, const char *info, int pos,
     return 0;
 }
 
+static void show_bfs_stats(BFiles bfs)
+{
+    int i = 0;
+    const char *directory = 0;
+    double used_bytes, max_bytes;
+    printf("Register:\n");
+    while (bfs_register_directory_stat(bfs, i, &directory,
+				       &used_bytes, &max_bytes))
+    {
+	printf ("%s %10.0lf %10.0lf\n", directory, used_bytes, max_bytes);
+	i++;
+    }
+    i = 0;
+    printf("Shadow:\n");
+    while (bfs_shadow_directory_stat(bfs, i, &directory,
+				       &used_bytes, &max_bytes))
+    {
+	printf ("%s %10.0lf %10.0lf\n", directory, used_bytes, max_bytes);
+	i++;
+    }
+}
+
 int zebra_register_statistics (ZebraHandle zh, int dumpdict)
 {
     int i, prev;
@@ -161,6 +183,8 @@ int zebra_register_statistics (ZebraHandle zh, int dumpdict)
     if (zebra_begin_read (zh))
 	return 1;
 
+    show_bfs_stats(zebra_get_bfs(zh));
+
     stat_info.zh = zh;
     stat_info.dumpwords=dumpdict;
 
@@ -218,13 +242,13 @@ int zebra_register_statistics (ZebraHandle zh, int dumpdict)
 		     stat_info.no_isam_entries[i]);
 
 	    if (stat_info.no_isam_entries[i])
-		fprintf (stdout, " %8d   %f",
-			 (int) ((1023.0 + (double)
-                                 isamc_block_used(zh->reg->isamc, i) *
-				 isamc_block_size(zh->reg->isamc,i))/1024),
-			 ((double) isamc_block_used(zh->reg->isamc, i) *
+		fprintf(stdout, " %8d   %f",
+                        (int) ((1023.0 + (double)
+                          isamc_block_used(zh->reg->isamc, i) *
+                          isamc_block_size(zh->reg->isamc,i))/1024),
+                        ((double) isamc_block_used(zh->reg->isamc, i) *
 			  isamc_block_size(zh->reg->isamc,i))/
-			 stat_info.no_isam_entries[i]);
+                        stat_info.no_isam_entries[i]);
 	    fprintf (stdout, "\n");
 	}
     }
@@ -270,8 +294,18 @@ int zebra_register_statistics (ZebraHandle zh, int dumpdict)
     }
     fprintf (stdout, "%7d-        %7d\n",
              prev, stat_info.isam_occurrences[i]);
+    rec_prstat(zh->reg->records, 0);
     xmalloc_trav("unfreed"); /*! while hunting memory leaks */    
     zebra_end_read (zh);
     return 0;
 }
 
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+