webserver: comparison src/ucx/mempool.c

-:ddfead6ea863
+:4784c14aa639
 /*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
-* Copyright 2016 Olaf Wintermann. All rights reserved.
+* Copyright 2017 Mike Becker, Olaf Wintermann All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 *
 *   1. Redistributions of source code must retain the above copyright
 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 * POSSIBILITY OF SUCH DAMAGE.
 */
+#include "ucx/mempool.h"
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 #ifdef __cplusplus
 #define __STDC_FORMAT_MACROS
 #endif
 #include <inttypes.h>
-#include "mempool.h"
 /** Capsule for destructible memory chunks. */
 typedef struct {
 /** The destructor for the memory chunk. */
 ucx_destructor destructor;
 ucx_destructor destructor;
 /** A pointer to the data. */
 void           *ptr;
 } ucx_regdestr;
-UCX_EXTERN void ucx_mempool_shared_destr(void* ptr) {
+#ifdef __cplusplus
+extern "C"
+#endif
+void ucx_mempool_shared_destr(void* ptr) {
 ucx_regdestr *rd = (ucx_regdestr*)ptr;
 rd->destructor(rd->ptr);
 }
 UcxMempool *ucx_mempool_new(size_t n) {
+size_t poolsz;
+if(ucx_szmul(n, sizeof(void*), &poolsz)) {
+return NULL;
+}
 UcxMempool *pool = (UcxMempool*)malloc(sizeof(UcxMempool));
 if (!pool) {
 return NULL;
 }
-pool->data = (void**) malloc(n * sizeof(void*));
+pool->data = (void**) malloc(poolsz);
 if (pool->data == NULL) {
 free(pool);
 return NULL;
 }
 return pool;
 }
 int ucx_mempool_chcap(UcxMempool *pool, size_t newcap) {
-void **data = (void**) realloc(pool->data, newcap*sizeof(void*));
+if (newcap < pool->ndata) {
+return 1;
+}
+size_t newcapsz;
+if(ucx_szmul(newcap, sizeof(void*), &newcapsz)) {
+return 1;
+}
+void **data = (void**) realloc(pool->data, newcapsz);
 if (data) {
 pool->data = data;
 pool->size = newcap;
-return EXIT_SUCCESS;
+return 0;
 } else {
-return EXIT_FAILURE;
+return 1;
 }
 }
 void *ucx_mempool_malloc(UcxMempool *pool, size_t n) {
+if(((size_t)-1) - sizeof(ucx_destructor) < n) {
+return NULL;
+}
 if (pool->ndata >= pool->size) {
-// The hard coded 16 is documented for this function and ucx_mempool_new
+size_t newcap = pool->size*2;
-if (ucx_mempool_chcap(pool, pool->size + 16) == EXIT_FAILURE) {
+if (newcap < pool->size || ucx_mempool_chcap(pool, newcap)) {
 return NULL;
 }
 }
-ucx_memchunk *mem = (ucx_memchunk*)malloc(sizeof(ucx_destructor) + n);
+void *p = malloc(sizeof(ucx_destructor) + n);
+ucx_memchunk *mem = (ucx_memchunk*)p;
 if (!mem) {
 return NULL;
 }
 mem->destructor = NULL;
 return &(mem->c);
 }
 void *ucx_mempool_calloc(UcxMempool *pool, size_t nelem, size_t elsize) {
-void *ptr = ucx_mempool_malloc(pool, nelem*elsize);
+size_t msz;
+if(ucx_szmul(nelem, elsize, &msz)) {
+return NULL;
+}
+void *ptr = ucx_mempool_malloc(pool, msz);
 if (!ptr) {
 return NULL;
 }
 memset(ptr, 0, nelem * elsize);
 return ptr;
 }
 void *ucx_mempool_realloc(UcxMempool *pool, void *ptr, size_t n) {
+if(((size_t)-1) - sizeof(ucx_destructor) < n) {
+return NULL;
+}
 char *mem = ((char*)ptr) - sizeof(ucx_destructor);
 char *newm = (char*) realloc(mem, n + sizeof(ucx_destructor));
 if (!newm) {
 return NULL;
 }
 return newm + sizeof(ucx_destructor);
 }
 }
 fprintf(stderr, "FATAL: 0x%08" PRIxPTR" not in mpool 0x%08" PRIxPTR"\n",
 (intptr_t)ptr, (intptr_t)pool);
-exit(EXIT_FAILURE);
+abort();
 } else {
 return newm + sizeof(ucx_destructor);
 }
 }
 return;
 }
 }
 fprintf(stderr, "FATAL: 0x%08" PRIxPTR" not in mpool 0x%08" PRIxPTR"\n",
 (intptr_t)ptr, (intptr_t)pool);
-exit(EXIT_FAILURE);
+abort();
 }
 void ucx_mempool_destroy(UcxMempool *pool) {
 ucx_memchunk *chunk;
 for(size_t i=0 ; i<pool->ndata ; i++) {

Mercurial > hg > webserver / file comparison

comparison: src/ucx/mempool.c

src/ucx/mempool.c