|
|
|
#include "first.h"
|
|
|
|
|
|
|
|
/**
|
|
|
|
* the network chunk-API
|
|
|
|
*
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "chunk.h"
|
|
|
|
#include "fdevent.h"
|
|
|
|
#include "log.h"
|
|
|
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include "sys-mmap.h"
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <fcntl.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
|
|
|
|
#include <errno.h>
|
|
|
|
#include <string.h>
|
|
|
|
|
|
|
|
/* default 1MB, upper limit 128MB */
|
|
|
|
#define DEFAULT_TEMPFILE_SIZE (1 * 1024 * 1024)
|
|
|
|
#define MAX_TEMPFILE_SIZE (128 * 1024 * 1024)
|
|
|
|
|
|
|
|
static size_t chunk_buf_sz = 8192;
|
|
|
|
static chunk *chunks, *chunks_oversized;
|
|
|
|
static chunk *chunk_buffers;
|
|
|
|
static int chunks_oversized_n;
|
|
|
|
static const array *chunkqueue_default_tempdirs = NULL;
|
|
|
|
static off_t chunkqueue_default_tempfile_size = DEFAULT_TEMPFILE_SIZE;
|
|
|
|
|
|
|
|
void chunkqueue_set_chunk_size (size_t sz)
|
|
|
|
{
|
|
|
|
size_t x = 1024;
|
|
|
|
while (x < sz && x < (1u << 30)) x <<= 1;
|
|
|
|
chunk_buf_sz = sz > 0 ? x : 8192;
|
|
|
|
}
|
|
|
|
|
|
|
|
void chunkqueue_set_tempdirs_default_reset (void)
|
|
|
|
{
|
|
|
|
chunk_buf_sz = 8192;
|
|
|
|
chunkqueue_default_tempdirs = NULL;
|
|
|
|
chunkqueue_default_tempfile_size = DEFAULT_TEMPFILE_SIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
chunkqueue *chunkqueue_init(chunkqueue *cq) {
|
|
|
|
/* (if caller passes non-NULL cq, it must be 0-init) */
|
|
|
|
if (NULL == cq) {
|
|
|
|
cq = calloc(1, sizeof(*cq));
|
|
|
|
force_assert(NULL != cq);
|
|
|
|
}
|
|
|
|
|
|
|
|
cq->first = NULL;
|
|
|
|
cq->last = NULL;
|
|
|
|
|
|
|
|
cq->tempdirs = chunkqueue_default_tempdirs;
|
|
|
|
cq->upload_temp_file_size = chunkqueue_default_tempfile_size;
|
|
|
|
|
|
|
|
return cq;
|
|
|
|
}
|
|
|
|
|
|
|
|
__attribute_returns_nonnull__
|
|
|
|
static chunk *chunk_init(size_t sz) {
|
|
|
|
chunk * const restrict c = calloc(1, sizeof(*c));
|
|
|
|
force_assert(NULL != c);
|
|
|
|
|
|
|
|
#if 0 /*(zeroed by calloc())*/
|
|
|
|
c->type = MEM_CHUNK;
|
|
|
|
c->next = NULL;
|
|
|
|
c->offset = 0;
|
|
|
|
c->file.length = 0;
|
|
|
|
c->file.mmap.length = c->file.mmap.offset = 0;
|
|
|
|
c->file.is_temp = 0;
|
|
|
|
#endif
|
|
|
|
c->file.fd = -1;
|
|
|
|
c->file.mmap.start = MAP_FAILED;
|
|
|
|
|
|
|
|
c->mem = buffer_init();
|
|
|
|
buffer_string_prepare_copy(c->mem, sz-1);
|
|
|
|
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void chunk_reset_file_chunk(chunk *c) {
|
|
|
|
if (c->file.is_temp) {
|
|
|
|
c->file.is_temp = 0;
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
11 months ago
|
|
|
if (!buffer_is_blank(c->mem))
|
|
|
|
unlink(c->mem->ptr);
|
|
|
|
}
|
|
|
|
if (c->file.refchg) {
|
|
|
|
c->file.refchg(c->file.ref, -1);
|
|
|
|
c->file.refchg = 0; /* NULL fn ptr */
|
|
|
|
c->file.ref = NULL;
|
|
|
|
}
|
|
|
|
else if (c->file.fd != -1) {
|
|
|
|
close(c->file.fd);
|
|
|
|
}
|
|
|
|
if (MAP_FAILED != c->file.mmap.start) {
|
|
|
|
munmap(c->file.mmap.start, c->file.mmap.length);
|
|
|
|
c->file.mmap.start = MAP_FAILED;
|
|
|
|
c->file.mmap.length = c->file.mmap.offset = 0;
|
|
|
|
}
|
|
|
|
c->file.fd = -1;
|
|
|
|
c->file.length = 0;
|
|
|
|
c->type = MEM_CHUNK;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void chunk_reset(chunk *c) {
|
|
|
|
if (c->type == FILE_CHUNK) chunk_reset_file_chunk(c);
|
|
|
|
|
|
|
|
buffer_clear(c->mem);
|
|
|
|
c->offset = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void chunk_free(chunk *c) {
|
|
|
|
if (c->type == FILE_CHUNK) chunk_reset_file_chunk(c);
|
|
|
|
buffer_free(c->mem);
|
|
|
|
free(c);
|
|
|
|
}
|
|
|
|
|
|
|
|
static chunk * chunk_pop_oversized(size_t sz) {
|
|
|
|
/* future: might have buckets of certain sizes, up to socket buf sizes */
|
|
|
|
if (chunks_oversized && chunks_oversized->mem->size >= sz) {
|
|
|
|
--chunks_oversized_n;
|
|
|
|
chunk *c = chunks_oversized;
|
|
|
|
chunks_oversized = c->next;
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void chunk_push_oversized(chunk * const c, const size_t sz) {
|
|
|
|
if (chunks_oversized_n < 64 && chunk_buf_sz >= 4096) {
|
|
|
|
++chunks_oversized_n;
|
|
|
|
chunk **co = &chunks_oversized;
|
|
|
|
while (*co && sz < (*co)->mem->size) co = &(*co)->next;
|
|
|
|
c->next = *co;
|
|
|
|
*co = c;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
chunk_free(c);
|
|
|
|
}
|
|
|
|
|
|
|
|
__attribute_returns_nonnull__
|
|
|
|
static buffer * chunk_buffer_acquire_sz(size_t sz) {
|
|
|
|
chunk *c;
|
|
|
|
buffer *b;
|
|
|
|
if (sz <= chunk_buf_sz) {
|
|
|
|
if (chunks) {
|
|
|
|
c = chunks;
|
|
|
|
chunks = c->next;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
c = chunk_init(chunk_buf_sz);
|
|
|
|
/* future: might choose to pop from chunks_oversized, if available
|
|
|
|
* (even if larger than sz) rather than allocating new chunk
|
|
|
|
* (and if doing so, might replace chunks_oversized_n) */
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/*(round up to nearest chunk_buf_sz)*/
|
|
|
|
sz = (sz + (chunk_buf_sz-1)) & ~(chunk_buf_sz-1);
|
|
|
|
c = chunk_pop_oversized(sz);
|
|
|
|
if (NULL == c)
|
|
|
|
c = chunk_init(sz);
|
|
|
|
}
|
|
|
|
c->next = chunk_buffers;
|
|
|
|
chunk_buffers = c;
|
|
|
|
b = c->mem;
|
|
|
|
c->mem = NULL;
|
|
|
|
return b;
|
|
|
|
}
|
|
|
|
|
|
|
|
buffer * chunk_buffer_acquire(void) {
|
|
|
|
return chunk_buffer_acquire_sz(chunk_buf_sz);
|
|
|
|
}
|
|
|
|
|
|
|
|
void chunk_buffer_release(buffer *b) {
|
|
|
|
if (NULL == b) return;
|
|
|
|
if (chunk_buffers) {
|
|
|
|
chunk *c = chunk_buffers;
|
|
|
|
chunk_buffers = c->next;
|
|
|
|
c->mem = b;
|
|
|
|
buffer_clear(b);
|
|
|
|
if (b->size == chunk_buf_sz) {
|
|
|
|
c->next = chunks;
|
|
|
|
chunks = c;
|
|
|
|
}
|
|
|
|
else if (b->size > chunk_buf_sz)
|
|
|
|
chunk_push_oversized(c, b->size);
|
|
|
|
else
|
|
|
|
chunk_free(c);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
buffer_free(b);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
size_t chunk_buffer_prepare_append(buffer * const b, size_t sz) {
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
11 months ago
|
|
|
if (sz > buffer_string_space(b)) {
|
|
|
|
sz += b->used ? b->used : 1;
|
|
|
|
buffer * const cb = chunk_buffer_acquire_sz(sz);
|
|
|
|
/* swap buffer contents and copy original b->ptr into larger b->ptr */
|
|
|
|
/*(this does more than buffer_move())*/
|
|
|
|
buffer tb = *b;
|
|
|
|
*b = *cb;
|
|
|
|
*cb = tb;
|
|
|
|
if ((b->used = tb.used))
|
|
|
|
memcpy(b->ptr, tb.ptr, tb.used);
|
|
|
|
chunk_buffer_release(cb);
|
|
|
|
}
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
11 months ago
|
|
|
return buffer_string_space(b);
|
|
|
|
}
|
|
|
|
|
|
|
|
__attribute_returns_nonnull__
|
|
|
|
static chunk * chunk_acquire(size_t sz) {
|
|
|
|
if (sz <= chunk_buf_sz) {
|
|
|
|
if (chunks) {
|
|
|
|
chunk *c = chunks;
|
|
|
|
chunks = c->next;
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
sz = chunk_buf_sz;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/*(round up to nearest chunk_buf_sz)*/
|
|
|
|
sz = (sz + (chunk_buf_sz-1)) & ~(chunk_buf_sz-1);
|
|
|
|
chunk *c = chunk_pop_oversized(sz);
|
|
|
|
if (c) return c;
|
|
|
|
}
|
|
|
|
|
|
|
|
return chunk_init(sz);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void chunk_release(chunk *c) {
|
|
|
|
const size_t sz = c->mem->size;
|
|
|
|
if (sz == chunk_buf_sz) {
|
|
|
|
chunk_reset(c);
|
|
|
|
c->next = chunks;
|
|
|
|
chunks = c;
|
|
|
|
}
|
|
|
|
else if (sz > chunk_buf_sz) {
|
|
|
|
chunk_reset(c);
|
|
|
|
chunk_push_oversized(c, sz);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
chunk_free(c);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void chunkqueue_chunk_pool_clear(void)
|
|
|
|
{
|
|
|
|
for (chunk *next, *c = chunks; c; c = next) {
|
|
|
|
next = c->next;
|
|
|
|
chunk_free(c);
|
|
|
|
}
|
|
|
|
chunks = NULL;
|
|
|
|
for (chunk *next, *c = chunks_oversized; c; c = next) {
|
|
|
|
next = c->next;
|
|
|
|
chunk_free(c);
|
|
|
|
}
|
|
|
|
chunks_oversized = NULL;
|
|
|
|
chunks_oversized_n = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void chunkqueue_chunk_pool_free(void)
|
|
|
|
{
|
|
|
|
chunkqueue_chunk_pool_clear();
|
|
|
|
for (chunk *next, *c = chunk_buffers; c; c = next) {
|
|
|
|
next = c->next;
|
|
|
|
c->mem = buffer_init(); /*(chunk_reset() expects c->mem != NULL)*/
|
|
|
|
chunk_free(c);
|
|
|
|
}
|
|
|
|
chunk_buffers = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
__attribute_pure__
|
|
|
|
static off_t chunk_remaining_length(const chunk *c) {
|
|
|
|
/* MEM_CHUNK or FILE_CHUNK */
|
|
|
|
return (c->type == MEM_CHUNK
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
11 months ago
|
|
|
? (off_t)buffer_clen(c->mem)
|
|
|
|
: c->file.length)
|
|
|
|
- c->offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void chunkqueue_release_chunks(chunkqueue *cq) {
|
|
|
|
cq->last = NULL;
|
|
|
|
for (chunk *c; (c = cq->first); ) {
|
|
|
|
cq->first = c->next;
|
|
|
|
chunk_release(c);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void chunkqueue_free(chunkqueue *cq) {
|
|
|
|
if (NULL == cq) return;
|
|
|
|
chunkqueue_release_chunks(cq);
|
|
|
|
free(cq);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void chunkqueue_prepend_chunk(chunkqueue * const restrict cq, chunk * const restrict c) {
|
|
|
|
if (NULL == (c->next = cq->first)) cq->last = c;
|
|
|
|
cq->first = c;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void chunkqueue_append_chunk(chunkqueue * const restrict cq, chunk * const restrict c) {
|
|
|
|
c->next = NULL;
|
|
|
|
*(cq->last ? &cq->last->next : &cq->first) = c;
|
|
|
|
cq->last = c;
|
|
|
|
}
|
|
|
|
|
|
|
|
__attribute_returns_nonnull__
|
|
|
|
static chunk * chunkqueue_prepend_mem_chunk(chunkqueue *cq, size_t sz) {
|
|
|
|
chunk *c = chunk_acquire(sz);
|
|
|
|
chunkqueue_prepend_chunk(cq, c);
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
|
|
|
__attribute_returns_nonnull__
|
|
|
|
static chunk * chunkqueue_append_mem_chunk(chunkqueue *cq, size_t sz) {
|
|
|
|
chunk *c = chunk_acquire(sz);
|
|
|
|
chunkqueue_append_chunk(cq, c);
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
|
|
|
__attribute_returns_nonnull__
|
|
|
|
static chunk * chunkqueue_append_file_chunk(chunkqueue * const restrict cq, const buffer * const restrict fn, off_t offset, off_t len) {
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
11 months ago
|
|
|
chunk *c = chunk_acquire((fn ? buffer_clen(fn) : 0)+1);
|
|
|
|
chunkqueue_append_chunk(cq, c);
|
|
|
|
c->type = FILE_CHUNK;
|
|
|
|
c->offset = offset;
|
|
|
|
c->file.length = offset + len;
|
|
|
|
cq->bytes_in += len;
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
11 months ago
|
|
|
if (fn) buffer_copy_buffer(c->mem, fn);
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
|
|
|
void chunkqueue_reset(chunkqueue *cq) {
|
|
|
|
chunkqueue_release_chunks(cq);
|
|
|
|
cq->bytes_in = 0;
|
|
|
|
cq->bytes_out = 0;
|
|
|
|
cq->tempdir_idx = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
void chunkqueue_append_file_fd(chunkqueue * const restrict cq, const buffer * const restrict fn, int fd, off_t offset, off_t len) {
|
|
|
|
if (len > 0) {
|
|
|
|
(chunkqueue_append_file_chunk(cq, fn, offset, len))->file.fd = fd;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
close(fd);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void chunkqueue_append_file(chunkqueue * const restrict cq, const buffer * const restrict fn, off_t offset, off_t len) {
|
|
|
|
if (len > 0) {
|
|
|
|
chunkqueue_append_file_chunk(cq, fn, offset, len);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int chunkqueue_append_mem_extend_chunk(chunkqueue * const restrict cq, const char * const restrict mem, size_t len) {
|
|
|
|
chunk *c = cq->last;
|
|
|
|
if (0 == len) return 1;
|
|
|
|
if (c != NULL && c->type == MEM_CHUNK
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
11 months ago
|
|
|
&& buffer_string_space(c->mem) >= len) {
|
|
|
|
buffer_append_string_len(c->mem, mem, len);
|
|
|
|
cq->bytes_in += len;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void chunkqueue_append_buffer(chunkqueue * const restrict cq, buffer * const restrict mem) {
|
|
|
|
chunk *c;
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
11 months ago
|
|
|
size_t len = mem ? buffer_clen(mem) : 0;
|
|
|
|
if (len < 1024 && chunkqueue_append_mem_extend_chunk(cq, mem->ptr, len))
|
|
|
|
return;
|
|
|
|
|
|
|
|
c = chunkqueue_append_mem_chunk(cq, chunk_buf_sz);
|
|
|
|
cq->bytes_in += len;
|
|
|
|
buffer_move(c->mem, mem);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void chunkqueue_append_mem(chunkqueue * const restrict cq, const char * const restrict mem, size_t len) {
|
|
|
|
chunk *c;
|
|
|
|
if (len < chunk_buf_sz && chunkqueue_append_mem_extend_chunk(cq, mem, len))
|
|
|
|
return;
|
|
|
|
|
|
|
|
c = chunkqueue_append_mem_chunk(cq, len+1);
|
|
|
|
cq->bytes_in += len;
|
|
|
|
buffer_copy_string_len(c->mem, mem, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void chunkqueue_append_mem_min(chunkqueue * const restrict cq, const char * const restrict mem, size_t len) {
|
|
|
|
chunk *c;
|
|
|
|
if (len < chunk_buf_sz && chunkqueue_append_mem_extend_chunk(cq, mem, len))
|
|
|
|
return;
|
|
|
|
|
|
|
|
c = chunk_init(len+1);
|
|
|
|
chunkqueue_append_chunk(cq, c);
|
|
|
|
cq->bytes_in += len;
|
|
|
|
buffer_copy_string_len(c->mem, mem, len);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void chunkqueue_append_chunkqueue(chunkqueue * const restrict cq, chunkqueue * const restrict src) {
|
|
|
|
if (NULL == src->first) return;
|
|
|
|
|
|
|
|
if (NULL == cq->first) {
|
|
|
|
cq->first = src->first;
|
|
|
|
} else {
|
|
|
|
cq->last->next = src->first;
|
|
|
|
}
|
|
|
|
cq->last = src->last;
|
|
|
|
cq->bytes_in += chunkqueue_length(src);
|
|
|
|
|
|
|
|
src->first = NULL;
|
|
|
|
src->last = NULL;
|
|
|
|
src->bytes_out = src->bytes_in;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
buffer * chunkqueue_prepend_buffer_open_sz(chunkqueue *cq, size_t sz) {
|
|
|
|
chunk * const c = chunkqueue_prepend_mem_chunk(cq, sz);
|
|
|
|
return c->mem;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
buffer * chunkqueue_prepend_buffer_open(chunkqueue *cq) {
|
|
|
|
return chunkqueue_prepend_buffer_open_sz(cq, chunk_buf_sz);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void chunkqueue_prepend_buffer_commit(chunkqueue *cq) {
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
11 months ago
|
|
|
cq->bytes_in += buffer_clen(cq->first->mem);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
buffer * chunkqueue_append_buffer_open_sz(chunkqueue *cq, size_t sz) {
|
|
|
|
chunk * const c = chunkqueue_append_mem_chunk(cq, sz);
|
|
|
|
return c->mem;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
buffer * chunkqueue_append_buffer_open(chunkqueue *cq) {
|
|
|
|
return chunkqueue_append_buffer_open_sz(cq, chunk_buf_sz);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void chunkqueue_append_buffer_commit(chunkqueue *cq) {
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
11 months ago
|
|
|
cq->bytes_in += buffer_clen(cq->last->mem);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void chunkqueue_remove_empty_chunks(chunkqueue *cq);
|
|
|
|
|
|
|
|
|
|
|
|
char * chunkqueue_get_memory(chunkqueue * const restrict cq, size_t * const restrict len) {
|
|
|
|
size_t sz = *len ? *len : (chunk_buf_sz >> 1);
|
|
|
|
buffer *b;
|
|
|
|
chunk *c = cq->last;
|
|
|
|
if (NULL != c && MEM_CHUNK == c->type) {
|
|
|
|
/* return pointer into existing buffer if large enough */
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
11 months ago
|
|
|
size_t avail = buffer_string_space(c->mem);
|
|
|
|
if (avail >= sz) {
|
|
|
|
*len = avail;
|
|
|
|
b = c->mem;
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
11 months ago
|
|
|
return b->ptr + buffer_clen(b);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* allocate new chunk */
|
|
|
|
b = chunkqueue_append_buffer_open_sz(cq, sz);
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
11 months ago
|
|
|
*len = buffer_string_space(b);
|
|
|
|
return b->ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
void chunkqueue_use_memory(chunkqueue * const restrict cq, chunk *ckpt, size_t len) {
|
|
|
|
buffer *b = cq->last->mem;
|
|
|
|
|
|
|
|
if (len > 0) {
|
|
|
|
buffer_commit(b, len);
|
|
|
|
cq->bytes_in += len;
|
|
|
|
if (cq->last == ckpt || NULL == ckpt || MEM_CHUNK != ckpt->type
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
11 months ago
|
|
|
|| len > buffer_string_space(ckpt->mem)) return;
|
|
|
|
|
|
|
|
buffer_append_string_buffer(ckpt->mem, b);
|
|
|
|
}
|
[multiple] reduce redundant NULL buffer checks
This commit is a large set of code changes and results in removal of
hundreds, perhaps thousands, of CPU instructions, a portion of which
are on hot code paths.
Most (buffer *) used by lighttpd are not NULL, especially since buffers
were inlined into numerous larger structs such as request_st and chunk.
In the small number of instances where that is not the case, a NULL
check is often performed earlier in a function where that buffer is
later used with a buffer_* func. In the handful of cases that remained,
a NULL check was added, e.g. with r->http_host and r->conf.server_tag.
- check for empty strings at config time and set value to NULL if blank
string will be ignored at runtime; at runtime, simple pointer check
for NULL can be used to check for a value that has been set and is not
blank ("")
- use buffer_is_blank() instead of buffer_string_is_empty(),
and use buffer_is_unset() instead of buffer_is_empty(),
where buffer is known not to be NULL so that NULL check can be skipped
- use buffer_clen() instead of buffer_string_length() when buffer is
known not to be NULL (to avoid NULL check at runtime)
- use buffer_truncate() instead of buffer_string_set_length() to
truncate string, and use buffer_extend() to extend
Examples where buffer known not to be NULL:
- cpv->v.b from config_plugin_values_init is not NULL if T_CONFIG_BOOL
(though we might set it to NULL if buffer_is_blank(cpv->v.b))
- address of buffer is arg (&foo)
(compiler optimizer detects this in most, but not all, cases)
- buffer is checked for NULL earlier in func
- buffer is accessed in same scope without a NULL check (e.g. b->ptr)
internal behavior change:
callers must not pass a NULL buffer to some funcs.
- buffer_init_buffer() requires non-null args
- buffer_copy_buffer() requires non-null args
- buffer_append_string_buffer() requires non-null args
- buffer_string_space() requires non-null arg
11 months ago
|
|
|
else if (!buffer_is_blank(b)) { /*(cq->last == ckpt)*/
|
|
|
|
return; /* last chunk is not empty */
|
|
|
|
}
|
|
|
|
|
|
|
|
/* remove empty last chunk */
|
|
|
|
chunk_release(cq->last);
|
|
|
|
cq->last = ckpt;
|
|
|
|
*(ckpt ? &ckpt->next : &cq->first) = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
void chunkqueue_update_file(chunkqueue * const restrict cq, chunk *c, off_t len) {
|
|
|
|
/*assert(c->type == FILE_CHUNK);*/
|
|
|
|
c->file.length += len;
|
|
|
|
cq->bytes_in += len;
|
|
|
|
}
|
|
|
|
|
|
|
|
void chunkqueue_set_tempdirs_default (const array *tempdirs, off_t upload_temp_file_size) {
|
|
|
|
chunkqueue_default_tempdirs = tempdirs;
|
|
|
|
chunkqueue_default_tempfile_size
|
|
|
|
= (0 == upload_temp_file_size) ? DEFAULT_TEMPFILE_SIZE
|
|
|
|
: (upload_temp_file_size > MAX_TEMPFILE_SIZE) ? MAX_TEMPFILE_SIZE
|
|
|
|
: upload_temp_file_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
void chunkqueue_set_tempdirs(chunkqueue * const restrict cq, const array * const restrict tempdirs, off_t upload_temp_file_size) {
|
|
|
|
force_assert(NULL != cq);
|
|
|
|
cq->tempdirs = tempdirs;
|
|
|
|
cq->upload_temp_file_size
|
|
|
|
= (0 == upload_temp_file_size) ? DEFAULT_TEMPFILE_SIZE
|
|
|
|
: (upload_temp_file_size > MAX_TEMPFILE_SIZE) ? MAX_TEMPFILE_SIZE
|
|
|
|
: upload_temp_file_size;
|
|
|
|
cq->tempdir_idx = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void chunkqueue_dup_file_chunk_fd (chunk * const restrict d, const chunk * const restrict c) {
|
|
|
|
/*assert(d != c);*/
|
|
|
|
/*assert(d->type == FILE_CHUNK);*/
|
|
|
|
/*assert(c->type == FILE_CHUNK);*/
|
|
|
|
if (c->file.fd >= 0) {
|
|
|
|
if (c->file.refchg) {
|
|
|
|
d->file.fd = c->file.fd;
|
|
|
|
d->file.ref = c->file.ref;
|
|
|
|
d->file.refchg = c->file.refchg;
|
|
|
|
d->file.refchg(d->file.ref, 1);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
d->file.fd = fdevent_dup_cloexec(c->file.fd);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void chunkqueue_steal_partial_file_chunk(chunkqueue * const restrict dest, const chunk * const restrict c, const off_t len) {
|
|
|
|
chunkqueue_append_file(dest, c->mem, c->offset, len);
|
|
|
|
chunkqueue_dup_file_chunk_fd(dest->last, c);
|
|
|
|
}
|
|
|
|
|
|
|
|
void chunkqueue_steal(chunkqueue * const restrict dest, chunkqueue * const restrict src, off_t len) {
|
|
|
|
while (len > 0) {
|
|
|
|
chunk *c = src->first;
|
|
|
|
off_t clen = 0, use;
|
|
|
|
|
|
|
|
if (NULL == c) break;
|
|
|
|
|
|
|
|
clen = chunk_remaining_length(c);
|
|
|
|
if (0 == clen) {
|
|
|
|
/* drop empty chunk */
|
|
|
|
src->first = c->next;
|
|
|
|
if (c == src->last) src->last = NULL;
|
|
|
|
chunk_release(c);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
use = len >= clen ? clen : len;
|
|
|
|
len -= use;
|
|
|
|
|
|
|
|
if (use == clen) {
|
|
|
|
/* move complete chunk */
|
|
|
|
src->first = c->next;
|
|
|
|
if (c == src->last) src->last = NULL;
|
|
|
|
|
|
|
|
chunkqueue_append_chunk(dest, c);
|
|
|
|
dest->bytes_in += use;
|
|
|
|
} else {
|
|
|
|
/* partial chunk with length "use" */
|
|
|
|
|
|
|
|
switch (c->type) {
|
|
|
|
case MEM_CHUNK:
|
|
|
|
chunkqueue_append_mem(dest, c->mem->ptr + c->offset, use);
|
|
|
|
break;
|
|
|
|
case FILE_CHUNK:
|
|
|
|
/* tempfile flag is in "last" chunk after the split */
|
|
|
|
chunkqueue_steal_partial_file_chunk(dest, c, use);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
c->offset += use;
|
|
|
|
force_assert(0 == len);
|
|
|
|
}
|
|
|
|
|
|
|
|
src->bytes_out += use;
|
|
|
|
}
|
|
|
|
}
|
|
|
|