Attachment 29074 Details for Bug 66534

[patch] adds mutex synchronization to e2fsprogs/lib/et

et_lock.dif (text/plain), 5.09 KB, created by Marius Tomaschewski on 2005-03-01 13:47:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marius Tomaschewski

Created: 2005-03-01 13:47:24 UTC

Size: 5.09 KB

patch

obsolete

>--- e2fsprogs-1.36/lib/et/com_err.pc.in
>+++ e2fsprogs-1.36/lib/et/com_err.pc.in	2005-02-28 14:00:25.842064343 +0100
>@@ -7,5 +7,5 @@
> Description: Common error description library
> Version: @E2FSPROGS_VERSION@
> Requires:
>-Cflags: -I${includedir} 
>-Libs: -L${libdir} -lcom_err
>+Cflags: -I${includedir} -pthread
>+Libs: -L${libdir} -lcom_err -pthread
>--- e2fsprogs-1.36/lib/et/error_message.c
>+++ e2fsprogs-1.36/lib/et/error_message.c	2005-02-28 17:59:37.519629288 +0100
>@@ -20,6 +20,7 @@
> #include <stdlib.h>
> #include <string.h>
> #include <errno.h>
>+#include <pthread.h>
> #include "com_err.h"
> #include "error_table.h"
> #include "internal.h"
>@@ -28,6 +29,23 @@
> 
> struct et_list * _et_list = (struct et_list *) NULL;
> 
>+struct et_denv {
>+    struct et_denv *next;
>+    struct et_list  et_list;
>+};
>+static struct et_denv  * _et_denv  = NULL;
>+
>+static pthread_mutex_t   _et_lock  = PTHREAD_MUTEX_INITIALIZER;
>+
>+int          et_list_lock()
>+{
>+    return pthread_mutex_lock(&_et_lock);
>+}
>+
>+int          et_list_unlock()
>+{
>+    return pthread_mutex_unlock(&_et_lock);
>+}
> 
> const char * error_message (errcode_t code)
> {
>@@ -53,14 +71,20 @@
> 	    goto oops;
> #endif
>     }
>+    et_list_lock();
>     for (et = _et_list; et; et = et->next) {
> 	if (et->table->base == table_num) {
> 	    /* This is the right table */
>-	    if (et->table->n_msgs <= offset)
>-		goto oops;
>-	    return(et->table->msgs[offset]);
>+	    if (et->table->n_msgs <= offset) {
>+		break;
>+	    } else {
>+		const char *msg = et->table->msgs[offset];
>+		et_list_unlock();
>+		return(msg);
>+	    }
> 	}
>     }
>+    et_list_unlock();
> oops:
>     strcpy (buffer, "Unknown code ");
>     if (table_num) {
>@@ -88,22 +112,52 @@
>  */
> errcode_t add_error_table(const struct error_table * et)
> {
>+    if( 0 == et_list_lock()) {
> 	struct et_list *el = _et_list;
>+	struct et_denv *ev;
> 
> 	while (el) {
>-		if (el->table->base == et->base)
>+		if (el->table->base == et->base) {
>+			et_list_unlock();
> 			return EEXIST;
>+		}
> 		el = el->next;
> 	}
> 
>-	if (!(el = (struct et_list *) malloc(sizeof(struct et_list))))
>+	if (!(ev = (struct et_denv *) malloc(sizeof(struct et_denv)))) {
>+		et_list_unlock();
> 		return ENOMEM;
>-
>+	}
>+	ev->next = _et_denv;
>+	_et_denv = ev;
>+	el = &ev->et_list;
> 	el->table = et;
> 	el->next = _et_list;
> 	_et_list = el;
>+	et_list_unlock();
>+    }
>+    return 0;
>+}
>+
>+void
>+free_denv_nolock(struct et_list *el)
>+{
>+    struct et_denv *prev = NULL;
>+    struct et_denv *curr = _et_denv;
> 
>-	return 0;
>+    while( curr) {
>+	if( &curr->et_list == el) {
>+	    if( prev) {
>+		prev->next = curr->next;
>+	    } else {
>+		_et_denv   = curr->next;
>+	    }
>+	    free(curr);
>+	    return;
>+	}
>+	prev = curr;
>+	curr = curr->next;
>+    }
> }
> 
> /*
>@@ -111,6 +165,7 @@
>  */
> errcode_t remove_error_table(const struct error_table * et)
> {
>+    if( 0 == et_list_lock()) {
> 	struct et_list *el = _et_list;
> 	struct et_list *el2 = 0;
> 
>@@ -120,13 +175,16 @@
> 				el2->next = el->next;
> 			else
> 				_et_list = el->next;
>-			(void) free(el);
>+			free_denv_nolock(el);
>+			et_list_unlock();
> 			return 0;
> 		}
> 		el2 = el;
> 		el = el->next;
> 	}
>-	return ENOENT;
>+	et_list_unlock();
>+    }
>+    return ENOENT;
> }
> 
> /*
>@@ -137,3 +195,4 @@
> {
> 	add_error_table(new_table->table);
> }
>+
>--- e2fsprogs-1.36/lib/et/error_table.h
>+++ e2fsprogs-1.36/lib/et/error_table.h	2005-02-28 16:11:34.324580417 +0100
>@@ -19,6 +19,8 @@
>     const struct error_table *table;
> };
> extern struct et_list * _et_list;
>+extern int               et_list_lock(void);
>+extern int               et_list_unlock(void);
> 
> #define	ERRCODE_RANGE	8	/* # of bits to shift table number */
> #define	BITS_PER_CHAR	6	/* # bits to shift per character in name */
>--- e2fsprogs-1.36/lib/et/et_c.awk
>+++ e2fsprogs-1.36/lib/et/et_c.awk	2005-02-28 17:58:24.535540772 +0100
>@@ -221,6 +221,8 @@
> 	print "    const struct error_table * table;" > outfile
> 	print "};" > outfile
> 	print "extern struct et_list *_et_list;" > outfile
>+	print "extern int    et_list_lock();" > outfile
>+	print "extern int    et_list_unlock();" > outfile
> 	print "" > outfile
> 	if (tab_base_high == 0) {
> 		print "const struct error_table et_" table_name "_error_table = { text, " \
>@@ -237,11 +239,21 @@
> 	print "void initialize_" table_name "_error_table(void);" > outfile
> 	print "" > outfile
> 	print "void initialize_" table_name "_error_table(void) {" > outfile
>-	print "    if (!link.table) {" > outfile
>+	print "    et_list_lock();" > outfile
>+	print "    if ( !link.table) {" > outfile
>+	print "        struct et_list *el = _et_list;" > outfile
>+	print "        while (el) {" > outfile
>+	print "            if (el->table->base == et_" table_name "_error_table.base) {" > outfile
>+	print "               et_list_unlock();" > outfile
>+	print "               return;" > outfile
>+	print "            }" > outfile
>+	print "            el = el->next;" > outfile
>+	print "        }" > outfile
> 	print "        link.next = _et_list;" > outfile
> 	print "        link.table = &et_" table_name "_error_table;" > outfile
> 	print "        _et_list = &link;" > outfile
> 	print "    }" > outfile
>+	print "    et_list_unlock();" > outfile
> 	print "}" > outfile
> 	print "" > outfile
> 	print "/* For Heimdal compatibility */" > outfile

Actions: View | Diff

Attachments on bug 66534: 29074 | 29075 | 29077 | 29079 | 41136 | 41137 | 41139 | 41140