[CLEANUP] get rid of BF_SHUT*_PENDING
BF_SHUTR_PENDING and BF_SHUTW_PENDING were poor ideas because
BF_SHUTR is the pending of BF_SHUTW_DONE and BF_SHUTW is the
pending of BF_SHUTR_DONE. Remove those two useless and confusing
"pending" versions and rename buffer_shut{r,w}_* functions.
diff --git a/include/proto/buffers.h b/include/proto/buffers.h
index 7a4e0b0..4090ead 100644
--- a/include/proto/buffers.h
+++ b/include/proto/buffers.h
@@ -2,7 +2,7 @@
include/proto/buffers.h
Buffer management definitions, macros and inline functions.
- Copyright (C) 2000-2007 Willy Tarreau - w@1wt.eu
+ Copyright (C) 2000-2008 Willy Tarreau - w@1wt.eu
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -66,35 +66,20 @@
buf->l = 0;
}
-/* marks the buffer as "shutdown pending" for reads and cancels the timeout */
+/* marks the buffer as "shutdown" for reads and cancels the timeout */
static inline void buffer_shutr(struct buffer *buf)
{
buf->rex = TICK_ETERNITY;
- buf->flags |= BF_SHUTR_PENDING;
+ buf->flags |= BF_SHUTR;
}
-/* marks the buffer as "shutdown done" for reads and cancels the timeout */
-static inline void buffer_shutr_done(struct buffer *buf)
-{
- buf->rex = TICK_ETERNITY;
- buf->flags |= BF_SHUTR_DONE;
-}
-
-/* marks the buffer as "shutdown pending" for writes and cancels the timeout */
+/* marks the buffer as "shutdown" for writes and cancels the timeout */
static inline void buffer_shutw(struct buffer *buf)
{
buf->wex = TICK_ETERNITY;
- buf->flags |= BF_SHUTW_PENDING;
+ buf->flags |= BF_SHUTW;
}
-/* marks the buffer as "shutdown done" for writes and cancels the timeout */
-static inline void buffer_shutw_done(struct buffer *buf)
-{
- buf->wex = TICK_ETERNITY;
- buf->flags |= BF_SHUTW_DONE;
-}
-
-
/* returns the maximum number of bytes writable at once in this buffer */
static inline int buffer_max(const struct buffer *buf)
{
diff --git a/include/types/buffers.h b/include/types/buffers.h
index 8319010..be93693 100644
--- a/include/types/buffers.h
+++ b/include/types/buffers.h
@@ -28,13 +28,8 @@
/* The BF_* macros designate Buffer Flags, which may be ORed in the bit field
* member 'flags' in struct buffer.
*/
-#define BF_SHUTR_PENDING 1 /* ignored if BF_SHUTW_DONE */
-#define BF_SHUTR_DONE 2 /* takes precedence over BF_SHUTR_PENDING */
-#define BF_SHUTR_STATUS (BF_SHUTR_PENDING|BF_SHUTR_DONE)
-
-#define BF_SHUTW_PENDING 4 /* ignored if BF_SHUTW_DONE */
-#define BF_SHUTW_DONE 8 /* takes precedence over BF_SHUTW_PENDING */
-#define BF_SHUTW_STATUS (BF_SHUTW_PENDING|BF_SHUTW_DONE)
+#define BF_SHUTR 4 /* producer has already shut down */
+#define BF_SHUTW 8 /* consumer has already shut down */
#define BF_PARTIAL_READ 16
#define BF_COMPLETE_READ 32