mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 13:51:26 +02:00
Code Issues Projects Releases Wiki Activity

[MINOR] removed the ->h member in struct buffer

Browse Source 
The buffer does not need the header pointer anymore, it has
been removed everywhere.
This commit is contained in:
Willy Tarreau 2007-03-18 16:31:29 +01:00
parent b49871738e
commit e09e0cef62
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/proto/buffers.h
View File

@ -2,7 +2,7 @@
include/proto/buffers.h include/proto/buffers.h
Buffer management definitions, macros and inline functions. Buffer management definitions, macros and inline functions.
Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu Copyright (C) 2000-2007 Willy Tarreau - w@1wt.eu
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public
@ -34,7 +34,7 @@
static inline void buffer_init(struct buffer *buf) static inline void buffer_init(struct buffer *buf)
{ {
buf->l = buf->total = buf->flags = 0; buf->l = buf->total = buf->flags = 0;
buf->rlim = buf->h = buf->r = buf->lr = buf->w = buf->data; buf->rlim = buf->r = buf->lr = buf->w = buf->data;
} }
/* returns 1 if the buffer is empty, 0 otherwise */ /* returns 1 if the buffer is empty, 0 otherwise */
@ -51,7 +51,7 @@ static inline int buffer_isfull(const struct buffer *buf) {
/* flushes any content from buffer <buf> */ /* flushes any content from buffer <buf> */
static inline void buffer_flush(struct buffer *buf) static inline void buffer_flush(struct buffer *buf)
{ {
buf->r = buf->h = buf->lr = buf->w = buf->data; buf->r = buf->lr = buf->w = buf->data;
buf->l = 0; buf->l = 0;
} }
@ -76,7 +76,7 @@ static inline int buffer_realign(struct buffer *buf)
{ {
if (buf->l == 0) { if (buf->l == 0) {
/* let's realign the buffer to optimize I/O */ /* let's realign the buffer to optimize I/O */
buf->r = buf->w = buf->h = buf->lr = buf->data; buf->r = buf->w = buf->lr = buf->data;
} }
return buffer_max(buf); return buffer_max(buf);
} }

4
include/types/buffers.h
View File

@ -2,7 +2,7 @@
include/types/buffers.h include/types/buffers.h
Buffer management definitions, macros and inline functions. Buffer management definitions, macros and inline functions.
Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu Copyright (C) 2000-2007 Willy Tarreau - w@1wt.eu
This library is free software; you can redistribute it and/or This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public
@ -67,7 +67,7 @@ struct buffer {
int wto; /* write timeout */ int wto; /* write timeout */
int cto; /* connect timeout */ int cto; /* connect timeout */
unsigned int l; /* data length */ unsigned int l; /* data length */
char *r, *w, *h, *lr; /* read ptr, write ptr, last header ptr, last read */ char *r, *w, *lr; /* read ptr, write ptr, last read */
char *rlim; /* read limit, used for header rewriting */ char *rlim; /* read limit, used for header rewriting */
unsigned long long total; /* total data read */ unsigned long long total; /* total data read */
char data[BUFSIZE]; char data[BUFSIZE];

8
src/buffers.c
View File

@ -1,7 +1,7 @@
/* /*
* Buffer management functions. * Buffer management functions.
* *
* Copyright 2000-2006 Willy Tarreau <w@1wt.eu> * Copyright 2000-2007 Willy Tarreau <w@1wt.eu>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -95,7 +95,6 @@ int buffer_replace(struct buffer *b, char *pos, char *end, char *str)
/* we only move data after the displaced zone */ /* we only move data after the displaced zone */
if (b->r > pos) b->r += delta; if (b->r > pos) b->r += delta;
if (b->w > pos) b->w += delta; if (b->w > pos) b->w += delta;
if (b->h > pos) b->h += delta;
if (b->lr > pos) b->lr += delta; if (b->lr > pos) b->lr += delta;
b->l += delta; b->l += delta;
@ -131,7 +130,6 @@ int buffer_replace2(struct buffer *b, char *pos, char *end, char *str, int len)
/* we only move data after the displaced zone */ /* we only move data after the displaced zone */
if (b->r > pos) b->r += delta; if (b->r > pos) b->r += delta;
if (b->w > pos) b->w += delta; if (b->w > pos) b->w += delta;
if (b->h > pos) b->h += delta;
if (b->lr > pos) b->lr += delta; if (b->lr > pos) b->lr += delta;
b->l += delta; b->l += delta;
@ -160,8 +158,8 @@ int chunk_printf(struct chunk *chk, int size, const char *fmt, ...)
void buffer_dump(FILE *o, struct buffer *b, int from, int to) void buffer_dump(FILE *o, struct buffer *b, int from, int to)
{ {
fprintf(o, "Dumping buffer %p\n", b); fprintf(o, "Dumping buffer %p\n", b);
fprintf(o, " data=%p l=%d r=%p w=%p h=%p lr=%p\n", fprintf(o, " data=%p l=%d r=%p w=%p lr=%p\n",
b->data, b->l, b->r, b->w, b->h, b->lr); b->data, b->l, b->r, b->w, b->lr);
if (!to || to > b->l) if (!to || to > b->l)
to = b->l; to = b->l;

6
src/stream_sock.c
View File

@ -1,7 +1,7 @@
/* /*
* Functions operating on SOCK_STREAM and buffers. * Functions operating on SOCK_STREAM and buffers.
* *
* Copyright 2000-2006 Willy Tarreau <w@1wt.eu> * Copyright 2000-2007 Willy Tarreau <w@1wt.eu>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -60,7 +60,7 @@ int stream_sock_read(int fd) {
#endif #endif
{ {
if (b->l == 0) { /* let's realign the buffer to optimize I/O */ if (b->l == 0) { /* let's realign the buffer to optimize I/O */
b->r = b->w = b->h = b->lr = b->data; b->r = b->w = b->lr = b->data;
max = b->rlim - b->data; max = b->rlim - b->data;
} }
else if (b->r > b->w) { else if (b->r > b->w) {
@ -156,7 +156,7 @@ int stream_sock_write(int fd) {
#endif #endif
if (b->l == 0) { /* let's realign the buffer to optimize I/O */ if (b->l == 0) { /* let's realign the buffer to optimize I/O */
b->r = b->w = b->h = b->lr = b->data; b->r = b->w = b->lr = b->data;
max = 0; max = 0;
} }
else if (b->r > b->w) { else if (b->r > b->w) {