From c8dfa0e6c341d32bdd85684d0a056db1be2807c0 Mon Sep 17 00:00:00 2001 From: David Howells Date: Wed, 25 Sep 2019 16:31:40 +0100 Subject: [PATCH] xg: Reindent the xg files Reindent the xg files to use tabs. Signed-off-by: David Howells --- rpc-api/afsuuid.h | 12 +-- rpc-api/bos.xg | 42 ++++---- rpc-api/cb.xg | 56 +++++------ rpc-api/common.h | 160 +++++++++++++++---------------- rpc-api/ka.xg | 38 ++++---- rpc-api/pts.xg | 162 +++++++++++++++---------------- rpc-api/ubik.xg | 72 +++++++------- rpc-api/vldb.xg | 208 ++++++++++++++++++++-------------------- rpc-api/volumeserver.xg | 202 +++++++++++++++++++------------------- 9 files changed, 476 insertions(+), 476 deletions(-) diff --git a/rpc-api/afsuuid.h b/rpc-api/afsuuid.h index c007e33..a1e207d 100644 --- a/rpc-api/afsuuid.h +++ b/rpc-api/afsuuid.h @@ -39,12 +39,12 @@ #endif struct afsUUID { - uint32_t time_low; - uint16_t time_mid; - uint16_t time_hi_and_version; - uint8_t clock_seq_hi_and_reserved; - uint8_t clock_seq_low; - char node[6]; + uint32_t time_low; + uint16_t time_mid; + uint16_t time_hi_and_version; + uint8_t clock_seq_hi_and_reserved; + uint8_t clock_seq_low; + char node[6]; } AFSUUID_GENERATE; %#endif /* _AFSUUID_COMMON_ */ diff --git a/rpc-api/bos.xg b/rpc-api/bos.xg index 6ee6210..2ba9085 100644 --- a/rpc-api/bos.xg +++ b/rpc-api/bos.xg @@ -88,35 +88,35 @@ const BOZO_RESTARTTIME_GENERAL = 0x1; /* general reboot time */ const BOZO_RESTARTTIME_NEWBIN = 0x2; /* new binary */ struct bozo_status { - uint32_t goal; - uint32_t fileGoal; - uint32_t porcStartTime; - uint32_t procStarts; - uint32_t lastAnyExit; - uint32_t lastErrorExit; - uint32_t errorCode; - uint32_t errorSignal; - uint32_t flags; - uint32_t spare[8]; + uint32_t goal; + uint32_t fileGoal; + uint32_t porcStartTime; + uint32_t procStarts; + uint32_t lastAnyExit; + uint32_t lastErrorExit; + uint32_t errorCode; + uint32_t errorSignal; + uint32_t flags; + uint32_t spare[8]; }; struct bozo_netKTime { - uint32_t mask; - uint16_t hour; - uint16_t min; - uint16_t sec; - uint16_t day; + uint32_t mask; + uint16_t hour; + uint16_t min; + uint16_t sec; + uint16_t day; }; struct bozo_key { - uint8_t data[8]; + uint8_t data[8]; }; struct bozo_keyInfo { - uint32_t mod_sec; - uint32_t mod_usec; - uint32_t keyCheckSum; - uint32_t spare2; + uint32_t mod_sec; + uint32_t mod_usec; + uint32_t keyCheckSum; + uint32_t spare2; }; @@ -132,7 +132,7 @@ CreateBnode (IN string type, DeleteBnode (IN string instance) = 81; SetStatus (IN string instance, - IN uint32_t status) = 82; + IN uint32_t status) = 82; GetStatus (IN string instance, diff --git a/rpc-api/cb.xg b/rpc-api/cb.xg index 034ae06..5fb0eba 100644 --- a/rpc-api/cb.xg +++ b/rpc-api/cb.xg @@ -40,35 +40,35 @@ package RXAFSCB_ #include "common.h" struct AFSDBLockDesc { - uint8_t waitStates; - uint8_t exclLocked; - uint16_t readersReading; - uint16_t numWaiting; - uint16_t spare; - int32_t pid_last_reader; - int32_t pid_writer; - int32_t src_indicator; + uint8_t waitStates; + uint8_t exclLocked; + uint16_t readersReading; + uint16_t numWaiting; + uint16_t spare; + int32_t pid_last_reader; + int32_t pid_writer; + int32_t src_indicator; }; struct AFSDBLock { - char name[16]; - struct AFSDBLockDesc lock; + char name[16]; + struct AFSDBLockDesc lock; }; struct AFSDBCacheEntry { - int32_t addr; - int32_t cell; /*Cell part of the fid*/ - AFSFid netFid; /*Network part of the fid*/ - int32_t Length; - int32_t DataVersion; - struct AFSDBLockDesc lock; - int32_t callback; - int32_t cbExpires; - uint16_t refCount; - uint16_t opens; - uint16_t writers; - uint8_t mvstat; - uint8_t states; + int32_t addr; + int32_t cell; /*Cell part of the fid*/ + AFSFid netFid; /*Network part of the fid*/ + int32_t Length; + int32_t DataVersion; + struct AFSDBLockDesc lock; + int32_t callback; + int32_t cbExpires; + uint16_t refCount; + uint16_t opens; + uint16_t writers; + uint8_t mvstat; + uint8_t states; }; const AFSCB_MAX_XSTAT_LONGS = 2048; @@ -79,11 +79,11 @@ const AFSCB_XSTATSCOLL_FULL_PERF_INFO = 2; /*CM performance info*/ const AFS_MAX_INTERFACE_ADDR = 32; struct interfaceAddr { /* for multihomed clients */ - int32_t numberOfInterfaces; - afsUUID uuid; - ASIS uint32_t addr_in[AFS_MAX_INTERFACE_ADDR]; /* interface addresses */ - ASIS uint32_t subnetmask[AFS_MAX_INTERFACE_ADDR]; /* subnet masks in net ord */ - int32_t mtu[AFS_MAX_INTERFACE_ADDR]; /* MTU */ + int32_t numberOfInterfaces; + afsUUID uuid; + ASIS uint32_t addr_in[AFS_MAX_INTERFACE_ADDR]; /* interface addresses */ + ASIS uint32_t subnetmask[AFS_MAX_INTERFACE_ADDR]; /* subnet masks in net ord */ + int32_t mtu[AFS_MAX_INTERFACE_ADDR]; /* MTU */ }; const AFSMAXCELLHOSTS = 8; /*Max VLDB servers per cell*/ diff --git a/rpc-api/common.h b/rpc-api/common.h index 9a21e2a..78edb99 100644 --- a/rpc-api/common.h +++ b/rpc-api/common.h @@ -48,20 +48,20 @@ const ROVOL = 1; const BACKVOL = 2; struct AFSFid { - uint32_t Volume; - uint32_t Vnode; - uint32_t Unique; + uint32_t Volume; + uint32_t Vnode; + uint32_t Unique; }; struct VenusFid { - int32_t Cell; - AFSFid fid; + int32_t Cell; + AFSFid fid; }; struct AFSCallBack { - uint32_t CallBackVersion; - uint32_t ExpirationTime; - uint32_t CallBackType; + uint32_t CallBackVersion; + uint32_t ExpirationTime; + uint32_t CallBackType; }; enum CallBackType { CBEXCLUSIVE = 1, CBSHARED = 2, CBDROPPED = 3}; @@ -69,12 +69,12 @@ enum CallBackType { CBEXCLUSIVE = 1, CBSHARED = 2, CBDROPPED = 3}; const CALLBACK_VERSION = 1; struct AFSVolSync { - uint32_t spare1; - uint32_t spare2; - uint32_t spare3; - uint32_t spare4; - uint32_t spare5; - uint32_t spare6; + uint32_t spare1; + uint32_t spare2; + uint32_t spare3; + uint32_t spare4; + uint32_t spare5; + uint32_t spare6; }; const TYPE_FILE = 1; @@ -82,27 +82,27 @@ const TYPE_DIR = 2; const TYPE_LINK = 3; struct AFSFetchStatus { - uint32_t InterfaceVersion; - uint32_t FileType; - uint32_t LinkCount; - uint32_t Length; - uint32_t DataVersion; - uint32_t Author; - uint32_t Owner; - uint32_t CallerAccess; - uint32_t AnonymousAccess; - uint32_t UnixModeBits; - uint32_t ParentVnode; - uint32_t ParentUnique; - uint32_t ResidencyMask; - uint32_t ClientModTime; - uint32_t ServerModTime; - uint32_t Group; - uint32_t SyncCounter; - uint32_t DataVersionHigh; /* For AFS/DFS translator */ - uint32_t LockCount; - uint32_t LengthHigh; - uint32_t ErrorCode; + uint32_t InterfaceVersion; + uint32_t FileType; + uint32_t LinkCount; + uint32_t Length; + uint32_t DataVersion; + uint32_t Author; + uint32_t Owner; + uint32_t CallerAccess; + uint32_t AnonymousAccess; + uint32_t UnixModeBits; + uint32_t ParentVnode; + uint32_t ParentUnique; + uint32_t ResidencyMask; + uint32_t ClientModTime; + uint32_t ServerModTime; + uint32_t Group; + uint32_t SyncCounter; + uint32_t DataVersionHigh; /* For AFS/DFS translator */ + uint32_t LockCount; + uint32_t LengthHigh; + uint32_t ErrorCode; }; /* @@ -118,33 +118,33 @@ const SS_FSYNC = 0x400; /* 1024 */ struct AFSStoreStatus { - uint32_t Mask; - uint32_t ClientModTime; - uint32_t Owner; - uint32_t Group; - uint32_t UnixModeBits; - uint32_t SegSize; + uint32_t Mask; + uint32_t ClientModTime; + uint32_t Owner; + uint32_t Group; + uint32_t UnixModeBits; + uint32_t SegSize; }; struct AFSFetchVolumeStatus { - int32_t Vid; - int32_t ParentId; - uint8_t Online; - uint8_t InService; - uint8_t Blessed; - uint8_t NeedsSalvage; - int32_t Type; - int32_t MinQuota; - int32_t MaxQuota; - int32_t BlocksInUse; - int32_t PartBlocksAvail; - int32_t PartMaxBlocks; + int32_t Vid; + int32_t ParentId; + uint8_t Online; + uint8_t InService; + uint8_t Blessed; + uint8_t NeedsSalvage; + int32_t Type; + int32_t MinQuota; + int32_t MaxQuota; + int32_t BlocksInUse; + int32_t PartBlocksAvail; + int32_t PartMaxBlocks; }; struct AFSStoreVolumeStatus { - int32_t Mask; - int32_t MinQuota; - int32_t MaxQuota; + int32_t Mask; + int32_t MinQuota; + int32_t MaxQuota; }; const AFS_SETMINQUOTA = 1; @@ -173,30 +173,30 @@ const PRSFS_LOCK = 32 ; /* Read-lock files */ const PRSFS_ADMINISTER = 64 ; /* Set access list of directory */ struct AFSVolumeInfo { - uint32_t Vid; - int32_t Type; - uint32_t Type0; - uint32_t Type1; - uint32_t Type2; - uint32_t Type3; - uint32_t Type4; - uint32_t ServerCount; - uint32_t Server0; - uint32_t Server1; - uint32_t Server2; - uint32_t Server3; - uint32_t Server4; - uint32_t Server5; - uint32_t Server6; - uint32_t Server7; - uint16_t Port0; - uint16_t Port1; - uint16_t Port2; - uint16_t Port3; - uint16_t Port4; - uint16_t Port5; - uint16_t Port6; - uint16_t Port7; + uint32_t Vid; + int32_t Type; + uint32_t Type0; + uint32_t Type1; + uint32_t Type2; + uint32_t Type3; + uint32_t Type4; + uint32_t ServerCount; + uint32_t Server0; + uint32_t Server1; + uint32_t Server2; + uint32_t Server3; + uint32_t Server4; + uint32_t Server5; + uint32_t Server6; + uint32_t Server7; + uint16_t Port0; + uint16_t Port1; + uint16_t Port2; + uint16_t Port3; + uint16_t Port4; + uint16_t Port5; + uint16_t Port6; + uint16_t Port7; }; #include "afsuuid.h" diff --git a/rpc-api/ka.xg b/rpc-api/ka.xg index 903352b..aa7e59d 100644 --- a/rpc-api/ka.xg +++ b/rpc-api/ka.xg @@ -128,16 +128,16 @@ const KALOCKED = 180522; struct ka_CBS { - opaque Seq<>; + opaque Seq<>; }; struct ka_BBS { - int32_t MaxSeqLen; - opaque Seq<>; + int32_t MaxSeqLen; + opaque Seq<>; }; struct EncryptionKey { - uint8_t key[8]; + uint8_t key[8]; }; const MAXKANAMELEN = 64; @@ -151,24 +151,24 @@ const MAXKTCTICKETLEN = 344; typedef string kaname; struct kaident { - char name[MAXKANAMELEN]; - char instance[MAXKANAMELEN]; + char name[MAXKANAMELEN]; + char instance[MAXKANAMELEN]; }; struct kaentryinfo { - int32_t minor_version; - int32_t flags; - uint32_t user_expiration; - Date modification_time; - kaident modification_user; - Date change_password_time; - uint32_t max_ticket_lifetime; - uint32_t key_version; - EncryptionKey key; - uint32_t keyCheckSym; - int32_t reserved2; - int32_t reserved3; - int32_t reserved4; + int32_t minor_version; + int32_t flags; + uint32_t user_expiration; + Date modification_time; + kaident modification_user; + Date change_password_time; + uint32_t max_ticket_lifetime; + uint32_t key_version; + EncryptionKey key; + uint32_t keyCheckSym; + int32_t reserved2; + int32_t reserved3; + int32_t reserved4; }; diff --git a/rpc-api/pts.xg b/rpc-api/pts.xg index 10c3fbd..4283d99 100644 --- a/rpc-api/pts.xg +++ b/rpc-api/pts.xg @@ -116,102 +116,102 @@ const PR_REMEMBER_TIMES = 1; struct prheader { - uint32_t version; - uint32_t headerSize; - uint32_t freePtr; - uint32_t eofPtr; - uint32_t maxGroup; - uint32_t maxID; - uint32_t maxForeign; - uint32_t maxInst; - uint32_t orphan; - uint32_t usercount; - uint32_t groupcount; - uint32_t foreigncount; - uint32_t instcount; - uint32_t reserved[5]; - uint32_t nameHash[HASHSIZE]; - uint32_t idHash[HASHSIZE]; + uint32_t version; + uint32_t headerSize; + uint32_t freePtr; + uint32_t eofPtr; + uint32_t maxGroup; + uint32_t maxID; + uint32_t maxForeign; + uint32_t maxInst; + uint32_t orphan; + uint32_t usercount; + uint32_t groupcount; + uint32_t foreigncount; + uint32_t instcount; + uint32_t reserved[5]; + uint32_t nameHash[HASHSIZE]; + uint32_t idHash[HASHSIZE]; }; struct prheader_disk { - uint32_t version; - uint32_t headerSize; - uint32_t maxGroup; - uint32_t maxID; - uint32_t orphan<>; - uint32_t usercount; - uint32_t groupcount; + uint32_t version; + uint32_t headerSize; + uint32_t maxGroup; + uint32_t maxID; + uint32_t orphan<>; + uint32_t usercount; + uint32_t groupcount; }; struct prentry { - uint32_t flags; - uint32_t id; - uint32_t cellid; - uint32_t next; - uint32_t reserved[5]; - uint32_t entries[PRSIZE]; - uint32_t nextID; - uint32_t nextName; - uint32_t owner; - uint32_t creator; - uint32_t ngroups; - uint32_t nusers; - uint32_t count; - uint32_t instance; - uint32_t owned; - uint32_t nextOwned; - uint32_t parent; - uint32_t sibling; - uint32_t child; - char name[PR_MAXNAMELEN]; + uint32_t flags; + uint32_t id; + uint32_t cellid; + uint32_t next; + uint32_t reserved[5]; + uint32_t entries[PRSIZE]; + uint32_t nextID; + uint32_t nextName; + uint32_t owner; + uint32_t creator; + uint32_t ngroups; + uint32_t nusers; + uint32_t count; + uint32_t instance; + uint32_t owned; + uint32_t nextOwned; + uint32_t parent; + uint32_t sibling; + uint32_t child; + char name[PR_MAXNAMELEN]; }; struct prentry_disk { - uint32_t flags; - uint32_t id; - uint32_t cellid; - uint32_t owner; - uint32_t creator; - uint32_t ngroups; - uint32_t owned; - string name; - uint32_t entries; + uint32_t flags; + uint32_t id; + uint32_t cellid; + uint32_t owner; + uint32_t creator; + uint32_t ngroups; + uint32_t owned; + string name; + uint32_t entries; }; struct prdebugentry { - uint32_t flags; - uint32_t id; - uint32_t cellid; - uint32_t next; - uint32_t reserved[5]; - uint32_t entries[PRSIZE]; - uint32_t nextID; - uint32_t nextname; - uint32_t owner; - uint32_t creator; - uint32_t ngroups; - uint32_t nusers; - uint32_t count; - uint32_t instance; - uint32_t owned; - uint32_t nextOwned; - uint32_t parent; - uint32_t sibling; - uint32_t child; - char name[PR_MAXNAMELEN]; + uint32_t flags; + uint32_t id; + uint32_t cellid; + uint32_t next; + uint32_t reserved[5]; + uint32_t entries[PRSIZE]; + uint32_t nextID; + uint32_t nextname; + uint32_t owner; + uint32_t creator; + uint32_t ngroups; + uint32_t nusers; + uint32_t count; + uint32_t instance; + uint32_t owned; + uint32_t nextOwned; + uint32_t parent; + uint32_t sibling; + uint32_t child; + char name[PR_MAXNAMELEN]; }; struct prcheckentry { - uint32_t flags; - uint32_t id; - uint32_t owner; - uint32_t creator; - uint32_t ngroups; - uint32_t nusers; - uint32_t count; - uint32_t reserved[5]; - char name[PR_MAXNAMELEN]; + uint32_t flags; + uint32_t id; + uint32_t owner; + uint32_t creator; + uint32_t ngroups; + uint32_t nusers; + uint32_t count; + uint32_t reserved[5]; + char name[PR_MAXNAMELEN]; }; diff --git a/rpc-api/ubik.xg b/rpc-api/ubik.xg index 2b6baf5..72baa17 100644 --- a/rpc-api/ubik.xg +++ b/rpc-api/ubik.xg @@ -36,8 +36,8 @@ package Ubik_ struct net_tid { - uint32_t epoch; - uint32_t counter; + uint32_t epoch; + uint32_t counter; }; const UBIK_MAX_INTERFACE_ADDR = 256; /* max interfaces per server */ @@ -45,43 +45,43 @@ const UBIK_MAX_INTERFACE_ADDR = 256; /* max interfaces per server */ typedef net_tid net_version; struct ubik_debug { - uint32_t now; - uint32_t lastYesTime; - uint32_t lastYesHost; - uint32_t lastYesState; - uint32_t lastYesClaim; - uint32_t lowestHost; - uint32_t lowestTime; - uint32_t syncHost; - uint32_t syncTime; - net_version syncVersion; - net_tid syncTid; - uint32_t amSyncSite; - uint32_t syncSiteUntil; - uint32_t nServers; - uint32_t lockedPages; - uint32_t writeLockedPages; - net_version localVersion; - uint32_t activeWrite; - uint32_t tidCounter; - uint32_t anyReadLocks; - uint32_t anyWriteLocks; - uint32_t recoveryState; - uint32_t currentTrans; - uint32_t writeTrans; - uint32_t epochTime; + uint32_t now; + uint32_t lastYesTime; + uint32_t lastYesHost; + uint32_t lastYesState; + uint32_t lastYesClaim; + uint32_t lowestHost; + uint32_t lowestTime; + uint32_t syncHost; + uint32_t syncTime; + net_version syncVersion; + net_tid syncTid; + uint32_t amSyncSite; + uint32_t syncSiteUntil; + uint32_t nServers; + uint32_t lockedPages; + uint32_t writeLockedPages; + net_version localVersion; + uint32_t activeWrite; + uint32_t tidCounter; + uint32_t anyReadLocks; + uint32_t anyWriteLocks; + uint32_t recoveryState; + uint32_t currentTrans; + uint32_t writeTrans; + uint32_t epochTime; }; struct ubik_sdebug { - uint32_t addr; - uint32_t lastVoteTime; - uint32_t lastBeaconSent; - uint32_t lastVote; - net_version remoteVersion; - uint32_t currentDB; - uint32_t beaconSinceDown; - uint32_t up; - uint32_t altAddr[255]; /*alternate addresses:host byte */ + uint32_t addr; + uint32_t lastVoteTime; + uint32_t lastBeaconSent; + uint32_t lastVote; + net_version remoteVersion; + uint32_t currentDB; + uint32_t beaconSinceDown; + uint32_t up; + uint32_t altAddr[255]; /*alternate addresses:host byte */ /*this is actually UBIK_MAX_INTERFACE_ADDR-1*/ }; diff --git a/rpc-api/vldb.xg b/rpc-api/vldb.xg index 7803e28..db2fe90 100644 --- a/rpc-api/vldb.xg +++ b/rpc-api/vldb.xg @@ -89,7 +89,7 @@ const VLOP_DUMP = 0x100; %#define VLOP_ALLOPERS ( VLOP_MOVE | VLOP_RELEASE | VLOP_BACKUP | VLOP_DELETE | VLOP_DUMP) -/* Location information */ + /* Location information */ const VLF_RWEXISTS = 0x1000; const VLF_ROEXISTS = 0x2000; const VLF_BOEXISTS = 0x4000; @@ -175,46 +175,46 @@ const LOCKREL_OPCODE = 2; const LOCKREL_AFSID = 4; struct vldbentry { - char name[VLDB_MAXNAMELEN]; - uint32_t volumeType; /* currrent unused */ - uint32_t nServers; - uint32_t serverNumber[MAXNSERVERS]; - uint32_t serverPartition[MAXNSERVERS]; - uint32_t serverFlags[MAXNSERVERS]; - uint32_t volumeId[MAXTYPES]; - uint32_t cloneId; - uint32_t flags; + char name[VLDB_MAXNAMELEN]; + uint32_t volumeType; /* currrent unused */ + uint32_t nServers; + uint32_t serverNumber[MAXNSERVERS]; + uint32_t serverPartition[MAXNSERVERS]; + uint32_t serverFlags[MAXNSERVERS]; + uint32_t volumeId[MAXTYPES]; + uint32_t cloneId; + uint32_t flags; }; struct nvldbentry { - char name[VLDB_MAXNAMELEN]; - uint32_t nServers; - uint32_t serverNumber[NMAXNSERVERS]; - uint32_t serverPartition[NMAXNSERVERS]; - uint32_t serverFlags[NMAXNSERVERS]; - uint32_t volumeId[MAXTYPES]; - uint32_t cloneId; - uint32_t flags; - uint32_t matchindex; - uint32_t spares2; - uint32_t spares3; - uint32_t spares4; - uint32_t spares5; - uint32_t spares6; - uint32_t spares7; - uint32_t spares8; - uint32_t spares9; + char name[VLDB_MAXNAMELEN]; + uint32_t nServers; + uint32_t serverNumber[NMAXNSERVERS]; + uint32_t serverPartition[NMAXNSERVERS]; + uint32_t serverFlags[NMAXNSERVERS]; + uint32_t volumeId[MAXTYPES]; + uint32_t cloneId; + uint32_t flags; + uint32_t matchindex; + uint32_t spares2; + uint32_t spares3; + uint32_t spares4; + uint32_t spares5; + uint32_t spares6; + uint32_t spares7; + uint32_t spares8; + uint32_t spares9; }; struct vital_vlheader { - uint32_t vldbversion; - uint32_t headersize; - uint32_t freePtr; - uint32_t eofPtr; - uint32_t allocs; - uint32_t frees; - uint32_t MaxVolumeId; - uint32_t totalEntries[MAXTYPES]; + uint32_t vldbversion; + uint32_t headersize; + uint32_t freePtr; + uint32_t eofPtr; + uint32_t allocs; + uint32_t frees; + uint32_t MaxVolumeId; + uint32_t totalEntries[MAXTYPES]; }; @@ -234,20 +234,20 @@ const VLUPDATE_REPS_MODPART = 0x800; const VLUPDATE_REPS_MODFLAG = 0x1000; struct VldbUpdateEntry { - uint32_t Mask; - char name[VLDB_MAXNAMELEN]; - uint32_t volumeType; - uint32_t flags; - uint32_t ReadOnlyId; - uint32_t BackupId; - uint32_t cloneid; - uint32_t nModifiedRepsites; - uint32_t RepsitesMask[MAXNSERVERS]; - uint32_t RepsitesTargetServer[MAXNSERVERS]; - uint32_t RepsitesTargetPart[MAXNSERVERS]; - uint32_t RepsitesNewServer[MAXNSERVERS]; - uint32_t RepsitesNewPart[MAXNSERVERS]; - uint32_t RepsitesNewFlags[MAXNSERVERS]; + uint32_t Mask; + char name[VLDB_MAXNAMELEN]; + uint32_t volumeType; + uint32_t flags; + uint32_t ReadOnlyId; + uint32_t BackupId; + uint32_t cloneid; + uint32_t nModifiedRepsites; + uint32_t RepsitesMask[MAXNSERVERS]; + uint32_t RepsitesTargetServer[MAXNSERVERS]; + uint32_t RepsitesTargetPart[MAXNSERVERS]; + uint32_t RepsitesNewServer[MAXNSERVERS]; + uint32_t RepsitesNewPart[MAXNSERVERS]; + uint32_t RepsitesNewFlags[MAXNSERVERS]; }; /* bit mask for VldbListByAttributes.Mask */ @@ -258,52 +258,52 @@ const VLLIST_VOLUMEID = 0x8; const VLLIST_FLAG = 0x10; struct VldbListByAttributes { - uint32_t Mask; - uint32_t server; - uint32_t partition; - uint32_t volumetype; /* depricated */ - uint32_t volumeid; - uint32_t flag; + uint32_t Mask; + uint32_t server; + uint32_t partition; + uint32_t volumetype; /* depricated */ + uint32_t volumeid; + uint32_t flag; }; struct uvldbentry { - char name[VLDB_MAXNAMELEN]; - uint32_t nServers; - afsUUID serverNumber[NMAXNSERVERS]; - uint32_t serverUnique[NMAXNSERVERS]; - uint32_t serverPartition[NMAXNSERVERS]; - uint32_t serverFlags[NMAXNSERVERS]; - uint32_t volumeId[MAXTYPES]; - uint32_t cloneId; - uint32_t flags; - uint32_t spares1; - uint32_t spares2; - uint32_t spares3; - uint32_t spares4; - uint32_t spares5; - uint32_t spares6; - uint32_t spares7; - uint32_t spares8; - uint32_t spares9; + char name[VLDB_MAXNAMELEN]; + uint32_t nServers; + afsUUID serverNumber[NMAXNSERVERS]; + uint32_t serverUnique[NMAXNSERVERS]; + uint32_t serverPartition[NMAXNSERVERS]; + uint32_t serverFlags[NMAXNSERVERS]; + uint32_t volumeId[MAXTYPES]; + uint32_t cloneId; + uint32_t flags; + uint32_t spares1; + uint32_t spares2; + uint32_t spares3; + uint32_t spares4; + uint32_t spares5; + uint32_t spares6; + uint32_t spares7; + uint32_t spares8; + uint32_t spares9; }; #if 0 struct single_vldbentry { - vldbentry VldbEntry; - vldblist next_vldb; + vldbentry VldbEntry; + vldblist next_vldb; }; struct vldb_list { - vldblist node; + vldblist node; }; #endif struct vldstats { - uint32_t start_time; - uint32_t requests[MAX_NUMBER_OPCODES]; - uint32_t aborts[MAX_NUMBER_OPCODES]; - uint32_t reserved[5]; + uint32_t start_time; + uint32_t requests[MAX_NUMBER_OPCODES]; + uint32_t aborts[MAX_NUMBER_OPCODES]; + uint32_t reserved[5]; }; const VL_MAX_BULK_ADDRS = 1024 ; @@ -324,18 +324,18 @@ const VLADDR_INDEX = 0x2; const VLADDR_UUID = 0x4; struct ListAddrByAttributes { - int32_t Mask; - uint32_t ipaddr; - int32_t index; - int32_t spare; - afsUUID uuid; + int32_t Mask; + uint32_t ipaddr; + int32_t index; + int32_t spare; + afsUUID uuid; }; struct VL_Callback { - uint32_t version; - uint32_t expiration_time; - uint32_t time; - uint32_t handle; + uint32_t version; + uint32_t expiration_time; + uint32_t time; + uint32_t handle; }; /* @@ -414,9 +414,9 @@ GetEntryByNameN (IN string volumename, OUT nvldbentry *entry) = VLGETENTRYBYNAMEN; ReplaceEntryN (IN uint32_t Volid, - IN uint32_t voltype, - IN nvldbentry *newentry, - IN uint32_t ReleaseType) = VLREPLACEENTRYN; + IN uint32_t voltype, + IN nvldbentry *newentry, + IN uint32_t ReleaseType) = VLREPLACEENTRYN; ListEntryN(IN uint32_t previous_index, OUT uint32_t *count, @@ -424,16 +424,16 @@ ListEntryN(IN uint32_t previous_index, OUT nvldbentry *entry) = VLLISTENTRYN; ListAttributesN (IN VldbListByAttributes *attributes, - OUT uint32_t *nentries, - OUT nbulkentries *blkentries) = VLLISTATTRIBUTESN; + OUT uint32_t *nentries, + OUT nbulkentries *blkentries) = VLLISTATTRIBUTESN; #if 0 LinkedListN() = 523; #endif UpdateEntryByName (IN string volname, - IN VldbUpdateEntry *UpdateEntry, - IN uint32_t ReleaseType) = VLUPDATEENTRYBYNAME; + IN VldbUpdateEntry *UpdateEntry, + IN uint32_t ReleaseType) = VLUPDATEENTRYBYNAME; #if 0 CreateEntryU(IN uvldbentry *newentry) = VLCREATEENTRYU; @@ -448,8 +448,8 @@ ReplaceEntryU() = VLREPLACEENTRYU; ListEntryU() = VLLISTENTRYU; ListAttributesU (IN VldbListByAttributes *attributes, - OUT uint32_t *nentries, - OUT ubulkentries *blkentries) = VLLISTATTRIBUTESU; + OUT uint32_t *nentries, + OUT ubulkentries *blkentries) = VLLISTATTRIBUTESU; LinkedListU() = VLLINKEDLISTU; #endif @@ -483,9 +483,9 @@ const VL_LISTATTRUUID_MAXATTR = 64; const VL_LISTATTRUUID_MAXATTRSIZE = 512; struct VL_ListAddrUUID { - uint32_t type; - uint32_t error; - opaque data; + uint32_t type; + uint32_t error; + opaque data; }; typedef VL_ListAddrUUID VL_ListAddrUUIDs<>; @@ -494,13 +494,13 @@ const VL_UUID_data_INVALID = 1; const VL_UUID_data_IPV6 = 1; struct VL_UUID_data { - opaque ipv6_addr<128>; - int32_t ipv6_mtu; + opaque ipv6_addr<128>; + int32_t ipv6_mtu; }; const VL_UUID_data_GSSAPI_name = 2; struct VL_UUID_data_gss_name { - opaque gss_name<>; + opaque gss_name<>; }; /* diff --git a/rpc-api/volumeserver.xg b/rpc-api/volumeserver.xg index f49482b..1686235 100644 --- a/rpc-api/volumeserver.xg +++ b/rpc-api/volumeserver.xg @@ -118,94 +118,94 @@ const VTOutOfService = 2; const VTDeleted = 4; struct volDescription { - char volName[VOLSER_MAXVOLNAME]; - uint32_t volId; - uint32_t volSize; - uint32_t volFlags; - uint32_t volCloneId; + char volName[VOLSER_MAXVOLNAME]; + uint32_t volId; + uint32_t volSize; + uint32_t volFlags; + uint32_t volCloneId; }; struct partList { - int32_t partId[26]; - uint32_t partFlags[26]; + int32_t partId[26]; + uint32_t partFlags[26]; }; struct volser_status { - uint32_t volID; - uint32_t nextUnique; - uint32_t type; - uint32_t parentID; - uint32_t cloneID; - uint32_t backupID; - uint32_t restoredFromID; - uint32_t maxQuota; - uint32_t minQuota; - uint32_t owner; - uint32_t creationDate; - uint32_t accessDate; - uint32_t updateDate; - uint32_t exprirationDate; - uint32_t backupDate; - uint32_t copyDate; + uint32_t volID; + uint32_t nextUnique; + uint32_t type; + uint32_t parentID; + uint32_t cloneID; + uint32_t backupID; + uint32_t restoredFromID; + uint32_t maxQuota; + uint32_t minQuota; + uint32_t owner; + uint32_t creationDate; + uint32_t accessDate; + uint32_t updateDate; + uint32_t exprirationDate; + uint32_t backupDate; + uint32_t copyDate; }; struct destServer { - uint32_t destHost; - uint32_t destPort; - uint32_t destSSID; /* currently allways set to 1 */ + uint32_t destHost; + uint32_t destPort; + uint32_t destSSID; /* currently allways set to 1 */ }; struct volintInfo { - char name[VNAMESIZE]; - uint32_t volid; - uint32_t type; - uint32_t backupID; - uint32_t parentID; - uint32_t cloneID; - uint32_t status; - uint32_t copyDate; - uint8_t inUse; - uint8_t needsSalvaged; - uint8_t destroyMe; - uint32_t creationDate; - uint32_t accessDate; - uint32_t updateDate; - uint32_t backupDate; - uint32_t dayUse; - uint32_t filecount; - uint32_t maxquota; - uint32_t size; - uint32_t flags; - uint32_t spare0; - uint32_t spare1; - uint32_t spare2; - uint32_t spare3; + char name[VNAMESIZE]; + uint32_t volid; + uint32_t type; + uint32_t backupID; + uint32_t parentID; + uint32_t cloneID; + uint32_t status; + uint32_t copyDate; + uint8_t inUse; + uint8_t needsSalvaged; + uint8_t destroyMe; + uint32_t creationDate; + uint32_t accessDate; + uint32_t updateDate; + uint32_t backupDate; + uint32_t dayUse; + uint32_t filecount; + uint32_t maxquota; + uint32_t size; + uint32_t flags; + uint32_t spare0; + uint32_t spare1; + uint32_t spare2; + uint32_t spare3; }; struct xvolintInfo { - char name[VNAMESIZE]; - uint32_t volid; - uint32_t type; - uint32_t backupID; - uint32_t parentID; - uint32_t cloneID; - uint32_t status; - uint32_t copyDate; - uint8_t inUse; - uint32_t creationDate; - uint32_t accessDate; - uint32_t updateDate; - uint32_t backupDate; - uint32_t dayUse; - uint32_t filecount; - uint32_t maxquota; - uint32_t size; - int32_t stat_reads[4]; - int32_t stat_writes[4]; - int32_t stat_fileSameAuthor[6]; - int32_t stat_fileDiffAuthor[6]; - int32_t stat_dirSameAuthor[6]; - int32_t stat_dirDiffAuthor[6]; + char name[VNAMESIZE]; + uint32_t volid; + uint32_t type; + uint32_t backupID; + uint32_t parentID; + uint32_t cloneID; + uint32_t status; + uint32_t copyDate; + uint8_t inUse; + uint32_t creationDate; + uint32_t accessDate; + uint32_t updateDate; + uint32_t backupDate; + uint32_t dayUse; + uint32_t filecount; + uint32_t maxquota; + uint32_t size; + int32_t stat_reads[4]; + int32_t stat_writes[4]; + int32_t stat_fileSameAuthor[6]; + int32_t stat_fileDiffAuthor[6]; + int32_t stat_dirSameAuthor[6]; + int32_t stat_dirDiffAuthor[6]; }; /* @@ -223,41 +223,41 @@ struct xvolintInfo { */ struct transDebugInfo { - uint32_t tid; - uint32_t time; - uint32_t creationTime; - uint32_t returnCode; - uint32_t volid; - uint32_t partition; - uint16_t iflags; - uint8_t vflags; - uint8_t tflags; - char lastProcName[30]; - uint32_t callValid; - uint32_t readNext; - uint32_t transmitNext; - uint32_t lastSendTime; - uint32_t lastReceiveTime; + uint32_t tid; + uint32_t time; + uint32_t creationTime; + uint32_t returnCode; + uint32_t volid; + uint32_t partition; + uint16_t iflags; + uint8_t vflags; + uint8_t tflags; + char lastProcName[30]; + uint32_t callValid; + uint32_t readNext; + uint32_t transmitNext; + uint32_t lastSendTime; + uint32_t lastReceiveTime; }; struct pIDs { - uint32_t partIds[26]; /* -1 if none */ + uint32_t partIds[26]; /* -1 if none */ }; struct diskPartition { - char name[32]; - char devName[32]; - uint32_t lock_fd; - uint32_t totalUsable; - uint32_t free; - uint32_t minFree; + char name[32]; + char devName[32]; + uint32_t lock_fd; + uint32_t totalUsable; + uint32_t free; + uint32_t minFree; }; struct restoreCookie { - char name[32]; - uint32_t type; - uint32_t clone; - uint32_t parent; + char name[32]; + uint32_t type; + uint32_t clone; + uint32_t parent; }; typedef transDebugInfo transDebugEntries<>; @@ -267,8 +267,8 @@ typedef int32_t part_entries<>; typedef int32_t multi_results<>; struct replica { - int32_t trans_id; - struct destServer destserver; + int32_t trans_id; + struct destServer destserver; }; #define AFS_MAX_DESTINATIONS 255 -- 2.49.0