auth/

2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* auth.c: Include <stddef.h>.
	(pending_users, pending_server): Change type to struct hurd_ihash,
	initialize with HURD_IHASH_INITIALIZER.
	(struct pending): Change type of member LOCP to hurd_ihash_locp_t.
	(S_auth_user_authenticate): Use hurd_ihash_* functions instead
	ihash_*.
	(S_auth_server_authenticate): Likewise.
	(main): Do not allocate the hash tables.

console-client/
2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* vga-dynafont.c: Include <stddef.h>.
	(struct mapped_character): Change type of LOCP to
	hurd_ihash_locp_t.
	(struct dynafont): Change type of CHARMAP to struct hurd_ihash.
	(dynafont_new): Use hurd_ihash_init instead of ihash_create.
	Remove variable ERR.  Call hurd_ihash_add instead of ihash_add.
	(dynafont_free): Call hurd_ihash_destroy, no ihash_free.
	(dynafont_lookup_internal): Use hurd_ihash_find, not ihash_find.
	(dynafont_lookup_internal): Call hurd_ihash_locp_remove instead
	ihash_locp_remove, and hurd_ihash_add instead ihash_add.
	(dynafont_change_font): Likewise.  Clean out LOCP if character is
	unmapped.

ftpfs/
2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* ftpfs.h: Include <hurd/ihash.h>.
	(struct ftpfs): Change type of INODE_MAPPINGS to struct
	hurd_ihash.
	(struct ftpfs_dir_entry): Change type of INODE_LOCP to
	hurd_ihash_locp_t.
	* node.c (ftpfs_create_node): Call hurd_ihash_add, not ihash_add.
	(netfs_node_norefs): Call hurd_ihash_locp_remove, not
	ihash_locp_remove.
	* fs.c: Include <stddef.h>.
	(ftpfs_create): Call hurd_ihash_init, not hurd_ihash_create.
	Call hurd_ihash_destroy on error.

libihash/
2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* ihash.c: Rewritten.
	* ihash.h: Rewritten.
	* Makefile (SRCS): Remove sizes.c.
	(LCLHDRS): Remove priv.h.
	* primes.c, sizes.c, priv.h: Files removed.

2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* ports.h (struct port_bucket): Change type of HTABLE to struct
	hurd_ihash.
	(struct port_info): Change type of HENTRY to hurd_ihash_locp_t.
	* lookup-port.c (ports_lookup_port): Use hurd_ihash_find instead
	ihash_find.
	* bucket-iterate.c (_ports_bucket_class_iterate): Use
	HURD_IHASH_ITERATE instead ihash_iterate.
	* inhibit-all-rpcs.c (ports_inhibit_all_rpcs): Likewise.
	* inhibit-bucket-rpcs.c (ports_inhibit_bucket_rpcs): Likewise.
	* create-internal.c (_ports_create_port_internal): Use
	hurd_ihash_add instead ihash_add.
	* import-port.c (ports_import_port): Likewise.
	* reallocate-from-external.c (ports_reallocate_from_external):
	Likewise.
	* reallocate-port.c (ports_reallocate_port): Likewise.
	* transfer-right.c (ports_transfer_right): Likewise.
	* create-bucket.c: Include <stddef.h>.
	(ports_create_bucket): Use hurd_ihash_init instead hurd_ihash_create.
	* class-iterate.c: Do not include <hurd/ihash.h>.
	* claim-right.c (ports_claim_right): Call hurd_ihash_locp_remove
	instead ihash_locp_remove.
	* complete-deallocate.c (_ports_complete_deallocate): Likewise.
	* destroy-right.c (ports_destroy_right): Likewise.
	* reallocate-from-external.c (ports_reallocate_from_external):
	Likewise.
	* reallocate-port.c (ports_reallocate_port): Likewise.
	* transfer-right.c (ports_transfer_right): Likewise.

libps/
2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* ps.h (struct ps_context): Change type of members procs, ttys,
	ttys_by_cttyid and users to struct hurd_ihash.
	* context.c (ps_context_create): Remove variables err_procs,
	err_ttys, err_ttys_by_cttyid and err_users.  Use hurd_ihash_init
	instead of ihash_create.  Call hurd_ihash_set_cleanup and the
	hurd_ihash_cleanup_t type instead of ihash_set_cleanup.
	(ps_context_free): Call hurd_ihash_destroy instead of ihash_free.
	(lookup): Call hurd_ihash_find instead ihash_find, hurd_ihash_add
	instead ihash_add.
	(ps_context_find_proc_stat): Take pointer of hash object.
	(ps_context_find_tty): Likewise.
	(ps_context_find_tty_by_cttyid): Likewise.
	(ps_context_find_user): Likewise.

