blob: 7232ff8e78942624bc0524df5172046d395b817e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
--- src/lock.c.orig Tue Aug 4 09:13:18 1998
+++ src/lock.c Thu Nov 19 18:17:09 1998
@@ -18,6 +18,7 @@
History:
970403 extracted from cache.c
//////////////////////////////////////////////////////////////////////#*/
+#include <errno.h>
#include <stdio.h>
#include <sys/types.h>
extern double Time();
@@ -112,6 +113,22 @@
rcode = 0;
break;
}
+#ifdef EWOULDBLOCK
+ /*
+ * Only retry the lock if it was busy. Other
+ * possible sources for the lock to fail are:
+ * invalid argument, bad filedescriptor, and
+ * operation not supported by device. The latter
+ * happens if you start DeleGateD with -v, so it
+ * logs to stderr (which usually doesn't support
+ * locking at all).
+ */
+ if (rcode == -1 && errno != EWOULDBLOCK) {
+ /* pretend lock succeeded */
+ rcode = 0;
+ break;
+ }
+#endif
remain = timeout - elapsed;
if( remain <= 0 )
break;
@@ -122,6 +139,13 @@
start = Time();
rcode = callFuncTimeout(remain/1000,-1,func,fd);
+#ifdef EWOULDBLOCK
+ if (rcode == -1 && errno != EWOULDBLOCK) {
+ /* pretend lock succeeded */
+ rcode = 0;
+ break;
+ }
+#endif
elapse1 = (Time() - start) * 1000;
/*{
static int n;
|
