X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fnmem.h;h=6bffb6a052f5554e1c76550e85438c4589b35ae8;hb=9c75e92604fae1efd7137d085dd2281e7886345b;hp=da63a1a6e440f55448c751ebb0da29df6836bb67;hpb=e627986266d8fcda1b273c1ecab36400494bf76c;p=yaz-moved-to-github.git diff --git a/include/yaz/nmem.h b/include/yaz/nmem.h index da63a1a..6bffb6a 100644 --- a/include/yaz/nmem.h +++ b/include/yaz/nmem.h @@ -1,30 +1,30 @@ /* - * Copyright (C) 1995-2005, Index Data ApS + * Copyright (c) 1995-2007, Index Data + * All rights reserved. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: * - * Permission to use, copy, modify, distribute, and sell this software and - * its documentation, in whole or in part, for any purpose, is hereby granted, - * provided that: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * 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. + * * Neither the name of Index Data nor the names of its contributors + * may be used to endorse or promote products derived from this + * software without specific prior written permission. * - * 1. This copyright and permission notice appear in all copies of the - * software and its documentation. Notices of copyright or attribution - * which appear at the beginning of any file must remain unchanged. - * - * 2. The names of Index Data or the individual authors may not be used to - * endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND, - * EXPRESS, IMPLIED, OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY - * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - * IN NO EVENT SHALL INDEX DATA BE LIABLE FOR ANY SPECIAL, INCIDENTAL, - * INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR - * NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF - * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE - * OF THIS SOFTWARE. - * - * $Id: nmem.h,v 1.15 2005-05-02 19:14:33 adam Exp $ + * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS AND 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. */ +/* $Id: nmem.h,v 1.25 2007-04-17 20:26:18 adam Exp $ */ /** * \file nmem.h @@ -35,79 +35,62 @@ */ #ifndef NMEM_H #define NMEM_H -#include -#define NMEM_DEBUG 0 - -#ifndef NMEM_DEBUG -#define NMEM_DEBUG 0 -#endif +#include +#include YAZ_BEGIN_CDECL -typedef struct nmem_block -{ - char *buf; /* memory allocated in this block */ - int size; /* size of buf */ - int top; /* top of buffer */ - struct nmem_block *next; -} nmem_block; - -typedef struct nmem_control -{ - int total; - nmem_block *blocks; - struct nmem_control *next; -} nmem_control; - -typedef struct nmem_mutex *NMEM_MUTEX; -YAZ_EXPORT void nmem_mutex_create(NMEM_MUTEX *); -YAZ_EXPORT void nmem_mutex_enter(NMEM_MUTEX); -YAZ_EXPORT void nmem_mutex_leave(NMEM_MUTEX); -YAZ_EXPORT void nmem_mutex_destroy(NMEM_MUTEX *); - +/** \brief NMEM handle (an opaque pointer to memory) */ typedef struct nmem_control *NMEM; +/** \brief release all memory associaged with an NMEM handle */ YAZ_EXPORT void nmem_reset(NMEM n); +/** \brief returns size in bytes of memory for NMEM handle */ YAZ_EXPORT int nmem_total(NMEM n); + +/** \brief allocates string on NMEM handle (similar strdup) */ YAZ_EXPORT char *nmem_strdup (NMEM mem, const char *src); +/** \brief allocates string on NMEM handle - allows NULL ptr buffer */ +YAZ_EXPORT char *nmem_strdup_null (NMEM mem, const char *src); +/** \brief allocates string of certain size on NMEM handle */ YAZ_EXPORT char *nmem_strdupn (NMEM mem, const char *src, size_t n); -YAZ_EXPORT void nmem_strsplit_blank(NMEM nmem, const char *dstr, - char ***darray, int *num); + +/** \brief allocates sub strings out of string using certain delimitors + \param nmem NMEM handle + \param delim delimitor chars (splits on each char in there) + \param dstr string to be split + \param darray result string array for each sub string + \param num number of result strings +*/ YAZ_EXPORT void nmem_strsplit(NMEM nmem, const char *delim, - const char *dstr, - char ***darray, int *num); + const char *dstr, + char ***darray, int *num); + +/** \brief splits string into sub strings delimited by blanks + \param nmem NMEM handle + \param dstr string to be split + \param darray result string array for each sub string + \param num number of result strings +*/ +YAZ_EXPORT void nmem_strsplit_blank(NMEM nmem, const char *dstr, + char ***darray, int *num); +/** \brief creates and allocates integer for NMEM */ YAZ_EXPORT int *nmem_intdup (NMEM mem, int v); -YAZ_EXPORT void nmem_transfer (NMEM dst, NMEM src); -YAZ_EXPORT void nmem_critical_enter (void); -YAZ_EXPORT void nmem_critical_leave (void); - -#if NMEM_DEBUG - -YAZ_EXPORT NMEM nmem_create_f(const char *file, int line); -YAZ_EXPORT void nmem_destroy_f(const char *file, int line, NMEM n); -YAZ_EXPORT void *nmem_malloc_f(const char *file, int line, NMEM n, int size); -#define nmem_create() nmem_create_f(__FILE__, __LINE__) -#define nmem_destroy(x) nmem_destroy_f(__FILE__, __LINE__, (x)) -#define nmem_malloc(x, y) nmem_malloc_f(__FILE__, __LINE__, (x), (y)) - -YAZ_EXPORT void nmem_print_list (void); -YAZ_EXPORT void nmem_print_list_l (int level); - -#else +/** \brief transfers memory from one NMEM handle to another */ +YAZ_EXPORT void nmem_transfer (NMEM dst, NMEM src); +/** \brief returns new NMEM handle */ YAZ_EXPORT NMEM nmem_create(void); -YAZ_EXPORT void nmem_destroy(NMEM n); -YAZ_EXPORT void *nmem_malloc(NMEM n, int size); -#define nmem_print_list() +/** \brief destroys NMEM handle and memory associated with it */ +YAZ_EXPORT void nmem_destroy(NMEM n); -#endif +/** \brief allocate memory block on NMEM handle */ +YAZ_EXPORT void *nmem_malloc(NMEM n, int size); -YAZ_EXPORT void nmem_init (void); -YAZ_EXPORT void nmem_exit (void); YAZ_EXPORT int yaz_errno (void); YAZ_EXPORT void yaz_set_errno (int v); YAZ_EXPORT void yaz_strerror(char *buf, int max); @@ -115,3 +98,11 @@ YAZ_EXPORT void yaz_strerror(char *buf, int max); YAZ_END_CDECL #endif +/* + * Local variables: + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + * vim: shiftwidth=4 tabstop=8 expandtab + */ +