Implement functions to get register usage statistics:

mf_area_directory_stat, bfs_{register,shadow}_directory_stat.

diff --git a/bfile/bfile.c b/bfile/bfile.c
index 87c6447..3006249 100644 (file)
--- a/bfile/bfile.c
+++ b/bfile/bfile.c
@@ -1,4 +1,4 @@
-/* $Id: bfile.c,v 1.45 2005-09-19 09:37:31 adam Exp $
+/* $Id: bfile.c,v 1.46 2006-05-05 09:14:02 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -437,3 +437,20 @@ int bf_free(BFile bf, int no, const zint *blocks)
     }
     return 0;
 }
+
+int bfs_register_directory_stat(BFiles bfs, int no, const char **directory,
+                               double *used_bytes, double *max_bytes)
+{
+    return mf_area_directory_stat(bfs->register_area, no, directory,
+                                 used_bytes, max_bytes);
+}
+
+
+int bfs_shadow_directory_stat(BFiles bfs, int no, const char **directory,
+                             double *used_bytes, double *max_bytes)
+{
+    if (!bfs->commit_area)
+       return 0;
+    return mf_area_directory_stat(bfs->commit_area, no, directory,
+                                 used_bytes, max_bytes);
+}

diff --git a/bfile/mfile.c b/bfile/mfile.c
index 54a2a82..7a437c0 100644 (file)
--- a/bfile/mfile.c
+++ b/bfile/mfile.c
@@ -1,4 +1,4 @@
-/* $Id: mfile.c,v 1.63 2006-04-05 02:02:36 adam Exp $
+/* $Id: mfile.c,v 1.64 2006-05-05 09:14:02 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -616,3 +616,20 @@ int mf_unlink(MFile mf)
     return 0;
 }
 
+int mf_area_directory_stat(MFile_area ma, int no, const char **directory,
+                          double *used_bytes, double *max_bytes)
+{
+    int i;
+    mf_dir *d = ma->dirs;
+    for (i = 0; d && i<no; i++, d = d->next)
+       ;
+    if (!d)
+       return 0;
+    if (directory)
+       *directory = d->name;
+    if (max_bytes)
+       *max_bytes = d->max_bytes;
+    if (used_bytes)
+       *used_bytes = d->max_bytes - d->avail_bytes;
+    return 1;
+}

diff --git a/bfile/mfile.h b/bfile/mfile.h
index eece9ce..dee394f 100644 (file)
--- a/bfile/mfile.h
+++ b/bfile/mfile.h
@@ -1,4 +1,4 @@
-/* $Id: mfile.h,v 1.3 2006-04-05 02:02:37 adam Exp $
+/* $Id: mfile.h,v 1.4 2006-05-05 09:14:02 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -145,6 +145,23 @@ int mf_unlink(MFile mf);
  */
 void mf_reset(MFile_area ma);
 
+/* \brief gets statistics about directory in metafile area
+   \param ma the area
+   \param no directory number (0=first, 1=second,...)
+   \param directory holds directory name (if found)
+   \param used_bytes used file bytes in directory (if found)
+   \param max_bytes max usage of bytes (if found)
+   \retval 1 no is within range and directory, used, max are set.
+   \retval 0 no is out of range and directory, used, max are unset
+
+   We are using double, because off_t may have a different size
+   on same platform depending on whether 64-bit is enabled or not.
+   Note that if an area has unlimited size, that is represented
+   as max_bytes = -1.
+*/ 
+int mf_area_directory_stat(MFile_area ma, int no, const char **directory,
+                          double *bytes_used, double *bytes_max);
+    
 YAZ_END_CDECL
 
 #endif

diff --git a/examples/gils/zebra.cfg b/examples/gils/zebra.cfg
index 4da099f..45ab7ea 100644 (file)
--- a/examples/gils/zebra.cfg
+++ b/examples/gils/zebra.cfg
@@ -1,5 +1,5 @@
 # Simple Zebra configuration file
-# $Id: zebra.cfg,v 1.9 2005-08-23 08:02:47 adam Exp $
+# $Id: zebra.cfg,v 1.10 2006-05-05 09:14:02 adam Exp $
 #
 # Where the schema files, attribute files, etc are located.
 profilePath: .:../../tab
@@ -20,4 +20,4 @@ recordId: (bib-1,title)
 
 modulePath: ../../recctrl/.libs
 #shadow: shadow:100M
-#register: register:100M
+# register: register:100M

diff --git a/include/idzebra/bfile.h b/include/idzebra/bfile.h
index 04b7703..91630d8 100644 (file)
--- a/include/idzebra/bfile.h
+++ b/include/idzebra/bfile.h
@@ -1,5 +1,5 @@
-/* $Id: bfile.h,v 1.6 2006-04-04 00:10:09 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: bfile.h,v 1.7 2006-05-05 09:14:02 adam Exp $
+   Copyright (C) 1995-2006
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -48,6 +48,7 @@ typedef struct BFile_struct *BFile;
 /** \brief creates a Block files collection
     \param spec register specification , e.g. "d1:100M d2:1G"
     \param base base directory for register spec (if that is relative path)
+    \return block files handle
 */
 BFiles bfs_create (const char *spec, const char *base);
 
