From a9407df0295ee7745827b2f053b3f4698857720d Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 26 Jun 2001 14:11:27 +0000 Subject: [PATCH] Added MUTEX functions for NMEM module (used by OID utility). --- include/yaz/nmem.h | 11 ++++++++- util/nmem.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++- util/oid.c | 37 ++++++++++++++++------------ 3 files changed, 99 insertions(+), 18 deletions(-) diff --git a/include/yaz/nmem.h b/include/yaz/nmem.h index 44d1cf8..b042f6e 100644 --- a/include/yaz/nmem.h +++ b/include/yaz/nmem.h @@ -24,7 +24,10 @@ * OF THIS SOFTWARE. * * $Log: nmem.h,v $ - * Revision 1.5 2001-03-25 21:55:12 adam + * Revision 1.6 2001-06-26 14:11:27 adam + * Added MUTEX functions for NMEM module (used by OID utility). + * + * Revision 1.5 2001/03/25 21:55:12 adam * Added odr_intdup. Ztest server returns TaskPackage for ItemUpdate. * * Revision 1.4 2000/05/09 11:48:58 adam @@ -83,6 +86,12 @@ typedef struct nmem_control 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 *); + typedef struct nmem_control *NMEM; YAZ_EXPORT void nmem_reset(NMEM n); diff --git a/util/nmem.c b/util/nmem.c index 9acaaee..d337d3f 100644 --- a/util/nmem.c +++ b/util/nmem.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: nmem.c,v $ - * Revision 1.24 2000-05-11 14:37:55 adam + * Revision 1.25 2001-06-26 14:11:27 adam + * Added MUTEX functions for NMEM module (used by OID utility). + * + * Revision 1.24 2000/05/11 14:37:55 adam * Minor changes. * * Revision 1.23 2000/05/09 10:55:05 adam @@ -125,6 +128,70 @@ static pthread_mutex_t nmem_mutex = PTHREAD_MUTEX_INITIALIZER; #define NMEM_LEAVE #endif + +struct nmem_mutex { +#ifdef WIN32 + CRITICAL_SECTION m_handle; +#elif _REENTRANT + pthread_mutex_t m_handle; +#else + int m_handle; +#endif +}; + +YAZ_EXPORT void nmem_mutex_create(NMEM_MUTEX *p) +{ + NMEM_ENTER; + if (!*p) + { + *p = malloc (sizeof(**p)); +#ifdef WIN32 + InitializeCriticalSection(&(*p)->m_handle); +#elif _REENTRANT + pthread_mutex_init (&(*p)->m_handle, 0); +#endif + } + NMEM_LEAVE; +} + +YAZ_EXPORT void nmem_mutex_enter(NMEM_MUTEX p) +{ + if (p) + { +#ifdef WIN32 + EnterCriticalSection(&p->m_handle); +#elif _REENTRANT + pthread_mutex_lock(&p->m_handle); +#endif + } +} + +YAZ_EXPORT void nmem_mutex_leave(NMEM_MUTEX p) +{ + if (p) + { +#ifdef WIN32 + LeaveCriticalSection(&p->m_handle); +#elif _REENTRANT + pthread_mutex_unlock(&p->m_handle); +#endif + } +} + +YAZ_EXPORT void nmem_mutex_destroy(NMEM_MUTEX *p) +{ + NMEM_ENTER; + if (*p) + { +#ifdef WIN32 + DeleteCriticalSection(&(*p)->m_handle); +#endif + free (*p); + *p = 0; + } + NMEM_LEAVE; +} + static nmem_block *freelist = NULL; /* "global" freelists */ static nmem_control *cfreelist = NULL; static int nmem_active_no = 0; diff --git a/util/oid.c b/util/oid.c index a37d65a..50b2ef2 100644 --- a/util/oid.c +++ b/util/oid.c @@ -3,7 +3,10 @@ * See the file LICENSE for details. * * $Log: oid.c,v $ - * Revision 1.45 2001-05-16 07:25:59 adam + * Revision 1.46 2001-06-26 14:11:27 adam + * Added MUTEX functions for NMEM module (used by OID utility). + * + * Revision 1.45 2001/05/16 07:25:59 adam * Modified oid_ent_to_oid so that if proto is general, then class * is ignored (only oid value is compared). * @@ -190,11 +193,13 @@ struct oident_list { static struct oident_list *oident_table = NULL; static int oid_value_dynamic = VAL_DYNAMIC; static int oid_init_flag = 0; +static NMEM_MUTEX oid_mutex = 0; +static NMEM oid_nmem = 0; /* * OID database */ -static oident oids[] = +static oident standard_oids[] = { /* General definitions */ {PROTO_GENERAL, CLASS_TRANSYN, VAL_BER, {2,1,1,-1}, @@ -591,21 +596,21 @@ void oid_init (void) no thread may exit oid_init before all OID's bave been transferred - which is why checked is set after oid_transfer... */ - oid_transfer (oids); + nmem_mutex_create (&oid_mutex); + nmem_mutex_enter (oid_mutex); + if (!oid_nmem) + oid_nmem = nmem_create (); + nmem_mutex_leave (oid_mutex); + oid_transfer (standard_oids); oid_init_flag = 1; } void oid_exit (void) { - while (oident_table) - { - struct oident_list *this_p = oident_table; - oident_table = oident_table->next; - - xfree (this_p->oident.desc); - xfree (this_p); - } oid_init_flag = 0; + oid_nmem = 0; + nmem_mutex_destroy (&oid_mutex); + nmem_destroy (oid_nmem); } static struct oident *oid_getentbyoid_x(int *o) @@ -678,13 +683,14 @@ struct oident *oid_addent (int *oid, enum oid_proto proto, { struct oident *oident; - nmem_critical_enter (); + nmem_mutex_enter (oid_mutex); oident = oid_getentbyoid_x (oid); if (!oident) { char desc_str[200]; struct oident_list *oident_list; - oident_list = (struct oident_list *) xmalloc (sizeof(*oident_list)); + oident_list = (struct oident_list *) + nmem_malloc (oid_nmem, sizeof(*oident_list)); oident = &oident_list->oident; oident->proto = proto; oident->oclass = oclass; @@ -698,8 +704,7 @@ struct oident *oid_addent (int *oid, enum oid_proto proto, sprintf (desc_str+strlen(desc_str), ".%d", oid[i]); desc = desc_str; } - oident->desc = (char *) xmalloc (strlen(desc)+1); - strcpy (oident->desc, desc); + oident->desc = nmem_strdup (oid_nmem, desc); if (value == VAL_DYNAMIC) oident->value = (enum oid_value) (++oid_value_dynamic); else @@ -708,7 +713,7 @@ struct oident *oid_addent (int *oid, enum oid_proto proto, oident_list->next = oident_table; oident_table = oident_list; } - nmem_critical_leave (); + nmem_mutex_leave (oid_mutex); return oident; } -- 1.7.10.4