Diane Delgado's changes for a fixed table-locking order

[moira.git] / include / dcm.h

diff --git a/include/dcm.h b/include/dcm.h
index 2cbc7c0ec3eed03249aa68eeb886e9fb4ddc9644..a97a2be4d8945c8af469cd5a5d67c0d1d03cf75f 100644 (file)
--- a/include/dcm.h
+++ b/include/dcm.h
@@ -6,11 +6,14 @@
 #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 SMS_DIR                "/u1/sms"
-#define LOCK_DIR       "/u1/sms/dcm/locks"
 #define UMASK          0007
 
 extern char *malloc(), *calloc(), *realloc();
@@ -76,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();