Wed, 21 Jan 2015 20:38:21 +0100
fixed memory allocation bug
/* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. * * Copyright 2014 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 * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN * 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 <stdio.h> #include <stdlib.h> #include <string.h> #include "document.h" static UcxMap *documents; void uic_docmgr_init() { documents = ucx_map_new(32); } void ui_set_document(UiObject *obj, void *document) { obj->ctx->set_document(obj->ctx, document); } void ui_detach_document(UiObject *obj, void *document) { obj->ctx->detach_document(obj->ctx, document); } void* ui_get_document(UiObject *obj) { return obj->ctx->document; } void ui_set_subdocument(void *document, void *sub) { UiContext *ctx = ui_document_context(document); if(!ctx) { fprintf(stderr, "UI Error: pointer is not a document\n"); } uic_context_set_document(ctx, sub); } void ui_detach_subdocument(void *document, void *sub) { UiContext *ctx = ui_document_context(document); if(!ctx) { fprintf(stderr, "UI Error: pointer is not a document\n"); } uic_context_detach_document(ctx, sub); } void* ui_get_subdocument(void *document) { UiContext *ctx = ui_document_context(document); if(!ctx) { fprintf(stderr, "UI Error: pointer is not a document\n"); } return ctx->document; } void* ui_document_new(size_t size) { UcxMempool *mp = ucx_mempool_new(256); UiContext *ctx = ucx_mempool_calloc(mp, 1, sizeof(UiContext)); ctx->set_document = uic_context_set_document; ctx->detach_document = uic_context_detach_document; ctx->mempool = mp; ctx->vars = ucx_map_new_a(mp->allocator, 16); void *document = ucx_mempool_calloc(mp, 1, size); ucx_map_put(documents, ucx_key(&document, sizeof(void*)), ctx); return document; } void ui_document_destroy(void *doc) { // TODO } UiContext* ui_document_context(void *doc) { if(doc) { return ucx_map_get(documents, ucx_key(&doc, sizeof(void*))); } else { return NULL; } } void* ui_document_malloc(void *doc, size_t size) { UiContext *uidoc = ui_document_context(doc); return ucx_mempool_malloc(uidoc->mempool, size); } void* ui_document_calloc(void *doc, size_t nelem, size_t elsize) { UiContext *uidoc = ucx_map_get(documents, ucx_key(&doc, sizeof(void*))); return ucx_mempool_calloc(uidoc->mempool, nelem, elsize); } void ui_document_free(void *doc, void *ptr) { UiContext *uidoc = ucx_map_get(documents, ucx_key(&doc, sizeof(void*))); ucx_mempool_free(uidoc->mempool, ptr); } void* ui_document_realloc(void *doc, void *ptr, size_t size) { UiContext *uidoc = ucx_map_get(documents, ucx_key(&doc, sizeof(void*))); return ucx_mempool_realloc(uidoc->mempool, ptr, size); } void uic_document_addvar(void *doc, char *name, int type, size_t vs) { // TODO: remove UiContext *ctx = ui_document_context(doc); if(ctx) { UiVar *newvar = ucx_mempool_malloc(ctx->mempool, sizeof(UiVar)); newvar->isextern = 0; newvar->type = type; newvar->value = ucx_mempool_calloc(ctx->mempool, 1, vs); newvar->from = NULL; uic_add_var(ctx, name, newvar, type, vs); } } void ui_document_addint(void *doc, char *name) { uic_document_addvar(doc, name, UI_VAR_INTEGER, sizeof(UiInteger)); } void ui_document_regint(void *doc, char *name, UiInteger *i) { UiContext *ctx = ui_document_context(doc); if(ctx) { uic_reg_var(ctx, name, UI_VAR_INTEGER, sizeof(UiInteger), i); } } void ui_document_regtext(void *doc, char *name, UiText *text) { UiContext *ctx = ui_document_context(doc); if(ctx) { uic_reg_var(ctx, name, UI_VAR_TEXT, sizeof(UiText), text); } } void ui_document_reglist(void *doc, char *name, UiList *list) { UiContext *ctx = ui_document_context(doc); if(ctx) { UiListVar *lv = ui_document_malloc(doc, sizeof(UiListVar)); UiListPtr *lp = ui_document_malloc(doc, sizeof(UiListPtr)); lv->listptr = lp; lp->list = list; uic_reg_var(ctx, name, UI_VAR_LIST, sizeof(UiListPtr), lv); } }