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 fbca64b..b98def3 100644 (file)
--- a/src/budb/globals.h
+++ b/src/budb/globals.h
@@ -1,7 +1,7 @@
 /*
  * 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
@@ -29,12 +29,9 @@ struct buServerConfS {
     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 */
+    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 */
 
@@ -61,10 +58,18 @@ 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;
 
-    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 */