diff options
5 files changed, 264 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series index 77f4b15d..0f36126b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -64,3 +64,7 @@ bootshell0008-XXX-proc-fix-build.patch bootshell0009-fu_bootshell.patch bootshell0010-fixup_bootshell.patch bootshell0011-fixup_bootshell.patch +translators-list0001-libfshelp-acquire-references-to-control-ports.patch +translators-list0002-fu.patch +translators-list0003-libfshelp-improve-translator-list.patch +translators-list0004-add-iteration.patch diff --git a/debian/patches/translators-list0001-libfshelp-acquire-references-to-control-ports.patch b/debian/patches/translators-list0001-libfshelp-acquire-references-to-control-ports.patch new file mode 100644 index 00000000..76c71019 --- /dev/null +++ b/debian/patches/translators-list0001-libfshelp-acquire-references-to-control-ports.patch @@ -0,0 +1,59 @@ +From 3ca5ff92bfa08b55b5c41feea81612d4e7b468a0 Mon Sep 17 00:00:00 2001 +From: Justus Winter <4winter@informatik.uni-hamburg.de> +Date: Fri, 20 Nov 2015 12:46:56 +0100 +Subject: [PATCH hurd 1/4] libfshelp: acquire references to control ports + +* libfshelp/translator-list.c (translator_ihash_cleanup): Release reference. +(fshelp_set_active_translator): Acquire reference +--- + libfshelp/translator-list.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/libfshelp/translator-list.c b/libfshelp/translator-list.c +index c87bbaa..87d7f6a 100644 +--- a/libfshelp/translator-list.c ++++ b/libfshelp/translator-list.c +@@ -49,12 +49,13 @@ static pthread_mutex_t translator_ihash_lock = PTHREAD_MUTEX_INITIALIZER; + static void + translator_ihash_cleanup (void *element, void *arg) + { ++ error_t err; + struct translator *translator = element; + + if (translator->pi) + ports_port_deref (translator->pi); +- /* No need to deallocate translator->active, we only keep the name of +- the port, not a reference. */ ++ err = mach_port_deallocate (mach_task_self (), translator->active); ++ assert_perror (err); + free (translator->name); + free (translator); + } +@@ -124,8 +125,14 @@ fshelp_set_active_translator (struct port_info *pi, + t->pi = pi; + } + +- /* No need to increment the reference count, we only keep the +- name, not a reference. */ ++ if (MACH_PORT_VALID (t->active)) ++ { ++ err = mach_port_deallocate (mach_task_self (), t->active); ++ assert_perror (err); ++ } ++ err = mach_port_mod_refs (mach_task_self (), active, ++ MACH_PORT_RIGHT_SEND, +1); ++ assert_perror (err); + t->active = active; + } + else +@@ -143,6 +150,7 @@ error_t + fshelp_remove_active_translator (mach_port_t active) + { + error_t err = 0; ++ + pthread_mutex_lock (&translator_ihash_lock); + + struct translator *t = NULL; +-- +2.1.4 + diff --git a/debian/patches/translators-list0002-fu.patch b/debian/patches/translators-list0002-fu.patch new file mode 100644 index 00000000..ad167825 --- /dev/null +++ b/debian/patches/translators-list0002-fu.patch @@ -0,0 +1,45 @@ +From dd1590c850028fa21339c21216ec08b4295be104 Mon Sep 17 00:00:00 2001 +From: Justus Winter <4winter@informatik.uni-hamburg.de> +Date: Fri, 27 Nov 2015 20:52:23 +0100 +Subject: [PATCH hurd 2/4] fu + +--- + libfshelp/translator-list.c | 12 +++++++++--- + 1 file changed, 9 insertions(+), 3 deletions(-) + +diff --git a/libfshelp/translator-list.c b/libfshelp/translator-list.c +index 87d7f6a..8f0bfae 100644 +--- a/libfshelp/translator-list.c ++++ b/libfshelp/translator-list.c +@@ -55,7 +55,9 @@ translator_ihash_cleanup (void *element, void *arg) + if (translator->pi) + ports_port_deref (translator->pi); + err = mach_port_deallocate (mach_task_self (), translator->active); +- assert_perror (err); ++ //assert_perror (err); ++ if (err) ++ error (0, err, "%s:%d:mach_port_deallocate", __FILE__, __LINE__); + free (translator->name); + free (translator); + } +@@ -128,11 +130,15 @@ fshelp_set_active_translator (struct port_info *pi, + if (MACH_PORT_VALID (t->active)) + { + err = mach_port_deallocate (mach_task_self (), t->active); +- assert_perror (err); ++ //assert_perror (err); ++ if (err) ++ error (0, err, "%s:%d:mach_port_deallocate", __FILE__, __LINE__); + } + err = mach_port_mod_refs (mach_task_self (), active, + MACH_PORT_RIGHT_SEND, +1); +- assert_perror (err); ++ //assert_perror (err); ++ if (err) ++ error (0, err, "%s:%d:mach_port_mod_refs", __FILE__, __LINE__); + t->active = active; + } + else +-- +2.1.4 + diff --git a/debian/patches/translators-list0003-libfshelp-improve-translator-list.patch b/debian/patches/translators-list0003-libfshelp-improve-translator-list.patch new file mode 100644 index 00000000..4816fc8f --- /dev/null +++ b/debian/patches/translators-list0003-libfshelp-improve-translator-list.patch @@ -0,0 +1,128 @@ +From 0b42fd844d9c73d73ff9ac7e422c5fea5c06d50d Mon Sep 17 00:00:00 2001 +From: Justus Winter <4winter@informatik.uni-hamburg.de> +Date: Tue, 24 Nov 2015 01:20:57 +0100 +Subject: [PATCH hurd 3/4] libfshelp: improve translator list + +Use the path names of active translators as keys in the hash table. + +* libfshelp/translator-list.c (hash, compare): New functions. +(translator_ihash): Use generalized key interface. +(fshelp_set_active_translator): Update accordingly. +(fshelp_remove_active_translator): Likewise. +--- + libfshelp/translator-list.c | 60 +++++++++++++++++++++++++++------------------ + 1 file changed, 36 insertions(+), 24 deletions(-) + +diff --git a/libfshelp/translator-list.c b/libfshelp/translator-list.c +index 8f0bfae..d13a501 100644 +--- a/libfshelp/translator-list.c ++++ b/libfshelp/translator-list.c +@@ -1,6 +1,6 @@ + /* A list of active translators. + +- Copyright (C) 2013,14 Free Software Foundation, Inc. ++ Copyright (C) 2013,14,15 Free Software Foundation, Inc. + + Written by Justus Winter <4winter@informatik.uni-hamburg.de> + +@@ -39,18 +39,12 @@ struct translator + mach_port_t active; + }; + +-/* The list of active translators. */ +-static struct hurd_ihash translator_ihash +- = HURD_IHASH_INITIALIZER (HURD_IHASH_NO_LOCP); +- +-/* The lock protecting the translator_ihash. */ +-static pthread_mutex_t translator_ihash_lock = PTHREAD_MUTEX_INITIALIZER; +- ++/* The hash table requires some callback functions. */ + static void +-translator_ihash_cleanup (void *element, void *arg) ++cleanup (void *value, void *arg) + { + error_t err; +- struct translator *translator = element; ++ struct translator *translator = value; + + if (translator->pi) + ports_port_deref (translator->pi); +@@ -62,6 +56,27 @@ translator_ihash_cleanup (void *element, void *arg) + free (translator); + } + ++static hurd_ihash_key_t ++hash (void *key) ++{ ++ const char *path = key; ++ return (hurd_ihash_key_t) hurd_ihash_hash32 (path, strlen (path), 0); ++} ++ ++static int ++compare (void *a, void *b) ++{ ++ return strcmp ((const char *) a, (const char *) b) == 0; ++} ++ ++/* The list of active translators. */ ++static struct hurd_ihash translator_ihash ++ = HURD_IHASH_INITIALIZER_GKI (HURD_IHASH_NO_LOCP, cleanup, NULL, ++ hash, compare); ++ ++/* The lock protecting the translator_ihash. */ ++static pthread_mutex_t translator_ihash_lock = PTHREAD_MUTEX_INITIALIZER; ++ + /* Record an active translator being bound to the given file name + NAME. ACTIVE is the control port of the translator. */ + error_t +@@ -70,20 +85,16 @@ fshelp_set_active_translator (struct port_info *pi, + mach_port_t active) + { + error_t err = 0; +- pthread_mutex_lock (&translator_ihash_lock); +- +- if (! translator_ihash.cleanup) +- hurd_ihash_set_cleanup (&translator_ihash, translator_ihash_cleanup, NULL); ++ struct translator *t; ++ hurd_ihash_locp_t slot; + +- struct translator *t = NULL; +- HURD_IHASH_ITERATE (&translator_ihash, value) +- { +- t = value; +- if (strcmp (name, t->name) == 0) +- goto update; /* Entry exists. */ +- } ++ pthread_mutex_lock (&translator_ihash_lock); ++ t = hurd_ihash_locp_find (&translator_ihash, (hurd_ihash_key_t) name, ++ &slot); ++ if (t) ++ goto update; /* Entry exists. */ + +- t = malloc (sizeof (struct translator)); ++ t = malloc (sizeof *t); + if (! t) + { + err = errno; +@@ -100,7 +111,8 @@ fshelp_set_active_translator (struct port_info *pi, + goto out; + } + +- err = hurd_ihash_add (&translator_ihash, (hurd_ihash_key_t) t, t); ++ err = hurd_ihash_locp_add (&translator_ihash, slot, ++ (hurd_ihash_key_t) t->name, t); + if (err) + goto out; + +@@ -171,7 +183,7 @@ fshelp_remove_active_translator (mach_port_t active) + } + + if (t) +- hurd_ihash_remove (&translator_ihash, (hurd_ihash_key_t) t); ++ hurd_ihash_remove (&translator_ihash, (hurd_ihash_key_t) t->name); + + pthread_mutex_unlock (&translator_ihash_lock); + return err; +-- +2.1.4 + diff --git a/debian/patches/translators-list0004-add-iteration.patch b/debian/patches/translators-list0004-add-iteration.patch new file mode 100644 index 00000000..308bd553 --- /dev/null +++ b/debian/patches/translators-list0004-add-iteration.patch @@ -0,0 +1,28 @@ +From a8c4d36d801962ad46997447866b883eb38f6de1 Mon Sep 17 00:00:00 2001 +From: Justus Winter <4winter@informatik.uni-hamburg.de> +Date: Fri, 20 Nov 2015 12:47:06 +0100 +Subject: [PATCH hurd 4/4] add iteration + +--- + libfshelp/translator-list.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/libfshelp/translator-list.c b/libfshelp/translator-list.c +index d13a501..d68ba1e 100644 +--- a/libfshelp/translator-list.c ++++ b/libfshelp/translator-list.c +@@ -242,3 +242,11 @@ fshelp_get_active_translators (char **translators, + pthread_mutex_unlock (&translator_ihash_lock); + return err; + } ++ ++/* For each active node, call FUN. The node is to be locked around the call ++ to FUN. If FUN returns non-zero for any node, then immediately stop, and ++ return that value. */ ++error_t __attribute__ ((weak)) ++fshelp_iterate_active_translators (error_t (*fun)(struct node *)) ++{ ++} +-- +2.1.4 + |