vlserver: Allow reading during ubik writes

[openafs.git] / src / vlserver / vlserver.c

diff --git a/src/vlserver/vlserver.c b/src/vlserver/vlserver.c
index 4173479..67bad77 100644 (file)
--- a/src/vlserver/vlserver.c
+++ b/src/vlserver/vlserver.c
@@ -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
@@ -59,7 +59,8 @@ int lwps = 9;
 
 struct vldstats dynamic_statistics;
 struct ubik_dbase *VL_dbase;
-afs_uint32 HostAddress[MAXSERVERID + 1];
+afs_uint32 rd_HostAddress[MAXSERVERID + 1];
+afs_uint32 wr_HostAddress[MAXSERVERID + 1];
 
 static void *CheckSignal(void*);
 int LogLevel = 0;
@@ -86,21 +87,21 @@ CheckSignal_Signal(int unused)
 static void *
 CheckSignal(void *unused)
 {
-    register int i, errorcode;
-    struct ubik_trans *trans;
+    int i, errorcode;
+    struct vl_ctx ctx;
 
     if ((errorcode =
-       Init_VLdbase(&trans, LOCKREAD, VLGETSTATS - VL_LOWEST_OPCODE)))
+       Init_VLdbase(&ctx, LOCKREAD, VLGETSTATS - VL_LOWEST_OPCODE)))
        return (void *)(intptr_t)errorcode;
     VLog(0, ("Dump name hash table out\n"));
     for (i = 0; i < HASHSIZE; i++) {
-       HashNDump(trans, i);
+       HashNDump(&ctx, i);
     }
     VLog(0, ("Dump id hash table out\n"));
     for (i = 0; i < HASHSIZE; i++) {
-       HashIdDump(trans, i);
+       HashIdDump(&ctx, i);
     }
-    return ((void *)(intptr_t)ubik_EndTrans(trans));
+    return ((void *)(intptr_t)ubik_EndTrans(ctx.trans));
 }                              /*CheckSignal */
 
 
@@ -131,7 +132,7 @@ vldb_rxstat_userok(struct rx_call *call)
 int
 main(int argc, char **argv)
 {
-    register afs_int32 code;
+    afs_int32 code;
     afs_uint32 myHost;
     struct rx_service *tservice;
     struct rx_securityClass **securityClasses;
@@ -148,8 +149,8 @@ main(int argc, char **argv)
 
 #ifdef AFS_AIX32_ENV
     /*
-     * The following signal action for AIX is necessary so that in case of a 
-     * crash (i.e. core is generated) we can include the user's data section 
+     * The following signal action for AIX is necessary so that in case of a
+     * crash (i.e. core is generated) we can include the user's data section
      * in the core dump. Unfortunately, by default, only a partial core is
      * generated which, in many cases, isn't too useful.
      */
@@ -177,8 +178,8 @@ main(int argc, char **argv)
            }
        } else if (strcmp(argv[index], "-d") == 0) {
            if ((index + 1) >= argc) {
-               fprintf(stderr, "missing argument for -d\n"); 
-               return -1; 
+               fprintf(stderr, "missing argument for -d\n");
+               return -1;
            }
            debuglevel = atoi(argv[++index]);
            LogLevel = debuglevel;
@@ -192,14 +193,14 @@ main(int argc, char **argv)
            rxkadDisableDotCheck = 1;
        } else if (!strcmp(argv[index], "-rxmaxmtu")) {
            if ((index + 1) >= argc) {
-               fprintf(stderr, "missing argument for -rxmaxmtu\n"); 
-               return -1; 
+               fprintf(stderr, "missing argument for -rxmaxmtu\n");
+               return -1;
            }
            rxMaxMTU = atoi(argv[++index]);
-           if ((rxMaxMTU < RX_MIN_PACKET_SIZE) || 
+           if ((rxMaxMTU < RX_MIN_PACKET_SIZE) ||
                (rxMaxMTU > RX_MAX_PACKET_DATA_SIZE)) {
                printf("rxMaxMTU %d invalid; must be between %d-%" AFS_SIZET_FMT "\n",
-                      rxMaxMTU, RX_MIN_PACKET_SIZE, 
+                      rxMaxMTU, RX_MIN_PACKET_SIZE,
                       RX_MAX_PACKET_DATA_SIZE);
                return -1;
            }
@@ -323,15 +324,15 @@ main(int argc, char **argv)
     if (rxBind) {
        afs_int32 ccode;
 #ifndef AFS_NT40_ENV
-        if (AFSDIR_SERVER_NETRESTRICT_FILEPATH || 
+        if (AFSDIR_SERVER_NETRESTRICT_FILEPATH ||
             AFSDIR_SERVER_NETINFO_FILEPATH) {
             char reason[1024];
             ccode = parseNetFiles(SHostAddrs, NULL, NULL,
                                  ADDRSPERSITE, reason,
                                  AFSDIR_SERVER_NETINFO_FILEPATH,
                                  AFSDIR_SERVER_NETRESTRICT_FILEPATH);
-        } else 
-#endif 
+        } else
+#endif
        {
             ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);
         }
@@ -348,6 +349,7 @@ main(int argc, char **argv)
     ubik_SRXSecurityRock = (char *)tdir;
     ubik_CheckRXSecurityProc = afsconf_CheckAuth;
     ubik_CheckRXSecurityRock = (char *)tdir;
+    ubik_SyncWriterCacheProc = vlsynccache;
     code =
        ubik_ServerInitByInfo(myHost, htons(AFSCONF_VLDBPORT), &info, clones,
                              vl_dbaseName, &VL_dbase);
@@ -363,7 +365,8 @@ main(int argc, char **argv)
     }
     rx_SetRxDeadTime(50);
 
-    memset(HostAddress, 0, sizeof(HostAddress));
+    memset(rd_HostAddress, 0, sizeof(rd_HostAddress));
+    memset(wr_HostAddress, 0, sizeof(wr_HostAddress));
     initialize_dstats();
 
     afsconf_BuildServerSecurityObjects(tdir, 0, &securityClasses, &numClasses);