dirpath-mrafs-additions-20010212
authorHartmut Reuter <reuter@rzg.mpg.de>
Mon, 12 Feb 2001 23:50:21 +0000 (23:50 +0000)
committerDerrick Brashear <shadow@dementia.org>
Mon, 12 Feb 2001 23:50:21 +0000 (23:50 +0000)
Dirpath additions for MR-AFS files

====================
This delta was composed from multiple commits as part of the CVS->Git migration.
The checkin message with each commit was inconsistent.
The following are the additional commit messages.
====================
Dirpath additions for MR-AFS files; remove extra newline

src/util/dirpath.c
src/util/dirpath.h

index ac4d39b..78613df 100644 (file)
@@ -188,6 +188,12 @@ static void initDirPathArray(void)
   pathp = dirPathArray[AFSDIR_SERVER_BACKUP_DIRPATH_ID];
   AFSDIR_SERVER_DIRPATH(pathp, AFSDIR_BACKUP_DIR);
 
+  pathp = dirPathArray[AFSDIR_SERVER_MIGRATE_DIRPATH_ID];
+  AFSDIR_SERVER_DIRPATH(pathp, AFSDIR_MIGR_DIR);
+
+  pathp = dirPathArray[AFSDIR_SERVER_BIN_FILE_DIRPATH_ID];
+  AFSDIR_SERVER_DIRPATH(pathp, AFSDIR_BIN_FILE_DIR);
+
   /* client dir path */
 
 #ifdef AFS_NT40_ENV
@@ -311,6 +317,15 @@ static void initDirPathArray(void)
   pathp = dirPathArray[AFSDIR_SERVER_NETRESTRICT_FILEPATH_ID];
   AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_LOCAL_DIR, AFSDIR_NETRESTRICT_FILE);
 
+  pathp = dirPathArray[AFSDIR_SERVER_WEIGHTING_CONSTANTS_FILEPATH_ID];
+  AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_MIGR_DIR, AFSDIR_WEIGHTINGCONST_FILE);
+
+  pathp = dirPathArray[AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH_ID];
+  AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_MIGR_DIR, AFSDIR_THRESHOLDCONST_FILE);
+
+  pathp = dirPathArray[AFSDIR_SERVER_MIGRATELOG_FILEPATH_ID];
+  AFSDIR_SERVER_FILEPATH(pathp, AFSDIR_MIGR_DIR, AFSDIR_MIGRATE_LOGNAME);
 
   /* client file paths */
 