libpthread/
2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* sysdeps/hurd/pt-key.h (PTHREAD_KEY_MEMBERS): Change type of
	THREAD_SPECIFICS to hurd_ihash_t.
	* sysdeps/hurd/pt-setspecific.c (pthread_setspecific): Call
	hurd_ihash_create instead ihash_create, and hurd_ihash_add instead
	ihash_add.
	* sysdeps/hurd/pt-getspecific.c (pthread_getspecific): Call
	hurd_ihash_find instead of ihash_find.
	* sysdeps/hurd/pt-destroy-specific.c (__pthread_destroy_specific):
	Call hurd_ihash_find instead of ihash_find, hurd_ihash_remove
	instead of ihash_remove, and hurd_ihash_free instead of
	ihash_free.

proc/
2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* proc.h: Include <hurd/ihash.h>.
	(struct proc): Change type of members p_pidhashloc and
	p_taskhashloc to hurd_ihash_locp_t.
	(struct pgrp): Likewise for pg_hashloc.
	(struct session): Likewise for s_hashloc.
	* hash.c: Change type of pghash, pidhash, taskhash and sidhash to
	struct hurd_ihash and initialize them with HURD_IHASH_INITIALIZER.
	Include stddef.h.
	(pid_find): Call hurd_ihash_find instead ihash_find.
	(pid_find_allow_zombie): Likewise.
	(task_find): Likewise.
	(task_find_nocreate): Likewise.
	(pgrp_find): Likewise.
	(session_find): Likewise.
	(add_proc_to_hash): Call hurd_ihash_add instead ihash_add.
	(add_pgrp_to_hash): Likewise.
	(add_session_to_hash): Likewise.
	(remove_pgrp_from_hash): Call hurd_ihash_locp_remove instead
	ihash_locp_remove, and provide hash table pointer.
	(remove_proc_from_hash): Likewise.
	(remove_session_from_hash): Likewise.
	(prociterate): Use HURD_IHASH_ITERATE instead ihash_iterate.

trans/
2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* fakeroot.c: Include <stddef.h>.
	(struct netnode): Change type of member idport_locp
	to hurd_ihash_locp_t.
	(idport_ihash): Change type to struct hurd_ihash and initialize
	with HURD_IHASH_INITIALIZER.
	(new_node): Call hurd_ihash_add instead of ihash_add.
	(netfs_node_norefs): Call hrd_ihash_locp_remove instead
	ihash_locp_remove.
	(netfs_S_dir_lookup): Call hurd_ihash_find instead ihash_find.

utils/
2003-08-17  Marcus Brinkmann  <marcus@gnu.org>

	* rpctrace.c: Include <stddef.h>.
	(struct traced_info): Change type of LOCP to hurd_ihash_locp_t.
	(msgid_ihash): Change type to struct hurd_ihash, and initialize
	with HURD_IHASH_INITIALIZER, don't set cleanup here.
	(traced_names): Likewise.
	(main): Call hurd_ihash_set_cleanup for msgid_ihash.  Don't create
	traced_names.
	(parse_msgid_list): Call hurd_ihash_add instead ihash_add.
	(new_send_wrapper): Likewise.
	(msgid_info): Likewise.  Call hurd_ihash_find instead ihash_find.
	(rewrite_right): Likewise.
	(traced_dropweak): Call hurd_ihash_locp_remove instead
	ihash_locp_remove.

2 files changed, 28 insertions, 19 deletions

diff --git a/auth/ChangeLog b/auth/ChangeLog
index 2bf57316..caddb11f 100644
--- a/auth/ChangeLog
+++ b/auth/ChangeLog
@@ -1,3 +1,14 @@
+2003-08-17  Marcus Brinkmann  <marcus@gnu.org>
+
+	* auth.c: Include <stddef.h>.
+	(pending_users, pending_server): Change type to struct hurd_ihash,
+	initialize with HURD_IHASH_INITIALIZER.
+	(struct pending): Change type of member LOCP to hurd_ihash_locp_t.
+	(S_auth_user_authenticate): Use hurd_ihash_* functions instead
+	ihash_*.
+	(S_auth_server_authenticate): Likewise.
+	(main): Do not allocate the hash tables.
+
 2002-05-07  Roland McGrath  <roland@frob.com>
 
 	* auth.c (S_auth_getids): u_int -> size_t
