X-Git-Url: http://andersk.mit.edu/gitweb/moira.git/blobdiff_plain/e6eb3546273619debf0ae1e9c065144fd60cc2a9..9d6275475e143ce6fabdd6b5d41be9e20cc1b802:/include/dcm.h

diff --git a/include/dcm.h b/include/dcm.h
index e8f893ee..a97a2be4 100644
--- a/include/dcm.h
+++ b/include/dcm.h
@@ -6,8 +6,13 @@
 #define UPCALL_CONT	0
 #define UPCALL_STOP	1
 
-#define HARD_FAIL(x)	(((x) != 0 ) && ((x) != SMS_NO_CHANGE))
-#define SOFT_FAIL(x)	(((x) == SMS_NO_MEM) || ((x) == SMS_CANT_CONNECT) || ((x) == SMS_CCONFIG) || ((x) == SMS_DEADLOCK))
+#define HARD_FAIL(x)	(((x) != 0 ) && ((x) != MR_NO_CHANGE))
+#define SOFT_FAIL(x)	(((x) == MR_NO_MEM) || ((x) == MR_CANT_CONNECT) || ((x) == MR_CCONFIG) || ((x) == MR_DEADLOCK) || ((x) == MR_BUSY))
+
+
+#define DEADLOCK_WAIT	(3 * 60)	/* number of seconds to wait after
+					   a deadlock before trying again. */
+#define DEADLOCK_TRIES	40		/* how many times to try (2 hours) */
 
 #define UMASK		0007
 
@@ -74,7 +79,7 @@ struct svrhost {
 
 
 /*--> utils.c <--*/
-extern void init_sms();
+extern void init_mr();
 extern void dcm_com_err_hook();
 extern void leave();
 extern void scream();