index e21c0a6..7829abd 100644 (file)
@@ -101,6 +101,8 @@ ConstructLocalLogPath(const char *cpath,
 #define AFSDIR_LOGS_DIR  "logs"
 #define AFSDIR_LOCAL_DIR "local"
 #define AFSDIR_BACKUP_DIR "backup"
+#define AFSDIR_MIGR_DIR  "local/migrate"
+#define AFSDIR_BIN_FILE_DIR  "local/migrate/bin_files"
 
 /* file names */ 
 #define AFSDIR_THISCELL_FILE    "ThisCell"
@@ -138,12 +140,16 @@ ConstructLocalLogPath(const char *cpath,
 #define AFSDIR_OLDSYSID_FILE    "sysid.old"
 #define AFSDIR_SYSID_FILE       "sysid"
 #define AFSDIR_FILELOG_FILE     "FileLog"
+#define AFSDIR_MIGRATE_LOGNAME  "wtlog."
 
 #define AFSDIR_CELLSERVDB_FILE_NTCLIENT  "afsdcell.ini"
 
 #define AFSDIR_NETINFO_FILE     "NetInfo"
 #define AFSDIR_NETRESTRICT_FILE "NetRestrict"
 
+#define AFSDIR_LOCALRESIDENCY_FILE "LocalResidency"
+#define AFSDIR_WEIGHTINGCONST_FILE "Weight.LocalConstants"
+#define AFSDIR_THRESHOLDCONST_FILE "Thershold.LocalConstants"
 
 /* -------------- Canonical (wire-format) path macros -------------- */
 
@@ -164,6 +170,10 @@ AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/" AFSDIR_ETC_DIR
 #define AFSDIR_CANONICAL_SERVER_LOGS_DIRPATH \
 AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/" AFSDIR_LOGS_DIR
 
+#define AFSDIR_CANONICAL_SERVER_LOCAL_DIRPATH \
+AFSDIR_CANONICAL_SERVER_AFS_DIRPATH "/" AFSDIR_LOCAL_DIR
+
+
 #define AFSDIR_CANONICAL_SERVER_SALVAGER_FILEPATH \
 AFSDIR_CANONICAL_SERVER_BIN_DIRPATH "/" AFSDIR_SALVAGER_FILE
 
@@ -210,6 +220,7 @@ typedef enum afsdir_id {
       AFSDIR_SERVER_SLVGLOG_FILEPATH_ID,
       AFSDIR_SERVER_SALVAGER_FILEPATH_ID,
       AFSDIR_SERVER_BOZCONF_FILEPATH_ID,
+      AFSDIR_SERVER_BOZCONFNEW_FILEPATH_ID,
       AFSDIR_SERVER_BOZINIT_FILEPATH_ID,
       AFSDIR_SERVER_BOZLOG_FILEPATH_ID,
       AFSDIR_SERVER_BOSVR_FILEPATH_ID,
@@ -229,7 +240,11 @@ typedef enum afsdir_id {
       AFSDIR_CLIENT_NETRESTRICT_FILEPATH_ID,
       AFSDIR_SERVER_NETINFO_FILEPATH_ID,
       AFSDIR_SERVER_NETRESTRICT_FILEPATH_ID,
-      AFSDIR_SERVER_BOZCONFNEW_FILEPATH_ID,
+      AFSDIR_SERVER_WEIGHTING_CONSTANTS_FILEPATH_ID,
+      AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH_ID,
+      AFSDIR_SERVER_MIGRATE_DIRPATH_ID,
+      AFSDIR_SERVER_MIGRATELOG_FILEPATH_ID,
+      AFSDIR_SERVER_BIN_FILE_DIRPATH_ID,
       AFSDIR_PATHSTRING_MAX } afsdir_id_t;
 
 /* getDirPath() returns a pointer to a string from an internal array of path strings 
@@ -248,10 +263,14 @@ const char *getDirPath(afsdir_id_t string_id);
 #define AFSDIR_SERVER_LOGS_DIRPATH getDirPath(AFSDIR_SERVER_LOGS_DIRPATH_ID)
 #define AFSDIR_SERVER_LOCAL_DIRPATH getDirPath(AFSDIR_SERVER_LOCAL_DIRPATH_ID)
 #define AFSDIR_SERVER_BACKUP_DIRPATH getDirPath(AFSDIR_SERVER_BACKUP_DIRPATH_ID)
+#define AFSDIR_SERVER_LOCAL_DIRPATH getDirPath(AFSDIR_SERVER_LOCAL_DIRPATH_ID)
+#define AFSDIR_SERVER_MIGRATE_DIRPATH getDirPath(AFSDIR_SERVER_MIGRATE_DIRPATH_ID)
+#define AFSDIR_SERVER_MIGRATE_DIRPATH getDirPath(AFSDIR_SERVER_MIGRATE_DIRPATH_ID)
 
 /* client subdir paths */
 #define AFSDIR_CLIENT_VICE_DIRPATH getDirPath(AFSDIR_CLIENT_VICE_DIRPATH_ID)
 #define AFSDIR_CLIENT_ETC_DIRPATH getDirPath(AFSDIR_CLIENT_ETC_DIRPATH_ID)
+#define AFSDIR_SERVER_BIN_FILE_DIRPATH getDirPath(AFSDIR_SERVER_BIN_FILE_DIRPATH_ID)
 
 /* server file paths */
 #define AFSDIR_SERVER_THISCELL_FILEPATH getDirPath(AFSDIR_SERVER_THISCELL_FILEPATH_ID)
@@ -290,6 +309,9 @@ const char *getDirPath(afsdir_id_t string_id);
 #define AFSDIR_SERVER_AUDIT_FILEPATH getDirPath(AFSDIR_SERVER_AUDIT_FILEPATH_ID)
 #define AFSDIR_SERVER_NETINFO_FILEPATH getDirPath(AFSDIR_SERVER_NETINFO_FILEPATH_ID)
 #define AFSDIR_SERVER_NETRESTRICT_FILEPATH getDirPath(AFSDIR_SERVER_NETRESTRICT_FILEPATH_ID)
+#define AFSDIR_SERVER_WEIGHTING_CONSTANTS_FILEPATH getDirPath(AFSDIR_SERVER_WEIGHTING_CONSTANTS_FILEPATH_ID)
+#define AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH getDirPath(AFSDIR_SERVER_THRESHOLD_CONSTANTS_FILEPATH_ID)
+#define AFSDIR_SERVER_MIGRATELOG_FILEPATH getDirPath(AFSDIR_SERVER_MIGRATELOG_FILEPATH_ID)
 
 /* client file paths */
 #define AFSDIR_CLIENT_THISCELL_FILEPATH getDirPath(AFSDIR_CLIENT_THISCELL_FILEPATH_ID)