Convert buserver to libutil's logging

[openafs.git] / src / budb / globals.h

diff --git a/src/budb/globals.h b/src/budb/globals.h
index 944ba00..b98def3 100644 (file)
--- a/src/budb/globals.h
+++ b/src/budb/globals.h
@@ -1,11 +1,18 @@
- /* Copyright (C) 1998 Transarc Corporation - All rights reserved 
-  */
-/* ------------------
+/*
+ * Copyright 2000, International Business Machines Corporation and others.
+ * All Rights Reserved.
+ *
+ * This software has been released under the terms of the IBM Public
+ * License.  For details, see the LICENSE file in the top-level source
+ * directory or online at http://www.openafs.org/dl/license10.html
+ */
+
+/*
  * global configuration information for the database server
  * ------------------
  */
 
-#define        DEFAULT_DBPREFIX "bdb"                          /* db name prefix */
+#define        DEFAULT_DBPREFIX "bdb"  /* db name prefix */
 
 /* debug and test flags */
 
@@ -14,64 +21,61 @@
 #define        DF_SMALLHT              0x4     /* use small hash tables */
 #define        DF_TRUNCATEDB           0x8     /* truncate database on startup */
 
-extern int debugging;                  /* for controlling debug output */
+extern int debugging;          /* for controlling debug output */
 
-struct buServerConfS
-{
+struct buServerConfS {
     /* global configuration */
-    char *databaseDirectory;           /* where database is placed */
-    char *databaseName;                        /* database file name */
-    char *databaseExtension;           /* extension (depends on ubik) */
+    char *databaseDirectory;   /* where database is placed */
+    char *databaseName;                /* database file name */
+    char *databaseExtension;   /* extension (depends on ubik) */
 
-    /* error logging */
-    FILE *log;                         /* log file for status/errors */
-    
     /* ubik and comm. related */
-    afs_int32 myHost;
-    afs_int32 serverList[MAXSERVERS];  /* list of ubik servers */
-    char *cellConfigdir;               /* afs cell config. directory */
-    struct ubik_dbase  *database;      /* handle for the database */
+    afs_uint32 myHost;
+    afs_uint32 serverList[MAXSERVERS]; /* list of ubik servers */
+    char *cellConfigdir;       /* afs cell config. directory */
+    struct ubik_dbase *database;       /* handle for the database */
 
     /* debug and test */
-    afs_uint32 debugFlags;
+    afs_uint32 debugFlags;
 };
 
-typedef        struct buServerConfS    buServerConfT;
-typedef        buServerConfT           *buServerConfP;
+typedef struct buServerConfS buServerConfT;
+typedef buServerConfT *buServerConfP;
 
-extern buServerConfP   globalConfPtr;
+extern buServerConfP globalConfPtr;
 
 /* for synchronizing the threads dumping the database */
 
-#define        DS_WAITING      1               /* reader/writer sleeping */
-#define        DS_DONE         2               /* finished */
-#define        DS_DONE_ERROR   4               /* finished with errors */
+#define        DS_WAITING      1       /* reader/writer sleeping */
+#define        DS_DONE         2       /* finished */
+#define        DS_DONE_ERROR   4       /* finished with errors */
 
-#define        DUMP_TTL_INC    300             /* secs. before dump times out */
+#define        DUMP_TTL_INC    300     /* secs. before dump times out */
 
 #include <time.h>
 
-struct dumpSyncS
-{
-    struct Lock        ds_lock;                /* for this struct. */
-    afs_int32  statusFlags;            /* 0, or 1 for dump in progress */
-    int                pipeFid[2];             /* pipe between threads */
-    char       ds_writerStatus;
-    char       ds_readerStatus;
-
-    PROCESS    dumperPid;              /* pid of dumper lwp */
-    struct ubik_trans *ut;             /* dump db transaction */
-    afs_int32  ds_bytes;               /* no. of bytes buffered */
-    time_t     timeToLive;             /* time. After this, kill the dump */
+struct dumpSyncS {
+    struct Lock ds_lock;       /* for this struct. */
+    afs_int32 statusFlags;     /* 0, or 1 for dump in progress */
+    int pipeFid[2];            /* pipe between threads */
+#ifdef AFS_PTHREAD_ENV
+    pthread_mutex_t ds_writerStatus_mutex;
+    pthread_mutex_t ds_readerStatus_mutex;
+    pthread_cond_t ds_writerStatus_cond;
+    pthread_cond_t ds_readerStatus_cond;
+    pthread_t dumperPid;
+#else
+    PROCESS dumperPid;         /* pid of dumper lwp */
+#endif
+    char ds_writerStatus;
+    char ds_readerStatus;
+
+    struct ubik_trans *ut;     /* dump db transaction */
+    afs_int32 ds_bytes;                /* no. of bytes buffered */
+    time_t timeToLive;         /* time. After this, kill the dump */
 };
 
-typedef        struct dumpSyncS        dumpSyncT;
-typedef        dumpSyncT               *dumpSyncP;
-
-extern dumpSyncP       dumpSyncPtr;    /* defined in dbs_dump.c */
-    
-
-
-
-
+typedef struct dumpSyncS dumpSyncT;
+typedef dumpSyncT *dumpSyncP;
 
+extern dumpSyncP dumpSyncPtr;  /* defined in dbs_dump.c */