/*
* 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
#include <afsconfig.h>
#include <afs/param.h>
+#include <roken.h>
#include <sys/types.h>
#include <string.h>
#include <lwp.h> /* temporary hack by klm */
-#define ERROR_EXIT(code) {error=(code); goto error_exit;}
+#define ERROR_EXIT(code) do { \
+ error = (code); \
+ goto error_exit; \
+} while (0)
/*!
* \file
* This system is organized in a hierarchical set of related modules. Modules
* at one level can only call modules at the same level or below.
- *
+ *
* At the bottom level (0) we have R, RFTP, LWP and IOMGR, i.e. the basic
* operating system primitives.
*
* \li DISK--The module responsible for representing atomic transactions
* on the local disk. It maintains a new-value only log.
* \li LOCK--The module responsible for locking byte ranges in the database file.
- *
+ *
* At the next level (2) we have
- *
+ *
* \li RECOVERY--The module responsible for ensuring that all members of a quorum
* have the same up-to-date database after a new synchronization site is
* elected. This module runs only on the synchronization site.
- *
+ *
* At the next level (3) we have
*
* \li REMOTE--The module responsible for interpreting requests from the sync
struct ubik_server *ubik_servers;
short ubik_callPortal;
-static int BeginTrans(register struct ubik_dbase *dbase, afs_int32 transMode,
+static int BeginTrans(struct ubik_dbase *dbase, afs_int32 transMode,
struct ubik_trans **transPtr, int readAny);
struct rx_securityClass *ubik_sc[3];
#define CStampVersion 1 /* meaning set ts->version */
-/*!
+static_inline struct rx_connection *
+Quorum_StartIO(struct ubik_trans *atrans, struct ubik_server *as)
+{
+ struct rx_connection *conn;
+
+ conn = as->disk_rxcid;
+
+#ifdef AFS_PTHREAD_ENV
+ rx_GetConnection(conn);
+ DBRELE(atrans->dbase);
+#endif /* AFS_PTHREAD_ENV */
+
+ return conn;
+}
+
+static_inline void
+Quorum_EndIO(struct ubik_trans *atrans, struct rx_connection *aconn)
+{
+#ifdef AFS_PTHREAD_ENV
+ DBHOLD(atrans->dbase);
+ rx_PutConnection(aconn);
+#endif /* AFS_PTHREAD_ENV */
+}
+
+
+/*
+ * Iterate over all servers. Callers pass in *ts which is used to track
+ * the current server.
+ * - Returns 1 if there are no more servers
+ * - Returns 0 with conn set to the connection for the current server if
+ * it's up and current
+ */
+static int
+ContactQuorum_iterate(struct ubik_trans *atrans, int aflags, struct ubik_server **ts,
+ struct rx_connection **conn, afs_int32 *rcode,
+ afs_int32 *okcalls, afs_int32 code)
+{
+ if (!*ts) {
+ /* Initial call - start iterating over servers */
+ *ts = ubik_servers;
+ *conn = NULL;
+ *rcode = 0;
+ *okcalls = 0;
+ } else {
+ if (*conn) {
+ Quorum_EndIO(atrans, *conn);
+ *conn = NULL;
+ if (code) { /* failure */
+ *rcode = code;
+ (*ts)->up = 0; /* mark as down now; beacons will no longer be sent */
+ (*ts)->beaconSinceDown = 0;
+ (*ts)->currentDB = 0;
+ urecovery_LostServer(*ts); /* tell recovery to try to resend dbase later */
+ } else { /* success */
+ if (!(*ts)->isClone)
+ (*okcalls)++; /* count up how many worked */
+ if (aflags & CStampVersion) {
+ (*ts)->version = atrans->dbase->version;
+ }
+ }
+ }
+ *ts = (*ts)->next;
+ }
+ if (!(*ts))
+ return 1;
+ if (!(*ts)->up || !(*ts)->currentDB) {
+ (*ts)->currentDB = 0; /* db is no longer current; we just missed an update */
+ return 0; /* not up-to-date, don't bother. NULL conn will tell caller not to use */
+ }
+ *conn = Quorum_StartIO(atrans, *ts);
+ return 0;
+}
+
+static int
+ContactQuorum_rcode(int okcalls, afs_int32 rcode)
+{
+ /*
+ * return 0 if we successfully contacted a quorum, otherwise return error code.
+ * We don't have to contact ourselves (that was done locally)
+ */
+ if (okcalls + 1 >= ubik_quorum)
+ return 0;
+ else
+ return rcode;
+}
+
+/*!
* \brief Perform an operation at a quorum, handling error conditions.
* \return 0 if all worked and a quorum was contacted successfully
* \return otherwise mark failing server as down and return #UERROR
*
* \note If any server misses an update, we must wait #BIGTIME seconds before
- * allowing the transaction to commit, to ensure that the missing and
- * possibly still functioning server times out and stops handing out old
- * data. This is done in the commit code, where we wait for a server marked
- * down to have stayed down for #BIGTIME seconds before we allow a transaction
- * to commit. A server that fails but comes back up won't give out old data
+ * allowing the transaction to commit, to ensure that the missing and
+ * possibly still functioning server times out and stops handing out old
+ * data. This is done in the commit code, where we wait for a server marked
+ * down to have stayed down for #BIGTIME seconds before we allow a transaction
+ * to commit. A server that fails but comes back up won't give out old data
* because it is sent the sync count along with the beacon message that
* marks it as \b really up (\p beaconSinceDown).
*/
afs_int32
ContactQuorum_NoArguments(afs_int32 (*proc)(struct rx_connection *, ubik_tid *),
- register struct ubik_trans *atrans, int aflags)
+ struct ubik_trans *atrans, int aflags)
{
- register struct ubik_server *ts;
- register afs_int32 code;
- afs_int32 rcode, okcalls;
-
- rcode = 0;
- okcalls = 0;
- for (ts = ubik_servers; ts; ts = ts->next) {
- /* for each server */
- if (!ts->up || !ts->currentDB) {
- ts->currentDB = 0; /* db is no longer current; we just missed an update */
- continue; /* not up-to-date, don't bother */
- }
- code = (*proc)(ts->disk_rxcid, &atrans->tid);
- if (code) { /* failure */
- rcode = code;
- ts->up = 0; /* mark as down now; beacons will no longer be sent */
- ts->currentDB = 0;
- ts->beaconSinceDown = 0;
- urecovery_LostServer(); /* tell recovery to try to resend dbase later */
- } else { /* success */
- if (!ts->isClone)
- okcalls++; /* count up how many worked */
- if (aflags & CStampVersion) {
- ts->version = atrans->dbase->version;
- }
- }
+ struct ubik_server *ts = NULL;
+ afs_int32 code = 0, rcode, okcalls;
+ struct rx_connection *conn;
+ int done;
+
+ done = ContactQuorum_iterate(atrans, aflags, &ts, &conn, &rcode, &okcalls, code);
+ while (!done) {
+ if (conn)
+ code = (*proc)(conn, &atrans->tid);
+ done = ContactQuorum_iterate(atrans, aflags, &ts, &conn, &rcode, &okcalls, code);
}
- /* return 0 if we successfully contacted a quorum, otherwise return error code. We don't have to contact ourselves (that was done locally) */
- if (okcalls + 1 >= ubik_quorum)
- return 0;
- else
- return rcode;
+ return ContactQuorum_rcode(okcalls, rcode);
}
+
afs_int32
-ContactQuorum_DISK_Lock(register struct ubik_trans *atrans, int aflags,afs_int32 file,
+ContactQuorum_DISK_Lock(struct ubik_trans *atrans, int aflags,afs_int32 file,
afs_int32 position, afs_int32 length, afs_int32 type)
{
- register struct ubik_server *ts;
- register afs_int32 code;
- afs_int32 rcode, okcalls;
-
- rcode = 0;
- okcalls = 0;
- for (ts = ubik_servers; ts; ts = ts->next) {
- /* for each server */
- if (!ts->up || !ts->currentDB) {
- ts->currentDB = 0; /* db is no longer current; we just missed an update */
- continue; /* not up-to-date, don't bother */
- }
- code = DISK_Lock(ts->disk_rxcid, &atrans->tid, file, position, length,
- type);
- if (code) { /* failure */
- rcode = code;
- ts->up = 0; /* mark as down now; beacons will no longer be sent */
- ts->currentDB = 0;
- ts->beaconSinceDown = 0;
- urecovery_LostServer(); /* tell recovery to try to resend dbase later */
- } else { /* success */
- if (!ts->isClone)
- okcalls++; /* count up how many worked */
- if (aflags & CStampVersion) {
- ts->version = atrans->dbase->version;
- }
- }
+ struct ubik_server *ts = NULL;
+ afs_int32 code = 0, rcode, okcalls;
+ struct rx_connection *conn;
+ int done;
+
+ done = ContactQuorum_iterate(atrans, aflags, &ts, &conn, &rcode, &okcalls, code);
+ while (!done) {
+ if (conn)
+ code = DISK_Lock(conn, &atrans->tid, file, position, length, type);
+ done = ContactQuorum_iterate(atrans, aflags, &ts, &conn, &rcode, &okcalls, code);
}
- /* return 0 if we successfully contacted a quorum, otherwise return error code. We don't have to contact ourselves (that was done locally) */
- if (okcalls + 1 >= ubik_quorum)
- return 0;
- else
- return rcode;
+ return ContactQuorum_rcode(okcalls, rcode);
}
+
afs_int32
-ContactQuorum_DISK_Write(register struct ubik_trans *atrans, int aflags,
+ContactQuorum_DISK_Write(struct ubik_trans *atrans, int aflags,
afs_int32 file, afs_int32 position, bulkdata *data)
{
- register struct ubik_server *ts;
- register afs_int32 code;
- afs_int32 rcode, okcalls;
-
- rcode = 0;
- okcalls = 0;
- for (ts = ubik_servers; ts; ts = ts->next) {
- /* for each server */
- if (!ts->up || !ts->currentDB) {
- ts->currentDB = 0; /* db is no longer current; we just missed an update */
- continue; /* not up-to-date, don't bother */
- }
- code = DISK_Write(ts->disk_rxcid, &atrans->tid, file, position, data);
- if (code) { /* failure */
- rcode = code;
- ts->up = 0; /* mark as down now; beacons will no longer be sent */
- ts->currentDB = 0;
- ts->beaconSinceDown = 0;
- urecovery_LostServer(); /* tell recovery to try to resend dbase later */
- } else { /* success */
- if (!ts->isClone)
- okcalls++; /* count up how many worked */
- if (aflags & CStampVersion) {
- ts->version = atrans->dbase->version;
- }
- }
+ struct ubik_server *ts = NULL;
+ afs_int32 code = 0, rcode, okcalls;
+ struct rx_connection *conn;
+ int done;
+
+ done = ContactQuorum_iterate(atrans, aflags, &ts, &conn, &rcode, &okcalls, code);
+ while (!done) {
+ if (conn)
+ code = DISK_Write(conn, &atrans->tid, file, position, data);
+ done = ContactQuorum_iterate(atrans, aflags, &ts, &conn, &rcode, &okcalls, code);
}
- /* return 0 if we successfully contacted a quorum, otherwise return error code. We don't have to contact ourselves (that was done locally) */
- if (okcalls + 1 >= ubik_quorum)
- return 0;
- else
- return rcode;
+ return ContactQuorum_rcode(okcalls, rcode);
}
+
afs_int32
-ContactQuorum_DISK_Truncate(register struct ubik_trans *atrans, int aflags,
+ContactQuorum_DISK_Truncate(struct ubik_trans *atrans, int aflags,
afs_int32 file, afs_int32 length)
{
- register struct ubik_server *ts;
- register afs_int32 code;
- afs_int32 rcode, okcalls;
-
- rcode = 0;
- okcalls = 0;
- for (ts = ubik_servers; ts; ts = ts->next) {
- /* for each server */
- if (!ts->up || !ts->currentDB) {
- ts->currentDB = 0; /* db is no longer current; we just missed an update */
- continue; /* not up-to-date, don't bother */
- }
- code = DISK_Truncate(ts->disk_rxcid, &atrans->tid, file, length);
- if (code) { /* failure */
- rcode = code;
- ts->up = 0; /* mark as down now; beacons will no longer be sent */
- ts->currentDB = 0;
- ts->beaconSinceDown = 0;
- urecovery_LostServer(); /* tell recovery to try to resend dbase later */
- } else { /* success */
- if (!ts->isClone)
- okcalls++; /* count up how many worked */
- if (aflags & CStampVersion) {
- ts->version = atrans->dbase->version;
- }
- }
+ struct ubik_server *ts = NULL;
+ afs_int32 code = 0, rcode, okcalls;
+ struct rx_connection *conn;
+ int done;
+
+ done = ContactQuorum_iterate(atrans, aflags, &ts, &conn, &rcode, &okcalls, code);
+ while (!done) {
+ if (conn)
+ code = DISK_Truncate(conn, &atrans->tid, file, length);
+ done = ContactQuorum_iterate(atrans, aflags, &ts, &conn, &rcode, &okcalls, code);
}
- /* return 0 if we successfully contacted a quorum, otherwise return error code. We don't have to contact ourselves (that was done locally) */
- if (okcalls + 1 >= ubik_quorum)
- return 0;
- else
- return rcode;
+ return ContactQuorum_rcode(okcalls, rcode);
}
+
afs_int32
-ContactQuorum_DISK_WriteV(register struct ubik_trans *atrans, int aflags,
+ContactQuorum_DISK_WriteV(struct ubik_trans *atrans, int aflags,
iovec_wrt * io_vector, iovec_buf *io_buffer)
{
- register struct ubik_server *ts;
- register afs_int32 code;
- afs_int32 rcode, okcalls;
-
- rcode = 0;
- okcalls = 0;
- for (ts = ubik_servers; ts; ts = ts->next) {
- /* for each server */
- if (!ts->up || !ts->currentDB) {
- ts->currentDB = 0; /* db is no longer current; we just missed an update */
- continue; /* not up-to-date, don't bother */
- }
-
- code = DISK_WriteV(ts->disk_rxcid, &atrans->tid, io_vector, io_buffer);
-
- if ((code <= -450) && (code > -500)) {
- /* An RPC interface mismatch (as defined in comerr/error_msg.c).
- * Un-bulk the entries and do individual DISK_Write calls
- * instead of DISK_WriteV.
- */
- struct ubik_iovec *iovec =
- (struct ubik_iovec *)io_vector->iovec_wrt_val;
- char *iobuf = (char *)io_buffer->iovec_buf_val;
- bulkdata tcbs;
- afs_int32 i, offset;
-
- for (i = 0, offset = 0; i < io_vector->iovec_wrt_len; i++) {
- /* Sanity check for going off end of buffer */
- if ((offset + iovec[i].length) > io_buffer->iovec_buf_len) {
- code = UINTERNAL;
- break;
+ struct ubik_server *ts = NULL;
+ afs_int32 code = 0, rcode, okcalls;
+ struct rx_connection *conn;
+ int done;
+
+ done = ContactQuorum_iterate(atrans, aflags, &ts, &conn, &rcode, &okcalls, code);
+ while (!done) {
+ if (conn) {
+ code = DISK_WriteV(conn, &atrans->tid, io_vector, io_buffer);
+ if ((code <= -450) && (code > -500)) {
+ /* An RPC interface mismatch (as defined in comerr/error_msg.c).
+ * Un-bulk the entries and do individual DISK_Write calls
+ * instead of DISK_WriteV.
+ */
+ struct ubik_iovec *iovec =
+ (struct ubik_iovec *)io_vector->iovec_wrt_val;
+ char *iobuf = (char *)io_buffer->iovec_buf_val;
+ bulkdata tcbs;
+ afs_int32 i, offset;
+
+ for (i = 0, offset = 0; i < io_vector->iovec_wrt_len; i++) {
+ /* Sanity check for going off end of buffer */
+ if ((offset + iovec[i].length) > io_buffer->iovec_buf_len) {
+ code = UINTERNAL;
+ break;
+ }
+ tcbs.bulkdata_len = iovec[i].length;
+ tcbs.bulkdata_val = &iobuf[offset];
+ code = DISK_Write(conn, &atrans->tid, iovec[i].file,
+ iovec[i].position, &tcbs);
+ if (code)
+ break;
+ offset += iovec[i].length;
}
- tcbs.bulkdata_len = iovec[i].length;
- tcbs.bulkdata_val = &iobuf[offset];
- code =
- DISK_Write(ts->disk_rxcid, &atrans->tid, iovec[i].file,
- iovec[i].position, &tcbs);
- if (code)
- break;
-
- offset += iovec[i].length;
- }
- }
-
- if (code) { /* failure */
- rcode = code;
- ts->up = 0; /* mark as down now; beacons will no longer be sent */
- ts->currentDB = 0;
- ts->beaconSinceDown = 0;
- urecovery_LostServer(); /* tell recovery to try to resend dbase later */
- } else { /* success */
- if (!ts->isClone)
- okcalls++; /* count up how many worked */
- if (aflags & CStampVersion) {
- ts->version = atrans->dbase->version;
}
}
+ done = ContactQuorum_iterate(atrans, aflags, &ts, &conn, &rcode, &okcalls, code);
}
- /* return 0 if we successfully contacted a quorum, otherwise return error code. We don't have to contact ourselves (that was done locally) */
- if (okcalls + 1 >= ubik_quorum)
- return 0;
- else
- return rcode;
+ return ContactQuorum_rcode(okcalls, rcode);
}
+
afs_int32
-ContactQuorum_DISK_SetVersion(register struct ubik_trans *atrans, int aflags,
+ContactQuorum_DISK_SetVersion(struct ubik_trans *atrans, int aflags,
ubik_version *OldVersion,
ubik_version *NewVersion)
{
- register struct ubik_server *ts;
- register afs_int32 code;
- afs_int32 rcode, okcalls;
-
- rcode = 0;
- okcalls = 0;
- for (ts = ubik_servers; ts; ts = ts->next) {
- /* for each server */
- if (!ts->up || !ts->currentDB) {
- ts->currentDB = 0; /* db is no longer current; we just missed an update */
- continue; /* not up-to-date, don't bother */
- }
- code = DISK_SetVersion(ts->disk_rxcid, &atrans->tid, OldVersion,
- NewVersion);
- if (code) { /* failure */
- rcode = code;
- ts->up = 0; /* mark as down now; beacons will no longer be sent */
- ts->currentDB = 0;
- ts->beaconSinceDown = 0;
- urecovery_LostServer(); /* tell recovery to try to resend dbase later */
- } else { /* success */
- if (!ts->isClone)
- okcalls++; /* count up how many worked */
- if (aflags & CStampVersion) {
- ts->version = atrans->dbase->version;
- }
- }
+ struct ubik_server *ts = NULL;
+ afs_int32 code = 0, rcode, okcalls;
+ struct rx_connection *conn;
+ int done;
+
+ done = ContactQuorum_iterate(atrans, aflags, &ts, &conn, &rcode, &okcalls, code);
+ while (!done) {
+ if (conn)
+ code = DISK_SetVersion(conn, &atrans->tid, OldVersion, NewVersion);
+ done = ContactQuorum_iterate(atrans, aflags, &ts, &conn, &rcode, &okcalls, code);
}
- /* return 0 if we successfully contacted a quorum, otherwise return error code. We don't have to contact ourselves (that was done locally) */
- if (okcalls + 1 >= ubik_quorum)
- return 0;
- else
- return rcode;
+ return ContactQuorum_rcode(okcalls, rcode);
}
-/*!
+
+/*!
* \brief This routine initializes the ubik system for a set of servers.
* \return 0 for success, or an error code on failure.
* \param serverList set of servers specified; nServers gives the number of entries in this array.
- * \param pathName provides an initial prefix used for naming storage files used by this system.
- * \param dbase the returned structure representing this instance of an ubik; it is passed to various calls below.
+ * \param pathName provides an initial prefix used for naming storage files used by this system.
+ * \param dbase the returned structure representing this instance of an ubik; it is passed to various calls below.
*
* \todo This routine should perhaps be generalized to a low-level disk interface providing read, write, file enumeration and sync operations.
*
afs_uint32 serverList[], const char *pathName,
struct ubik_dbase **dbase)
{
- register struct ubik_dbase *tdb;
- register afs_int32 code;
+ struct ubik_dbase *tdb;
+ afs_int32 code;
#ifdef AFS_PTHREAD_ENV
pthread_t rxServerThread; /* pthread variables */
pthread_t ubeacon_InteractThread;
memset(&tdb->version, 0, sizeof(struct ubik_version));
memset(&tdb->cachedVersion, 0, sizeof(struct ubik_version));
#ifdef AFS_PTHREAD_ENV
- assert(pthread_mutex_init(&tdb->versionLock, NULL) == 0);
+ MUTEX_INIT(&tdb->versionLock, "version lock", MUTEX_DEFAULT, 0);
#else
Lock_Init(&tdb->versionLock);
#endif
ubik_dbase = tdb; /* for now, only one db per server; can fix later when we have names for the other dbases */
#ifdef AFS_PTHREAD_ENV
- assert(pthread_cond_init(&tdb->version_cond, NULL) == 0);
- assert(pthread_cond_init(&tdb->flags_cond, NULL) == 0);
+ CV_INIT(&tdb->version_cond, "version", CV_DEFAULT, 0);
+ CV_INIT(&tdb->flags_cond, "flags", CV_DEFAULT, 0);
#endif /* AFS_PTHREAD_ENV */
/* initialize RX */
if (code < 0)
return code;
+ udisk_Init(ubik_nBuffers);
+ ulock_Init();
+
+ code = uvote_Init();
+ if (code)
+ return code;
+ code = urecovery_Initialize(tdb);
+ if (code)
+ return code;
+ if (info)
+ code = ubeacon_InitServerListByInfo(myHost, info, clones);
+ else
+ code = ubeacon_InitServerList(myHost, serverList);
+ if (code)
+ return code;
+
ubik_callPortal = myPort;
/* try to get an additional security object */
ubik_sc[0] = rxnull_NewServerSecurityObject();
ubik_sc[secIndex] = secClass;
}
}
- /* for backwards compat this should keep working as it does now
+ /* for backwards compat this should keep working as it does now
and not host bind */
#if 0
/* This really needs to be up above, where I have put it. It works
rx_SetMinProcs(tservice, 2);
rx_SetMaxProcs(tservice, 3);
- /* start an rx_ServerProc to handle incoming RPC's in particular the
+ /* start an rx_ServerProc to handle incoming RPC's in particular the
* UpdateInterfaceAddr RPC that occurs in ubeacon_InitServerList. This avoids
* the "steplock" problem in ubik initialization. Defect 11037.
*/
#ifdef AFS_PTHREAD_ENV
/* do assert stuff */
- assert(pthread_attr_init(&rxServer_tattr) == 0);
- assert(pthread_attr_setdetachstate(&rxServer_tattr, PTHREAD_CREATE_DETACHED) == 0);
-/* assert(pthread_attr_setstacksize(&rxServer_tattr, rx_stackSize) == 0); */
+ osi_Assert(pthread_attr_init(&rxServer_tattr) == 0);
+ osi_Assert(pthread_attr_setdetachstate(&rxServer_tattr, PTHREAD_CREATE_DETACHED) == 0);
+/* osi_Assert(pthread_attr_setstacksize(&rxServer_tattr, rx_stackSize) == 0); */
- assert(pthread_create(&rxServerThread, &rxServer_tattr, (void *)rx_ServerProc, NULL) == 0);
+ osi_Assert(pthread_create(&rxServerThread, &rxServer_tattr, (void *)rx_ServerProc, NULL) == 0);
#else
LWP_CreateProcess(rx_ServerProc, rx_stackSize, RX_PROCESS_PRIORITY,
NULL, "rx_ServerProc", &junk);
#endif
- /* do basic initialization */
- code = uvote_Init();
- if (code)
- return code;
- code = urecovery_Initialize(tdb);
- if (code)
- return code;
- if (info)
- code = ubeacon_InitServerListByInfo(myHost, info, clones);
- else
- code = ubeacon_InitServerList(myHost, serverList);
- if (code)
- return code;
-
/* now start up async processes */
#ifdef AFS_PTHREAD_ENV
/* do assert stuff */
- assert(pthread_attr_init(&ubeacon_Interact_tattr) == 0);
- assert(pthread_attr_setdetachstate(&ubeacon_Interact_tattr, PTHREAD_CREATE_DETACHED) == 0);
-/* assert(pthread_attr_setstacksize(&ubeacon_Interact_tattr, 16384) == 0); */
+ osi_Assert(pthread_attr_init(&ubeacon_Interact_tattr) == 0);
+ osi_Assert(pthread_attr_setdetachstate(&ubeacon_Interact_tattr, PTHREAD_CREATE_DETACHED) == 0);
+/* osi_Assert(pthread_attr_setstacksize(&ubeacon_Interact_tattr, 16384) == 0); */
/* need another attr set here for priority??? - klm */
- assert(pthread_create(&ubeacon_InteractThread, &ubeacon_Interact_tattr,
+ osi_Assert(pthread_create(&ubeacon_InteractThread, &ubeacon_Interact_tattr,
(void *)ubeacon_Interact, NULL) == 0);
#else
code = LWP_CreateProcess(ubeacon_Interact, 16384 /*8192 */ ,
#ifdef AFS_PTHREAD_ENV
/* do assert stuff */
- assert(pthread_attr_init(&urecovery_Interact_tattr) == 0);
- assert(pthread_attr_setdetachstate(&urecovery_Interact_tattr, PTHREAD_CREATE_DETACHED) == 0);
-/* assert(pthread_attr_setstacksize(&urecovery_Interact_tattr, 16384) == 0); */
+ osi_Assert(pthread_attr_init(&urecovery_Interact_tattr) == 0);
+ osi_Assert(pthread_attr_setdetachstate(&urecovery_Interact_tattr, PTHREAD_CREATE_DETACHED) == 0);
+/* osi_Assert(pthread_attr_setstacksize(&urecovery_Interact_tattr, 16384) == 0); */
/* need another attr set here for priority??? - klm */
- assert(pthread_create(&urecovery_InteractThread, &urecovery_Interact_tattr,
+ osi_Assert(pthread_create(&urecovery_InteractThread, &urecovery_Interact_tattr,
(void *)urecovery_Interact, NULL) == 0);
return 0; /* is this correct? - klm */
-#else
+#else
code = LWP_CreateProcess(urecovery_Interact, 16384 /*8192 */ ,
LWP_MAX_PRIORITY - 1, (void *)0, "recovery",
&junk);
* \brief This routine begins a read or write transaction on the transaction
* identified by transPtr, in the dbase named by dbase.
*
- * An open mode of ubik_READTRANS identifies this as a read transaction,
+ * An open mode of ubik_READTRANS identifies this as a read transaction,
* while a mode of ubik_WRITETRANS identifies this as a write transaction.
- * transPtr is set to the returned transaction control block.
+ * transPtr is set to the returned transaction control block.
* The readAny flag is set to 0 or 1 or 2 by the wrapper functions
* ubik_BeginTrans() or ubik_BeginTransReadAny() or
* ubik_BeginTransReadAnyWrite() below.
* \note We can only begin transaction when we have an up-to-date database.
*/
static int
-BeginTrans(register struct ubik_dbase *dbase, afs_int32 transMode,
+BeginTrans(struct ubik_dbase *dbase, afs_int32 transMode,
struct ubik_trans **transPtr, int readAny)
{
struct ubik_trans *jt;
- register struct ubik_trans *tt;
- register afs_int32 code;
-#if defined(UBIK_PAUSE)
- int count;
-#endif /* UBIK_PAUSE */
+ struct ubik_trans *tt;
+ afs_int32 code;
if (readAny > 1 && ubik_SyncWriterCacheProc == NULL) {
/* it's not safe to use ubik_BeginTransReadAnyWrite without a
if ((transMode != UBIK_READTRANS) && readAny)
return UBADTYPE;
DBHOLD(dbase);
-#if defined(UBIK_PAUSE)
- /* if we're polling the slave sites, wait until the returns
- * are all in. Otherwise, the urecovery_CheckTid call may
- * glitch us.
- */
- if (transMode == UBIK_WRITETRANS)
- for (count = 75; dbase->flags & DBVOTING; --count) {
- DBRELE(dbase);
-#ifdef GRAND_PAUSE_DEBUGGING
- if (count == 75)
- fprintf(stderr,
- "%ld: myport=%d: BeginTrans is waiting 'cause of voting conflict\n",
- time(0), ntohs(ubik_callPortal));
- else
-#endif
- if (count <= 0) {
-#if 1
- fprintf(stderr,
- "%ld: myport=%d: BeginTrans failed because of voting conflict\n",
- time(0), ntohs(ubik_callPortal));
-#endif
- return UNOQUORUM; /* a white lie */
- }
-#ifdef AFS_PTHREAD_ENV
- sleep(2);
-#else
- IOMGR_Sleep(2);
-#endif
- DBHOLD(dbase);
- }
-#endif /* UBIK_PAUSE */
if (urecovery_AllBetter(dbase, readAny) == 0) {
DBRELE(dbase);
return UNOQUORUM;
/* if we're writing already, wait */
while (dbase->flags & DBWRITING) {
#ifdef AFS_PTHREAD_ENV
- assert(pthread_cond_wait(&dbase->flags_cond, &dbase->versionLock) == 0);
+ CV_WAIT(&dbase->flags_cond, &dbase->versionLock);
#else
DBRELE(dbase);
LWP_WaitProcess(&dbase->flags);
if (transMode == UBIK_WRITETRANS) {
/* for a write trans, we have to keep track of the write tid counter too */
-#if defined(UBIK_PAUSE)
dbase->writeTidCounter = tt->tid.counter;
-#else
- dbase->writeTidCounter += 2;
-#endif /* UBIK_PAUSE */
/* next try to start transaction on appropriate number of machines */
code = ContactQuorum_NoArguments(DISK_Begin, tt, 0);
* \see BeginTrans()
*/
int
-ubik_BeginTrans(register struct ubik_dbase *dbase, afs_int32 transMode,
+ubik_BeginTrans(struct ubik_dbase *dbase, afs_int32 transMode,
struct ubik_trans **transPtr)
{
return BeginTrans(dbase, transMode, transPtr, 0);
* \see BeginTrans()
*/
int
-ubik_BeginTransReadAny(register struct ubik_dbase *dbase, afs_int32 transMode,
+ubik_BeginTransReadAny(struct ubik_dbase *dbase, afs_int32 transMode,
struct ubik_trans **transPtr)
{
return BeginTrans(dbase, transMode, transPtr, 1);
* \brief This routine ends a read or write transaction by aborting it.
*/
int
-ubik_AbortTrans(register struct ubik_trans *transPtr)
+ubik_AbortTrans(struct ubik_trans *transPtr)
{
- register afs_int32 code;
+ afs_int32 code;
afs_int32 code2;
- register struct ubik_dbase *dbase;
+ struct ubik_dbase *dbase;
dbase = transPtr->dbase;
* \return an error code.
*/
int
-ubik_EndTrans(register struct ubik_trans *transPtr)
+ubik_EndTrans(struct ubik_trans *transPtr)
{
- register afs_int32 code;
+ afs_int32 code;
struct timeval tv;
afs_int32 realStart;
- register struct ubik_server *ts;
+ struct ubik_server *ts;
afs_int32 now;
int cachelocked = 0;
- register struct ubik_dbase *dbase;
+ struct ubik_dbase *dbase;
if (transPtr->type == UBIK_WRITETRANS) {
code = ubik_Flush(transPtr);
}
for (ts = ubik_servers; ts; ts = ts->next) {
if (!ts->beaconSinceDown && now <= ts->lastBeaconSent + BIGTIME) {
+
/* this guy could have some damaged data, wait for him */
code = 1;
tv.tv_sec = 1; /* try again after a while (ha ha) */
tv.tv_usec = 0;
+
#ifdef AFS_PTHREAD_ENV
+ /* we could release the dbase outside of the loop, but we do
+ * it here, in the loop, to avoid an unnecessary RELE/HOLD
+ * if all sites are up */
+ DBRELE(dbase);
select(0, 0, 0, 0, &tv);
+ DBHOLD(dbase);
#else
IOMGR_Select(0, 0, 0, 0, &tv); /* poll, should we wait on something? */
#endif
+
break;
}
}
/*!
* \brief This routine reads length bytes into buffer from the current position in the database.
- *
+ *
* The file pointer is updated appropriately (by adding the number of bytes actually transferred), and the length actually transferred is stored in the long integer pointed to by length. A short read returns zero for an error code.
*
* \note *length is an INOUT parameter: at the start it represents the size of the buffer, and when done, it contains the number of bytes actually transferred.
*/
int
-ubik_Read(register struct ubik_trans *transPtr, void *buffer,
+ubik_Read(struct ubik_trans *transPtr, void *buffer,
afs_int32 length)
{
- register afs_int32 code;
+ afs_int32 code;
/* reads are easy to do: handle locally */
DBHOLD(transPtr->dbase);
}
/*!
- * \brief This routine will flush the io data in the iovec structures.
+ * \brief This routine will flush the io data in the iovec structures.
*
* It first flushes to the local disk and then uses ContactQuorum to write it
* to the other servers.
}
int
-ubik_Write(register struct ubik_trans *transPtr, void *vbuffer,
+ubik_Write(struct ubik_trans *transPtr, void *vbuffer,
afs_int32 length)
{
struct ubik_iovec *iovec;
* and a byte position relative to the specified file \p position.
*/
int
-ubik_Seek(register struct ubik_trans *transPtr, afs_int32 fileid,
+ubik_Seek(struct ubik_trans *transPtr, afs_int32 fileid,
afs_int32 position)
{
- register afs_int32 code;
+ afs_int32 code;
DBHOLD(transPtr->dbase);
if (!urecovery_AllBetter(transPtr->dbase, transPtr->flags & TRREADANY)) {
* transaction in \p fileid and \p position.
*/
int
-ubik_Tell(register struct ubik_trans *transPtr, afs_int32 * fileid,
+ubik_Tell(struct ubik_trans *transPtr, afs_int32 * fileid,
afs_int32 * position)
{
DBHOLD(transPtr->dbase);
* bytes, if length is less than the file's current size.
*/
int
-ubik_Truncate(register struct ubik_trans *transPtr, afs_int32 length)
+ubik_Truncate(struct ubik_trans *transPtr, afs_int32 length)
{
afs_int32 code, error = 0;
* \brief utility to wait for a version # to change
*/
int
-ubik_WaitVersion(register struct ubik_dbase *adatabase,
- register struct ubik_version *aversion)
+ubik_WaitVersion(struct ubik_dbase *adatabase,
+ struct ubik_version *aversion)
{
DBHOLD(adatabase);
while (1) {
return 0;
}
#ifdef AFS_PTHREAD_ENV
- assert(pthread_cond_wait(&adatabase->version_cond, &adatabase->versionLock) == 0);
+ CV_WAIT(&adatabase->version_cond, &adatabase->versionLock);
#else
DBRELE(adatabase);
LWP_WaitProcess(&adatabase->version); /* same vers, just wait */
* \brief utility to get the version of the dbase a transaction is dealing with
*/
int
-ubik_GetVersion(register struct ubik_trans *atrans,
- register struct ubik_version *avers)
+ubik_GetVersion(struct ubik_trans *atrans,
+ struct ubik_version *avers)
{
*avers = atrans->dbase->version;
return 0;
}
/*!
- * \brief Facility to simplify database caching.
+ * \brief Facility to simplify database caching.
* \return zero if last trans was done on the local server and was successful.
* \return -1 means bad (NULL) argument.
- *
- * If return value is non-zero and the caller is a server caching part of the
+ *
+ * If return value is non-zero and the caller is a server caching part of the
* Ubik database, it should invalidate that cache.
*/
static int
-ubik_CacheUpdate(register struct ubik_trans *atrans)
+ubik_CacheUpdate(struct ubik_trans *atrans)
{
if (!(atrans && atrans->dbase))
return -1;
}
/*!
- * "Who said anything about panicking?" snapped Arthur.
+ * "Who said anything about panicking?" snapped Arthur.
* "This is still just the culture shock. You wait till I've settled down
* into the situation and found my bearings. \em Then I'll start panicking!"
* --Authur Dent
git://git.openafs.org / openafs.git / blobdiff