From: David Howells Date: Fri, 10 Jan 2014 00:39:44 +0000 (+0000) Subject: xg: All integer types should be in terms of stdint X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4cf051dafc9b5d862146facda988409f64e99c27;p=users%2Fdhowells%2Fkafs-utils.git xg: All integer types should be in terms of stdint All integer types should be in terms of stdint: int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t Long should not be used as it may be 32-bits or 64-bits. Signed-off-by: David Howells --- diff --git a/rpc-api/afsuuid.h b/rpc-api/afsuuid.h index 1d78fc8..c2fa476 100644 --- a/rpc-api/afsuuid.h +++ b/rpc-api/afsuuid.h @@ -39,11 +39,11 @@ #endif struct afsUUID { - u_long time_low; - u_short time_mid; - u_short time_hi_and_version; - char clock_seq_hi_and_reserved; - char clock_seq_low; + 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; diff --git a/rpc-api/bos.xg b/rpc-api/bos.xg index 179b788..a46f40c 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 { - long goal; - long fileGoal; - long porcStartTime; - long procStarts; - long lastAnyExit; - long lastErrorExit; - long errorCode; - long errorSignal; - long flags; - long 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 { - long mask; - short hour; - short min; - short sec; - short day; + uint32_t mask; + uint16_t hour; + uint16_t min; + uint16_t sec; + uint16_t day; }; struct bozo_key { - char data[8]; + uint8_t data[8]; }; struct bozo_keyInfo { - long mod_sec; - long mod_usec; - unsigned long keyCheckSum; - long spare2; + uint32_t mod_sec; + uint32_t mod_usec; + uint32_t keyCheckSum; + uint32_t spare2; }; @@ -132,15 +132,15 @@ CreateBnode (IN string type, DeleteBnode (IN string instance) = 81; SetStatus (IN string instance, - IN long status) = 82; + IN uint32_t status) = 82; GetStatus (IN string instance, - OUT long *inStat, + OUT uint32_t *inStat, OUT string statdescr) = 83; -EnumerateInstance (IN long instance, +EnumerateInstance (IN uint32_t instance, OUT string iname) = 84; GetInstanceInfo (IN string instance, @@ -148,31 +148,31 @@ GetInstanceInfo (IN string instance, OUT struct bozo_status *status) = 85; GetInstanceParm (IN string instance, - IN long num, + IN uint32_t num, OUT string parm) = 86; AddSUser (IN string name) = 87; DeleteSUser (IN string name) = 88; -ListSUsers (IN long an, +ListSUsers (IN uint32_t an, OUT string name) = 89; -ListKeys (IN long an, - OUT long *kvno, +ListKeys (IN uint32_t an, + OUT uint32_t *kvno, OUT struct bozo_key *key, OUT struct bozo_keyInfo *keinfo) = 90; -AddKey (IN long an, +AddKey (IN uint32_t an, IN struct bozo_key *key) = 91; -DeleteKey (IN long an) = 92; +DeleteKey (IN uint32_t an) = 92; SetCellName (IN string name) = 93; GetCellName (OUT string name) = 94; -GetCellHost (IN long awhich, +GetCellHost (IN uint32_t awhich, OUT string name) = 95; AddCellHost (IN string name) = 96; @@ -180,7 +180,7 @@ AddCellHost (IN string name) = 96; DeleteCellHost (IN string name) = 97; SetTStatus (IN string instance, - IN long status) = 98; + IN uint32_t status) = 98; ShutdownAll () = 99; @@ -188,35 +188,35 @@ RestartAll () = 100; StartupAll () = 101; -SetNoAuthFlag (IN long flag) = 102; +SetNoAuthFlag (IN uint32_t flag) = 102; ReBozo () = 103; Restart (IN string instance) = 104; Install (IN string path, - IN long size, - IN long flags, - IN long date) split = 105; + IN uint32_t size, + IN uint32_t flags, + IN uint32_t date) split = 105; UnInstall (IN string path) = 106; GetDates (IN string path, - OUT long *newtime, - OUT long *baktime, - OUT long *oldtime) = 107; + OUT uint32_t *newtime, + OUT uint32_t *baktime, + OUT uint32_t *oldtime) = 107; Exec (IN string cmd) = 108; -Prune (IN long flags) = 109; +Prune (IN uint32_t flags) = 109; -SetRestartTime (IN long type, +SetRestartTime (IN uint32_t type, IN struct bozo_netKTime *restartTime) = 110; -GetRestartTime (IN long type, +GetRestartTime (IN uint32_t type, OUT struct bozo_netKTime *restartTime) = 111; GetLog(IN string name) split = 112; diff --git a/rpc-api/cb.xg b/rpc-api/cb.xg index f965817..3c57ea2 100644 --- a/rpc-api/cb.xg +++ b/rpc-api/cb.xg @@ -40,14 +40,14 @@ package RXAFSCB_ #include "common.h" struct AFSDBLockDesc { - char waitStates; - char exclLocked; - short readersReading; - short numWaiting; - short spare; - int pid_last_reader; - int pid_writer; - int 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 { @@ -64,11 +64,11 @@ struct AFSDBCacheEntry { struct AFSDBLockDesc lock; int32_t callback; int32_t cbExpires; - short refCount; - short opens; - short writers; - char mvstat; - char states; + uint16_t refCount; + uint16_t opens; + uint16_t writers; + uint8_t mvstat; + uint8_t states; }; const AFSCB_MAX_XSTAT_LONGS = 2048; @@ -79,7 +79,7 @@ const AFSCB_XSTATSCOLL_FULL_PERF_INFO = 2; /*CM performance info*/ const AFS_MAX_INTERFACE_ADDR = 32; struct interfaceAddr { /* for multihomed clients */ - int numberOfInterfaces; + int32_t numberOfInterfaces; afsUUID uuid; ASIS int32_t addr_in[AFS_MAX_INTERFACE_ADDR]; /* interface addresses */ ASIS int32_t subnetmask[AFS_MAX_INTERFACE_ADDR]; /* subnet masks in net ord */ @@ -132,7 +132,7 @@ InitCallBackState3(IN afsUUID *serverUuid) = 213; ProbeUUID(IN afsUUID *uuid) = 214; -GetCellServDB(IN afs_int32 cellIndex, +GetCellServDB(IN uint32_t cellIndex, OUT string cellName, OUT serverList *cellHosts) = 216; diff --git a/rpc-api/common.h b/rpc-api/common.h index 6c163b9..439297b 100644 --- a/rpc-api/common.h +++ b/rpc-api/common.h @@ -129,10 +129,10 @@ struct AFSStoreStatus { struct AFSFetchVolumeStatus { int32_t Vid; int32_t ParentId; - char Online; - char InService; - char Blessed; - char NeedsSalvage; + uint8_t Online; + uint8_t InService; + uint8_t Blessed; + uint8_t NeedsSalvage; int32_t Type; int32_t MinQuota; int32_t MaxQuota; diff --git a/rpc-api/fs.xg b/rpc-api/fs.xg index 42f2bae..ca4ed9c 100644 --- a/rpc-api/fs.xg +++ b/rpc-api/fs.xg @@ -50,8 +50,8 @@ typedef int32_t IPAddrs; */ FetchData (IN AFSFid *a_fidToFetchP, - IN long a_offset, - IN long a_lenInBytes, + IN uint32_t a_offset, + IN uint32_t a_lenInBytes, OUT AFSFetchStatus *a_fidStatP, OUT AFSCallBack *a_callBackP, OUT AFSVolSync *a_volSyncP) split = 130; @@ -68,9 +68,9 @@ FetchStatus (IN AFSFid *a_fidToStatP, StoreData (IN AFSFid *a_fidToStoreP, IN AFSStoreStatus *a_fidStatusP, - IN long a_offset, - IN long a_lenInBytes, - IN long a_fileLenInBytes, + IN uint32_t a_offset, + IN uint32_t a_lenInBytes, + IN uint32_t a_fileLenInBytes, OUT AFSFetchStatus *a_fidStatP, OUT AFSVolSync *a_volSyncP) split = 133; @@ -147,13 +147,13 @@ GiveUpCallBacks (IN AFSCBFids *a_fidArrayP, * a_volNameP is not filled in. */ -GetVolumeStatus (IN long a_volIDP, +GetVolumeStatus (IN uint32_t a_volIDP, OUT AFSFetchVolumeStatus *a_volFetchStatP, OUT string a_volNameP, OUT string a_offLineMsgP, OUT string a_motdP) = 149; -SetVolumeStatus (IN long a_volIDP, +SetVolumeStatus (IN uint32_t a_volIDP, IN AFSStoreVolumeStatus *a_volStoreStatP, IN string a_volNameP, IN string a_offLineMsgP, @@ -161,8 +161,8 @@ SetVolumeStatus (IN long a_volIDP, GetRootVolume (OUT string a_rootVolNameP) = 151; -GetTime (OUT unsigned long *a_secondsP, - OUT unsigned long *a_uSecondsP) = 153; +GetTime (OUT uint32_t *a_secondsP, + OUT uint32_t *a_uSecondsP) = 153; NGetVolumeInfo (IN string VolumeName, OUT AFSVolumeInfo *stuff) = 154; diff --git a/rpc-api/ka.xg b/rpc-api/ka.xg index 32adf05..78c6de6 100644 --- a/rpc-api/ka.xg +++ b/rpc-api/ka.xg @@ -137,7 +137,7 @@ struct ka_BBS { }; struct EncryptionKey { - char key[8]; + uint8_t key[8]; }; const MAXKANAMELEN = 64; @@ -162,8 +162,8 @@ struct kaentryinfo { Date modification_time; kaident modification_user; Date change_password_time; - long max_ticket_lifetime; - long key_version; + uint32_t max_ticket_lifetime; + uint32_t key_version; EncryptionKey key; uint32_t keyCheckSym; int32_t reserved2; @@ -208,7 +208,7 @@ CreateUser (IN kaname name, GetEntry (IN kaname name, IN kaname instance, - IN long major_version, + IN uint32_t major_version, OUT kaentryinfo *entry) = 8; diff --git a/rpc-api/pts.xg b/rpc-api/pts.xg index 762f725..eb0d13c 100644 --- a/rpc-api/pts.xg +++ b/rpc-api/pts.xg @@ -116,101 +116,101 @@ const PR_REMEMBER_TIMES = 1; struct prheader { - long version; - long headerSize; - long freePtr; - long eofPtr; - long maxGroup; - long maxID; - long maxForeign; - long maxInst; - long orphan; - long usercount; - long groupcount; - long foreigncount; - long instcount; - long reserved[5]; - long nameHash[HASHSIZE]; - long 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 { - long version; - long headerSize; - long maxGroup; - long maxID; - long orphan<>; - long usercount; - long groupcount; + uint32_t version; + uint32_t headerSize; + uint32_t maxGroup; + uint32_t maxID; + uint32_t orphan<>; + uint32_t usercount; + uint32_t groupcount; }; struct prentry { - long flags; - long id; - long cellid; - long next; - long reserved[5]; - long entries[PRSIZE]; - long nextID; - long nextName; - long owner; - long creator; - long ngroups; - long nusers; - long count; - long instance; - long owned; - long nextOwned; - long parent; - long sibling; - long child; + 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 { - long flags; - long id; - long cellid; - long owner; - long creator; - long ngroups; - long owned; + uint32_t flags; + uint32_t id; + uint32_t cellid; + uint32_t owner; + uint32_t creator; + uint32_t ngroups; + uint32_t owned; string name; - long entries; + uint32_t entries; }; struct prdebugentry { - long flags; - long id; - long cellid; - long next; - long reserved[5]; - long entries[PRSIZE]; - long nextID; - long nextname; - long owner; - long creator; - long ngroups; - long nusers; - long count; - long instance; - long owned; - long nextOwned; - long parent; - long sibling; - long child; + 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 { - long flags; - long id; - long owner; - long creator; - long ngroups; - long nusers; - long count; - long reserved[5]; + 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]; }; @@ -219,9 +219,9 @@ typedef char prname[PR_MAXNAMELEN]; typedef prname namelist; -typedef long idlist; +typedef uint32_t idlist; -typedef long prlist; +typedef uint32_t prlist; /* Error codes */ @@ -250,32 +250,32 @@ IDToName(IN idlist *ilist, OUT namelist *nlist) = 505; NewEntry(IN string name, - IN long flag, - IN long oid, - OUT long *id) = 509; + IN uint32_t flag, + IN uint32_t oid, + OUT uint32_t *id) = 509; INewEntry(IN string name, - IN long id, - IN long oid) = 500; + IN uint32_t id, + IN uint32_t oid) = 500; -ListEntry(IN long id, +ListEntry(IN uint32_t id, OUT struct prcheckentry *entry) = 512; -DumpEntry(IN long pos, +DumpEntry(IN uint32_t pos, OUT struct prdebugentry *entry) = 502; -ChangeEntry(IN long id, +ChangeEntry(IN uint32_t id, IN string name, - IN long oid, - IN long newid) = 513; + IN uint32_t oid, + IN uint32_t newid) = 513; -SetFieldsEntry(IN long id, - IN long mask, - IN long flags, - IN long ngroups, - IN long nusers, - IN long spare1, - IN long spare2) = 516; +SetFieldsEntry(IN uint32_t id, + IN uint32_t mask, + IN uint32_t flags, + IN uint32_t ngroups, + IN uint32_t nusers, + IN uint32_t spare1, + IN uint32_t spare2) = 516; /* * Group/entries that can't be deleted: SYSADMINID, ANYUSERID, @@ -287,47 +287,47 @@ SetFieldsEntry(IN long id, * Sucess: PRSUCCESS. */ -Delete(IN long id) = 506; +Delete(IN uint32_t id) = 506; -WhereIsIt(IN long id, - OUT long *ps) = 501; +WhereIsIt(IN uint32_t id, + OUT uint32_t *ps) = 501; -AddToGroup(IN long uid, - IN long gid) = 503; +AddToGroup(IN uint32_t uid, + IN uint32_t gid) = 503; -RemoveFromGroup(IN long id, - IN long gid) = 507; +RemoveFromGroup(IN uint32_t id, + IN uint32_t gid) = 507; -ListMax(OUT long *uid, - OUT long *gid) = 510; +ListMax(OUT uint32_t *uid, + OUT uint32_t *gid) = 510; -SetMax(IN long uid, - IN long gflag) = 511; +SetMax(IN uint32_t uid, + IN uint32_t gflag) = 511; -ListElements(IN long id, +ListElements(IN uint32_t id, OUT prlist *elist, - OUT long *over) = 514; + OUT uint32_t *over) = 514; -GetCPS(IN long id, +GetCPS(IN uint32_t id, OUT prlist *elist, - OUT long *over) = 508; + OUT uint32_t *over) = 508; -ListOwned(IN long id, +ListOwned(IN uint32_t id, OUT prlist *elist, - INOUT long *over) = 517; + INOUT uint32_t *over) = 517; -IsAMemberOf(IN long uid, - IN long gid, - OUT long *flag) = 515; +IsAMemberOf(IN uint32_t uid, + IN uint32_t gid, + OUT uint32_t *flag) = 515; -GetCPS2(IN long id, - IN long host, +GetCPS2(IN uint32_t id, + IN uint32_t host, OUT prlist *elist, - OUT long *over) = 518; + OUT uint32_t *over) = 518; -GetHostCPS(IN long host, +GetHostCPS(IN uint32_t host, OUT prlist *elist, - OUT long *over) = 519; + OUT uint32_t *over) = 519; /* the end */ diff --git a/rpc-api/ubik.xg b/rpc-api/ubik.xg index a326045..4fef215 100644 --- a/rpc-api/ubik.xg +++ b/rpc-api/ubik.xg @@ -36,8 +36,8 @@ package Ubik_ struct net_tid { - long epoch; - long 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 { - long now; - long lastYesTime; - long lastYesHost; - long lastYesState; - long lastYesClaim; - long lowestHost; - long lowestTime; - long syncHost; - long syncTime; + 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; - long amSyncSite; - long syncSiteUntil; - long nServers; - long lockedPages; - long writeLockedPages; + uint32_t amSyncSite; + uint32_t syncSiteUntil; + uint32_t nServers; + uint32_t lockedPages; + uint32_t writeLockedPages; net_version localVersion; - long activeWrite; - long tidCounter; - long anyReadLocks; - long anyWriteLocks; - long recoveryState; - long currentTrans; - long writeTrans; - long epochTime; + 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 { - long addr; - long lastVoteTime; - long lastBeaconSent; - long lastVote; + uint32_t addr; + uint32_t lastVoteTime; + uint32_t lastBeaconSent; + uint32_t lastVote; net_version remoteVersion; - long currentDB; - long beaconSinceDown; - long up; - afs_int32 altAddr[255]; /*alternate addresses:host byte */ + 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*/ }; @@ -133,13 +133,13 @@ const UREINITIALIZE = 5411; /* The rpc calls */ -Beacon (IN long state, - IN long voteStart, +Beacon (IN uint32_t state, + IN uint32_t voteStart, IN net_version *Version, IN net_tid *tid) multi = VOTE_BEACON; Debug (OUT ubik_debug *db) = VOTE_DEBUG; -SDebug (IN long which, OUT ubik_sdebug *db) = VOTE_SDEBUG; +SDebug (IN uint32_t which, OUT ubik_sdebug *db) = VOTE_SDEBUG; -GetSyncSite (OUT long *site) = VOTE_GETSYNCSITE; +GetSyncSite (OUT uint32_t *site) = VOTE_GETSYNCSITE; diff --git a/rpc-api/vldb.xg b/rpc-api/vldb.xg index a51ba82..df3eeb8 100644 --- a/rpc-api/vldb.xg +++ b/rpc-api/vldb.xg @@ -176,45 +176,45 @@ const LOCKREL_AFSID = 4; struct vldbentry { char name[VLDB_MAXNAMELEN]; - long volumeType; /* currrent unused */ - long nServers; - long serverNumber[MAXNSERVERS]; - long serverPartition[MAXNSERVERS]; - long serverFlags[MAXNSERVERS]; - u_long volumeId[MAXTYPES]; - long cloneId; - long flags; + 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]; - long nServers; - long serverNumber[NMAXNSERVERS]; - long serverPartition[NMAXNSERVERS]; - long serverFlags[NMAXNSERVERS]; - u_long volumeId[MAXTYPES]; - long cloneId; - long flags; - long matchindex; - long spares2; - long spares3; - long spares4; - long spares5; - long spares6; - long spares7; - long spares8; - long spares9; + 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 { - long vldbversion; - long headersize; - long freePtr; - long eofPtr; - long allocs; - long frees; - long MaxVolumeId; - long 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 { - u_long Mask; + uint32_t Mask; char name[VLDB_MAXNAMELEN]; - long volumeType; - long flags; - u_long ReadOnlyId; - u_long BackupId; - long cloneid; - long nModifiedRepsites; - u_long RepsitesMask[MAXNSERVERS]; - long RepsitesTargetServer[MAXNSERVERS]; - long RepsitesTargetPart[MAXNSERVERS]; - long RepsitesNewServer[MAXNSERVERS]; - long RepsitesNewPart[MAXNSERVERS]; - long RepsitesNewFlags[MAXNSERVERS]; + 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,33 +258,33 @@ const VLLIST_VOLUMEID = 0x8; const VLLIST_FLAG = 0x10; struct VldbListByAttributes { - u_long Mask; - long server; - long partition; - long volumetype; /* depricated */ - long volumeid; - long 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]; - long nServers; + uint32_t nServers; afsUUID serverNumber[NMAXNSERVERS]; - long serverUnique[NMAXNSERVERS]; - long serverPartition[NMAXNSERVERS]; - long serverFlags[NMAXNSERVERS]; - u_long volumeId[MAXTYPES]; - long cloneId; - long flags; - long spares1; - long spares2; - long spares3; - long spares4; - long spares5; - long spares6; - long spares7; - long spares8; - long spares9; + 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; }; @@ -300,10 +300,10 @@ struct vldb_list { #endif struct vldstats { - unsigned long start_time; - long requests[MAX_NUMBER_OPCODES]; - long aborts[MAX_NUMBER_OPCODES]; - long 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 ; @@ -344,49 +344,49 @@ struct VL_Callback { CreateEntry (IN vldbentry *newentry) = VLCREATEENTRY; -DeleteEntry (IN long Volid, - IN long voltype) = VLDELETEENTRY; +DeleteEntry (IN uint32_t Volid, + IN uint32_t voltype) = VLDELETEENTRY; -GetEntryByID (IN long Volid, - IN long voltype, +GetEntryByID (IN uint32_t Volid, + IN uint32_t voltype, OUT vldbentry *entry) = VLGETENTRYBYID; GetEntryByName (IN string volumename, OUT vldbentry *entry) = VLGETENTRYBYNAME; -GetNewVolumeId (IN long bumpcount, - OUT long *newvolumid) = VLGETNEWVOLUMEID; +GetNewVolumeId (IN uint32_t bumpcount, + OUT uint32_t *newvolumid) = VLGETNEWVOLUMEID; -ReplaceEntry (IN long Volid, - IN long voltype, +ReplaceEntry (IN uint32_t Volid, + IN uint32_t voltype, IN vldbentry *newentry, - IN long ReleaseType) = VLREPLACEENTRY; + IN uint32_t ReleaseType) = VLREPLACEENTRY; -UpdateEntry (IN long Volid, - IN long voltype, +UpdateEntry (IN uint32_t Volid, + IN uint32_t voltype, IN VldbUpdateEntry *UpdateEntry, - IN long ReleaseType) = VLUPDATEENTRY; + IN uint32_t ReleaseType) = VLUPDATEENTRY; -SetLock (IN long Volid, - IN long voltype, - IN long voloper) = VLSETLOCK; +SetLock (IN uint32_t Volid, + IN uint32_t voltype, + IN uint32_t voloper) = VLSETLOCK; -ReleaseLock (IN long volid, - IN long voltype, - IN long ReleaseType) = VLRELEASELOCK; +ReleaseLock (IN uint32_t volid, + IN uint32_t voltype, + IN uint32_t ReleaseType) = VLRELEASELOCK; -ListEntry (IN long previous_index, - OUT long *count, - OUT long *next_index, +ListEntry (IN uint32_t previous_index, + OUT uint32_t *count, + OUT uint32_t *next_index, OUT vldbentry *entry) = VLLISTENTRY; ListAttributes (IN VldbListByAttributes *attributes, - OUT long *nentries, + OUT uint32_t *nentries, OUT bulkentries *blkentries) = VLLISTATTRIBUTES; #if 0 LinkedList (IN VldbListByAttributes *attributes, - OUT long *nentries, + OUT uint32_t *nentries, OUT vldb_list *linkedentries) = 512; #endif @@ -406,25 +406,25 @@ ChangeAddrs(IN int32_t old_ip, CreateEntryN(IN nvldbentry *newentry) = VLCREATEENTRYN; -GetEntryByIDN (IN long Volid, - IN long voltype, +GetEntryByIDN (IN uint32_t Volid, + IN uint32_t voltype, OUT nvldbentry *entry) = VLGETENTRYBYIDN; GetEntryByNameN (IN string volumename, OUT nvldbentry *entry) = VLGETENTRYBYNAMEN; -ReplaceEntryN (IN long Volid, - IN long voltype, +ReplaceEntryN (IN uint32_t Volid, + IN uint32_t voltype, IN nvldbentry *newentry, - IN long ReleaseType) = VLREPLACEENTRYN; + IN uint32_t ReleaseType) = VLREPLACEENTRYN; -ListEntryN(IN afs_int32 previous_index, - OUT afs_int32 *count, - OUT afs_int32 *next_index, +ListEntryN(IN uint32_t previous_index, + OUT uint32_t *count, + OUT uint32_t *next_index, OUT nvldbentry *entry) = VLLISTENTRYN; ListAttributesN (IN VldbListByAttributes *attributes, - OUT long *nentries, + OUT uint32_t *nentries, OUT nbulkentries *blkentries) = VLLISTATTRIBUTESN; #if 0 @@ -433,7 +433,7 @@ LinkedListN() = 523; UpdateEntryByName (IN string volname, IN VldbUpdateEntry *UpdateEntry, - IN long ReleaseType) = VLUPDATEENTRYBYNAME; + IN uint32_t ReleaseType) = VLUPDATEENTRYBYNAME; #if 0 CreateEntryU(IN uvldbentry *newentry) = VLCREATEENTRYU; @@ -448,7 +448,7 @@ ReplaceEntryU() = VLREPLACEENTRYU; ListEntryU() = VLLISTENTRYU; ListAttributesU (IN VldbListByAttributes *attributes, - OUT long *nentries, + OUT uint32_t *nentries, OUT ubulkentries *blkentries) = VLLISTATTRIBUTESU; LinkedListU() = VLLINKEDLISTU; @@ -456,8 +456,8 @@ LinkedListU() = VLLINKEDLISTU; GetAddrsU(IN ListAddrByAttributes *inaddr, OUT afsUUID *uuidp1, - OUT afs_int32 *uniquifier, - OUT afs_int32 *nentries, + OUT uint32_t *uniquifier, + OUT uint32_t *nentries, OUT bulkaddrs *blkaddrs) = VLGETADDRSU; @@ -468,10 +468,10 @@ RegisterAddrs(IN afsUUID *uid, ListAttributesN2(IN VldbListByAttributes *attributes, IN string volumename, - IN afs_int32 startindex, - OUT afs_int32 *nentries, + IN uint32_t startindex, + OUT uint32_t *nentries, OUT nbulkentries *blkentries, - OUT afs_int32 *nextstartindex) = VLLISTATTRIBUTESN2; + OUT uint32_t *nextstartindex) = VLLISTATTRIBUTESN2; #if 0 @@ -483,8 +483,8 @@ const VL_LISTATTRUUID_MAXATTR = 64; const VL_LISTATTRUUID_MAXATTRSIZE = 512; struct VL_ListAddrUUID { - afs_int32 type; - afs_int32 error; + uint32_t type; + uint32_t error; opaque data; }; @@ -495,7 +495,7 @@ const VL_UUID_data_INVALID = 1; const VL_UUID_data_IPV6 = 1; struct VL_UUID_data { opaque ipv6_addr<128>; - int ipv6_mtu; + int32_t ipv6_mtu; }; const VL_UUID_data_GSSAPI_name = 2; @@ -519,7 +519,7 @@ struct VL_UUID_data_gss_name { */ ListAttrUUID(IN afsUUID *uuid, - IN afs_int32 query, + IN uint32_t query, OUT VL_ListAddrUUIDs *reply) = 10001; #endif diff --git a/rpc-api/volumeserver.xg b/rpc-api/volumeserver.xg index 4dced90..356675b 100644 --- a/rpc-api/volumeserver.xg +++ b/rpc-api/volumeserver.xg @@ -119,87 +119,87 @@ const VTDeleted = 4; struct volDescription { char volName[VOLSER_MAXVOLNAME]; - long volId; - long volSize; - long volFlags; - long volCloneId; + uint32_t volId; + uint32_t volSize; + uint32_t volFlags; + uint32_t volCloneId; }; struct partList { - int partId[26]; - long partFlags[26]; + int32_t partId[26]; + uint32_t partFlags[26]; }; struct volser_status { - long volID; - long nextUnique; - long type; - long parentID; - long cloneID; - long backupID; - long restoredFromID; - long maxQuota; - long minQuota; - long owner; - long creationDate; - long accessDate; - long updateDate; - long exprirationDate; - long backupDate; - long 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 { - long destHost; - long destPort; - long 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]; - long volid; - long type; - long backupID; - long parentID; - long cloneID; - long status; - long copyDate; - char inUse; - char needsSalvaged; - char destroyMe; - long creationDate; - long accessDate; - long updateDate; - long backupDate; - long dayUse; - long filecount; - long maxquota; - long size; - long flags; - long spare0; - long spare1; - long spare2; - long spare3; + 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]; - long volid; - long type; - long backupID; - long parentID; - long cloneID; - long status; - long copyDate; - char inUse; - long creationDate; - long accessDate; - long updateDate; - long backupDate; - long dayUse; - long filecount; - long maxquota; - long size; + 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]; @@ -223,41 +223,41 @@ struct xvolintInfo { */ struct transDebugInfo { - long tid; - long time; - long creationTime; - long returnCode; - long volid; - long partition; - short iflags; - char vflags; - char tflags; + 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]; - long callValid; - long readNext; - long transmitNext; - long lastSendTime; - long lastReceiveTime; + uint32_t callValid; + uint32_t readNext; + uint32_t transmitNext; + uint32_t lastSendTime; + uint32_t lastReceiveTime; }; struct pIDs { - long partIds[26]; /* -1 if none */ + uint32_t partIds[26]; /* -1 if none */ }; struct diskPartition { char name[32]; char devName[32]; - long lock_fd; - long totalUsable; - long free; - long minFree; + uint32_t lock_fd; + uint32_t totalUsable; + uint32_t free; + uint32_t minFree; }; struct restoreCookie { char name[32]; - long type; - long clone; - long parent; + uint32_t type; + uint32_t clone; + uint32_t parent; }; typedef transDebugInfo transDebugEntries<>; @@ -275,106 +275,106 @@ struct replica { typedef replica manyDests; -AFSVolCreateVolume(IN long partition, +AFSVolCreateVolume(IN uint32_t partition, IN string name, - IN long type, - IN long parent, - INOUT long *volid, - OUT long *trans) = VOLCREATEVOLUME; + IN uint32_t type, + IN uint32_t parent, + INOUT uint32_t *volid, + OUT uint32_t *trans) = VOLCREATEVOLUME; -AFSVolDeleteVolume(IN long trans) = VOLDELETEVOLUME; +AFSVolDeleteVolume(IN uint32_t trans) = VOLDELETEVOLUME; -AFSVolNukeVolume(IN long partID, - IN long volID) = VOLNUKEVOLUME; +AFSVolNukeVolume(IN uint32_t partID, + IN uint32_t volID) = VOLNUKEVOLUME; -AFSVolDump(IN long fromTrans, - IN long fromDate) split = VOLDUMP; +AFSVolDump(IN uint32_t fromTrans, + IN uint32_t fromDate) split = VOLDUMP; AFSVolSignalRestore(IN string name<>, - IN int type, - IN long pid, - IN long cloneid) = VOLSIGNALRESTORE; + IN int32_t type, + IN uint32_t pid, + IN uint32_t cloneid) = VOLSIGNALRESTORE; -AFSVolRestore(IN long toTrans, - IN long flags, +AFSVolRestore(IN uint32_t toTrans, + IN uint32_t flags, IN restoreCookie *cookie) split = VOLRESTORE; AFSVolForward(IN int32_t fromTrans, IN int32_t fromData, IN struct destServer *destination, - IN long destTrans, + IN uint32_t destTrans, IN struct restoreCookie *cookie) = VOLFORWARD; -AFSVolClone(IN long trans, - IN long purgeVol, - IN long newType, +AFSVolClone(IN uint32_t trans, + IN uint32_t purgeVol, + IN uint32_t newType, IN string newName, - INOUT long *newVol) = VOLCLONE; + INOUT uint32_t *newVol) = VOLCLONE; -AFSVolReClone(IN long tid, - IN long cloneID) = VOLRECLONE; +AFSVolReClone(IN uint32_t tid, + IN uint32_t cloneID) = VOLRECLONE; -AFSVolSetForwarding(IN long tid, - IN long newsite) = VOLSETFORWARDING; +AFSVolSetForwarding(IN uint32_t tid, + IN uint32_t newsite) = VOLSETFORWARDING; -AFSVolTransCreate(IN long volume, - IN long partition, - IN long flags, - OUT long *trans) = VOLTRANSCREATE; +AFSVolTransCreate(IN uint32_t volume, + IN uint32_t partition, + IN uint32_t flags, + OUT uint32_t *trans) = VOLTRANSCREATE; -AFSVolEndTrans(IN long trans, - OUT long *rcode) = VOLENDTRANS; +AFSVolEndTrans(IN uint32_t trans, + OUT uint32_t *rcode) = VOLENDTRANS; -AFSVolGetFlags(IN long trans, - OUT long *flags) = VOLGETFLAGS; +AFSVolGetFlags(IN uint32_t trans, + OUT uint32_t *flags) = VOLGETFLAGS; -AFSVolSetFlags(IN long trans, - IN long flags) = VOLSETFLAGS; +AFSVolSetFlags(IN uint32_t trans, + IN uint32_t flags) = VOLSETFLAGS; -AFSVolGetName(IN long tid, +AFSVolGetName(IN uint32_t tid, OUT string tname<256>) = VOLGETNAME; -AFSVolGetStatus(IN long tid, +AFSVolGetStatus(IN uint32_t tid, OUT volser_status *status) = VOLGETSTATUS; -AFSVolSetIdsTypes(IN long tId, +AFSVolSetIdsTypes(IN uint32_t tId, IN string name<>, - IN long type, - IN long pId, - IN long cloneId, - IN long backupId) = VOLSETIDTYPES; + IN uint32_t type, + IN uint32_t pId, + IN uint32_t cloneId, + IN uint32_t backupId) = VOLSETIDTYPES; -AFSVolSetDate(IN long tid, - IN long newDate) = VOLSETDATE; +AFSVolSetDate(IN uint32_t tid, + IN uint32_t newDate) = VOLSETDATE; AFSVolListPartitions(OUT struct pIDs *partIDs) = VOLLISTPARTITIONS; AFSVolPartitionInfo(IN string name<>, OUT struct diskPartition *partition) = VOLPARTITIONINFO; -AFSVolListVolumes(IN long partID, - IN long flags, +AFSVolListVolumes(IN uint32_t partID, + IN uint32_t flags, OUT struct volEntries *resultEntries) = VOLLISTVOLUMES; -AFSVolListOneVolume(IN long partID, - IN long volid, +AFSVolListOneVolume(IN uint32_t partID, + IN uint32_t volid, OUT struct volEntries *resultEntries) = VOLLISTONEVOLUME; -AFSVolGetNthVolume(IN long index, - OUT long *volume, - OUT long *partition) = VOLGETNTHVOLUME; +AFSVolGetNthVolume(IN uint32_t index, + OUT uint32_t *volume, + OUT uint32_t *partition) = VOLGETNTHVOLUME; AFSVolMonitor(OUT transDebugEntries *result) = VOLMONITOR; -AFSVolXListVolumes(IN long partID, - IN long flags, +AFSVolXListVolumes(IN uint32_t partID, + IN uint32_t flags, OUT struct xvolEntries *resultEntries) = VOLXLISTVOLUMES; -AFSVolXListOneVolume(IN long partID, - IN long volid, +AFSVolXListOneVolume(IN uint32_t partID, + IN uint32_t volid, OUT struct xvolEntries *resultEntries) = VOLXLISTONEVOL; -AFSVolSetInfo(IN long transid, +AFSVolSetInfo(IN uint32_t transid, IN volintInfo *volinfo) = VOLSETINFO; AFSVolXListPartitions(OUT part_entries *ent) = VOLXLISTPARTITIONS; @@ -382,6 +382,6 @@ AFSVolXListPartitions(OUT part_entries *ent) = VOLXLISTPARTITIONS; AFSVolForwardMultiple(IN int32_t fromTrans, IN int32_t fromData, IN manyDests *destinations, - IN long spare0, + IN uint32_t spare0, IN struct restoreCookie *cookie, OUT multi_results *results) = VOLFORWARDMULTIPLE;