mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-06-08 01:42:52 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Improve mbuf allocation behavior

Browse Source 
* Limit total amount of headroom, in absolute terms (`MBUF_SIZE_MAX_HEADROOM`).
 * If unable to allocate with headroom, fall back to allocating the required minimum.
 * For mOS, set default `MBUF_SIZE_MULTIPLIER` to 2 to avoid floating point operations.
   Since max headroom size is now capped to 128 bytes, this will not result in much of a bloat.

PUBLISHED_FROM=11d4fc65a46a805bb7c8960f89a3d0b753c58bb8
This commit is contained in:
Deomid Ryabkov 2018-03-21 22:00:58 +00:00 committed by Cesanta Bot
parent d16dbc197f
commit 0a90cab44a
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mongoose.c
View File

@ -1470,10 +1470,21 @@ size_t mbuf_insert(struct mbuf *a, size_t off, const void *buf, size_t len) {
} }
a->len += len; a->len += len;
} else { } else {
size_t new_size = (size_t)((a->len + len) * MBUF_SIZE_MULTIPLIER); size_t min_size = (a->len + len);
if ((p = (char *) MBUF_REALLOC(a->buf, new_size)) != NULL) { size_t new_size = (size_t)(min_size * MBUF_SIZE_MULTIPLIER);
if (new_size - min_size > MBUF_SIZE_MAX_HEADROOM) {
new_size = min_size + MBUF_SIZE_MAX_HEADROOM;
}
p = (char *) MBUF_REALLOC(a->buf, new_size);
if (p == NULL && new_size != min_size) {
new_size = min_size;
p = (char *) MBUF_REALLOC(a->buf, new_size);
}
if (p != NULL) {
a->buf = p; a->buf = p;
memmove(a->buf + off + len, a->buf + off, a->len - off); if (off != a->len) {
memmove(a->buf + off + len, a->buf + off, a->len - off);
}
if (buf != NULL) memcpy(a->buf + off, buf, len); if (buf != NULL) memcpy(a->buf + off, buf, len);
a->len += len; a->len += len;
a->size = new_size; a->size = new_size;

8
mongoose.h
View File

@ -1963,6 +1963,14 @@ extern "C" {
#define MBUF_SIZE_MULTIPLIER 1.5 #define MBUF_SIZE_MULTIPLIER 1.5
#endif #endif
#ifndef MBUF_SIZE_MAX_HEADROOM
#ifdef BUFSIZ
#define MBUF_SIZE_MAX_HEADROOM BUFSIZ
#else
#define MBUF_SIZE_MAX_HEADROOM 1024
#endif
#endif
/* Memory buffer descriptor */ /* Memory buffer descriptor */
struct mbuf { struct mbuf {
char *buf; /* Buffer pointer */ char *buf; /* Buffer pointer */