From 9c91aa26411a449f26cf5e0b7fb588f8a71977a8 Mon Sep 17 00:00:00 2001 From: Michael Graff Date: Fri, 24 Sep 1999 23:26:23 +0000 Subject: [PATCH] add a function to initialize a block of mutexes, and to destroy them. --- lib/isc/Makefile.in | 12 ++++-- lib/isc/include/isc/Makefile.in | 3 +- lib/isc/include/isc/mutexblock.h | 67 ++++++++++++++++++++++++++++++++ lib/isc/mutexblock.c | 57 +++++++++++++++++++++++++++ 4 files changed, 134 insertions(+), 5 deletions(-) create mode 100644 lib/isc/include/isc/mutexblock.h create mode 100644 lib/isc/mutexblock.c diff --git a/lib/isc/Makefile.in b/lib/isc/Makefile.in index e4390b8a4a..c7e9bc9301 100644 --- a/lib/isc/Makefile.in +++ b/lib/isc/Makefile.in @@ -43,16 +43,20 @@ PTHREADOBJS = pthreads/condition.@O@ OBJS = @ISC_EXTRA_OBJS@ \ assertions.@O@ base64.@O@ bitstring.@O@ buffer.@O@ \ bufferlist.@O@ error.@O@ event.@O@ heap.@O@ lex.@O@ lib.@O@ \ - log.@O@ mem.@O@ result.@O@ rwlock.@O@ serial.@O@ sockaddr.@O@ \ - str.@O@ symtab.@O@ task.@O@ timer.@O@ version.@O@ \ + log.@O@ mem.@O@ mutexblock.@O@ result.@O@ rwlock.@O@ \ + serial.@O@ \ + sockaddr.@O@ str.@O@ symtab.@O@ task.@O@ timer.@O@ \ + version.@O@ \ ${UNIXOBJS} ${NLSOBJS} ${PTHREADOBJS} # Alphabetically SRCS = @ISC_EXTRA_SRCS@ \ assertions.c base64.c bitstring.c buffer.c \ bufferlist.c error.c event.c heap.c lex.c lib.c \ - log.c mem.c result.c rwlock.c serial.c sockaddr.c \ - str.c symtab.c task.c timer.c version.c + log.c mem.c mutexblock.c result.c rwlock.c \ + serial.c \ + sockaddr.c str.c symtab.c task.c timer.c \ + version.c LIBS = @LIBS@ diff --git a/lib/isc/include/isc/Makefile.in b/lib/isc/include/isc/Makefile.in index 8f862a6cc5..4008deadf5 100644 --- a/lib/isc/include/isc/Makefile.in +++ b/lib/isc/include/isc/Makefile.in @@ -22,7 +22,8 @@ top_srcdir = @top_srcdir@ HEADERS = assertions.h base64.h boolean.h buffer.h bufferlist.h \ error.h event.h \ eventclass.h heap.h int.h interfaceiter.h lang.h lex.h lib.h \ - list.h mem.h msgcat.h netaddr.h rbtgen.h region.h result.h \ + list.h mem.h msgcat.h mutexblock.h netaddr.h rbtgen.h \ + region.h result.h \ resultclass.h rwlock.h serial.h sockaddr.h socket.h str.h \ symtab.h task.h timer.h types.h diff --git a/lib/isc/include/isc/mutexblock.h b/lib/isc/include/isc/mutexblock.h new file mode 100644 index 0000000000..2786931631 --- /dev/null +++ b/lib/isc/include/isc/mutexblock.h @@ -0,0 +1,67 @@ +/* + * Copyright (C) 1999 Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS + * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE + * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + */ + +#ifndef ISC_MUTEXBLOCK_H +#define ISC_MUTEXBLOCK_H 1 + +#include +#include +#include + +ISC_LANG_BEGINDECLS + +isc_result_t +isc_mutex_initblock(isc_mutex_t *block, unsigned int count); +/* + * Initialize a block of locks. If an error occurs all initialized locks + * will be destroyed, if possible. + * + * Requires: + * + * block != NULL + * + * count > 0 + * + * Returns: + * + * Any code isc_mutex_init() can return is a valid return for this + * function. + */ + +isc_result_t +isc_mutex_destroyblock(isc_mutex_t *block, unsigned int count); +/* + * Destroy a block of locks. + * + * Requires: + * + * block != NULL + * + * count > 0 + * + * Each lock in the block be initialized via isc_mutex_init() or + * the whole block was initialized via isc_mutex_initblock(). + * + * Returns: + * + * Any code isc_mutex_init() can return is a valid return for this + * function. + */ + +ISC_LANG_ENDDECLS + +#endif /* ISC_MUTEXBLOCK_H */ diff --git a/lib/isc/mutexblock.c b/lib/isc/mutexblock.c new file mode 100644 index 0000000000..df8b7e95c6 --- /dev/null +++ b/lib/isc/mutexblock.c @@ -0,0 +1,57 @@ +/* + * Copyright (C) 1999 Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS + * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE + * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + */ + +#include + +#include +#include + +isc_result_t +isc_mutex_initblock(isc_mutex_t *block, unsigned int count) +{ + isc_result_t result; + unsigned int i; + + for (i = 0 ; i < count ; i++) { + result = isc_mutex_init(&block[i]); + if (result != ISC_R_SUCCESS) { + i--; + while (i > 0) { + isc_mutex_destroy(&block[i]); + i--; + } + return (result); + } + } + + return (ISC_R_SUCCESS); +} + +isc_result_t +isc_mutex_destroyblock(isc_mutex_t *block, unsigned int count) +{ + isc_result_t result; + unsigned int i; + + for (i = 0 ; i < count ; i++) { + result = isc_mutex_destroy(&block[i]); + if (result != ISC_R_SUCCESS) + return (result); + } + + return (ISC_R_SUCCESS); +}