@@ -69,6 +70,8 @@ int bf_close (BFile bf);
     \param bf extended block file opened with bf_xopen
     \param version version to be put in a file
     \param more_info more information to be stored in file (header)
+    \retval 0 succes
+    \retval -1 failure (can never happen as the code is now)
 */    
 YAZ_EXPORT
 int bf_xclose (BFile bf, int version, const char *more_info);
@@ -78,6 +81,8 @@ int bf_xclose (BFile bf, int version, const char *more_info);
     \param name filename
     \param block_size block size in bytes
     \param wflag 1=opened for read&write, 0=read only
+    \retval 0 succes
+    \retval -1 failure (can never happen as the code is now)
 */
 YAZ_EXPORT
 BFile bf_open (BFiles bfs, const char *name, int block_size, int wflag);
@@ -102,21 +107,22 @@ BFile bf_xopen(BFiles bfs, const char *name, int block_size, int wflag,
     \param offset offset within block to be read
     \param nbytes number of bytes to read (0 for whole block)
     \param buf raw bytes with content (at least nbytes of size)
-    
-    Returns 1 if whole block could be read; 0 otherwise.
+    \retval 1 whole block could be read
+    \retval 0 whole block could not be read
  */
 YAZ_EXPORT
 int bf_read (BFile bf, zint no, int offset, int nbytes, void *buf);
 
-/** \brief writes bytes to file
+/** \brief writes block of bytes to file
     \param bf block file handle
     \param no block no
     \param offset within block
     \param nbytes number of bytes to write
     \param buf buffer to write
+    \retval 0 succes (block could be written)
 
-    Writes the content of buffer to a block within a block file (or
-    whole block). Returns 1 if successful; 0 otherwise.
+    This function can not return a failure. System calls exit(1)
+    if write failed.
  */
 YAZ_EXPORT
 int bf_write (BFile bf, zint no, int offset, int nbytes, const void *buf);
@@ -124,14 +130,16 @@ int bf_write (BFile bf, zint no, int offset, int nbytes, const void *buf);
 /** \brief enables or disables shadow for block files
     \param bfs block files
     \param spec  such as  "shadow:100M /other:200M"; or NULL to disable
+    \retval ZEBRA_OK successful. spec is OK
+    \retval ZEBRA_FAIL failure.
 */
 YAZ_EXPORT
 ZEBRA_RES bf_cache (BFiles bfs, const char *spec);
 
 /** \brief Check if there is content in shadow area (to be committed).
     \param bfs block files
-    
-    Returns 1 if there is content in shadow area; 0 otherwise.
+    \retval 1 there is content in shadow area
+    \retval 0 no content in shadow area
 */
 YAZ_EXPORT
 int bf_commitExists (BFiles bfs);
@@ -171,6 +179,42 @@ int bf_alloc(BFile bf, int no, zint *blocks);
 YAZ_EXPORT
 int bf_free(BFile bf, int no, const zint *blocks);
 
+
+/* \brief gets statistics about directory in register area
+   \param bfs block files
+   \param no directory number (0=first, 1=second,...)
+   \param directory holds directory name (if found)
+   \param used_bytes used file bytes in directory (if found)
+   \param max_bytes max usage of bytes (if found)
+   \retval 1 no is within range and directory, used, max are set.
+   \retval 0 no is out of range and directory, used, max are unset
+
+   We are using double, because off_t may have a different size
+   on same platform depending on whether 64-bit is enabled or not.
+   Note that if a register area has unlimited size, that is represented
+   as max_bytes = -1.
+
+*/ 
+int bfs_register_directory_stat(BFiles bfs, int no, const char **directory,
+                               double *used_bytes, double *max_bytes);
+
+/* \brief gets statistics about directory in shadow area
+   \param bfs block files
+   \param no directory number (0=first, 1=second,...)
+   \param directory holds directory name (if found)
+   \param used_bytes used file bytes in directory (if found)
+   \param max_bytes max usage of bytes (if found)
+   \retval 1 no is within range and directory, used, max are set.
+   \retval 0 no is out of range and directory, used, max are unset
+
+   We are using double, because off_t may have a different size
+   on same platform depending on whether 64-bit is enabled or not.
+   Note that if a shadow area has unlimited size, that is represented
+   as max_bytes = -1.
+*/ 
+int bfs_shadow_directory_stat(BFiles bfs, int no, const char **directory,
+                             double *used_bytes, double *max_bytes);
+
 YAZ_END_CDECL
 
 #endif

diff --git a/index/invstat.c b/index/invstat.c
index afa8b81..905e961 100644 (file)
--- a/index/invstat.c
+++ b/index/invstat.c
@@ -1,4 +1,4 @@
-/* $Id: invstat.c,v 1.48 2006-03-30 09:52:15 adam Exp $
+/* $Id: invstat.c,v 1.49 2006-05-05 09:14:03 adam Exp $
    Copyright (C) 1995-2005
    Index Data ApS
 
@@ -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;