diff --git a/auth/auth.c b/auth/auth.c
index e2628760..3c5fa861 100644
--- a/auth/auth.c
+++ b/auth/auth.c
@@ -18,6 +18,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
+#include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 #include <mach.h>
@@ -250,14 +251,10 @@ S_auth_makeauth (struct authhandle *auth,
 
 /* Transaction handling.  */
 
-/* Table of pending transactions keyed on RENDEZVOUS.  */
-struct ihash *pending_users, *pending_servers;
-struct mutex pending_lock = MUTEX_INITIALIZER;
-
 /* A pending transaction.  */
 struct pending
   {
-    void **locp;		/* Position in one of the ihash tables.  */
+    hurd_ihash_locp_t locp;	/* Position in one of the ihash tables.  */
     struct condition wakeup;    /* The waiter is blocked on this condition.  */
 
     /* The user's auth handle.  */
@@ -267,6 +264,13 @@ struct pending
     mach_port_t passthrough;
   };
 
+/* Table of pending transactions keyed on RENDEZVOUS.  */
+struct hurd_ihash pending_users
+  = HURD_IHASH_INITIALIZER (offsetof (struct pending, locp));
+struct hurd_ihash pending_servers
+  = HURD_IHASH_INITIALIZER (offsetof (struct pending, locp));
+struct mutex pending_lock = MUTEX_INITIALIZER;
+
 /* Implement auth_user_authenticate as described in <hurd/auth.defs>. */
 kern_return_t
 S_auth_user_authenticate (struct authhandle *userauth,
@@ -287,7 +291,7 @@ S_auth_user_authenticate (struct authhandle *userauth,
   mutex_lock (&pending_lock);
 
   /* Look for this port in the server list.  */
-  s = ihash_find (pending_servers, rendezvous);
+  s = hurd_ihash_find (&pending_servers, rendezvous);
   if (s)
     {
       /* Found it!  Extract the port.  */
@@ -295,7 +299,7 @@ S_auth_user_authenticate (struct authhandle *userauth,
       *newporttype = MACH_MSG_TYPE_MOVE_SEND;
 
       /* Remove it from the pending list.  */
-      ihash_locp_remove (pending_servers, s->locp);
+      hurd_ihash_locp_remove (&pending_servers, s->locp);
 
       /* Give the server the auth port and wake the RPC up.
 	 We need to add a ref in case the port dies.  */
@@ -315,7 +319,7 @@ S_auth_user_authenticate (struct authhandle *userauth,
       struct pending u;
       error_t err;
 
-      err = ihash_add (pending_users, rendezvous, &u, &u.locp);
+      err = hurd_ihash_add (&pending_users, rendezvous, &u);
       if (! err)
 	{
 	  /* Store the user auth port and wait for the server RPC to wake
@@ -326,7 +330,7 @@ S_auth_user_authenticate (struct authhandle *userauth,
 	  if (hurd_condition_wait (&u.wakeup, &pending_lock))
 	    /* We were interrupted; remove our record.  */
 	    {
-	      ihash_locp_remove (pending_users, u.locp);
+	      hurd_ihash_locp_remove (&pending_users, u.locp);
 	      err = EINTR;
 	    }
 	}
@@ -373,11 +377,11 @@ S_auth_server_authenticate (struct authhandle *serverauth,
   mutex_lock (&pending_lock);
 
   /* Look for this port in the user list.  */
-  u = ihash_find (pending_users, rendezvous);
+  u = hurd_ihash_find (&pending_users, rendezvous);
   if (u)
     {
       /* Remove it from the pending list.  */
-      ihash_locp_remove (pending_users, u->locp);
+      hurd_ihash_locp_remove (&pending_users, u->locp);
 
       /* Found it!  We must add a ref because the one held by the
 	 user RPC might die as soon as we unlock pending_lock.  */
@@ -397,7 +401,7 @@ S_auth_server_authenticate (struct authhandle *serverauth,
       struct pending s;
       error_t err;
 
-      err = ihash_add (pending_servers, rendezvous, &s, &s.locp);
+      err = hurd_ihash_add (&pending_servers, rendezvous, &s);
       if (! err)
 	{
 	  /* Store the new port and wait for the user RPC to wake us up.  */
@@ -407,7 +411,7 @@ S_auth_server_authenticate (struct authhandle *serverauth,
 	  if (hurd_condition_wait (&s.wakeup, &pending_lock))
 	    /* We were interrupted; remove our record.  */
 	    {
-	      ihash_locp_remove (pending_servers, s.locp);
+	      hurd_ihash_locp_remove (&pending_servers, s.locp);
 	      err = EINTR;
 	    }
 	}
@@ -494,12 +498,6 @@ main (int argc, char **argv)
   mach_port_deallocate (mach_task_self (), boot);
   mach_port_deallocate (mach_task_self (), hostpriv);
 
-  /* Allocate the hash tables.  */
-  err = ihash_create (&pending_users);
-  assert_perror (err);
-  err = ihash_create (&pending_servers);
-  assert_perror (err);
-
   /* Be a server.  */
   while (1)
     ports_manage_port_operations_multithread (auth_bucket,