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.

3 files changed, 55 insertions, 22 deletions

diff --git a/proc/ChangeLog b/proc/ChangeLog
index 0c872093..1a01550c 100644
--- a/proc/ChangeLog
+++ b/proc/ChangeLog
@@ -1,5 +1,30 @@
 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.
+
+2003-08-17  Marcus Brinkmann  <marcus@gnu.org>
+
 	* mgt.c (S_proc_dostop): Revert last change.
 
 2003-06-16  Ognyan Kulev  <ogi@fmi.uni-sofia.bg>
diff --git a/proc/hash.c b/proc/hash.c
index 76c2369c..ed670a16 100644
--- a/proc/hash.c
+++ b/proc/hash.c
@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Written by Michael I. Bushnell.  */
 
 #include <mach.h>
+#include <stddef.h>
 #include <sys/types.h>
 #include <hurd/hurd_types.h>
 #include <string.h>
@@ -29,14 +30,22 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "proc.h"
 #include <hurd/ihash.h>
 
-static struct ihash pghash, pidhash, taskhash, sidhash;
+static struct hurd_ihash pghash
+  = HURD_IHASH_INITIALIZER (offsetof (struct pgrp, pg_hashloc));
+static struct hurd_ihash pidhash
+  = HURD_IHASH_INITIALIZER (offsetof (struct proc, p_pidhashloc));
+static struct hurd_ihash taskhash
+  = HURD_IHASH_INITIALIZER (offsetof (struct proc, p_taskhashloc));
+static struct hurd_ihash sidhash
+  = HURD_IHASH_INITIALIZER (offsetof (struct session, s_hashloc));
 
+
 /* Find the process corresponding to a given pid. */
 struct proc *
 pid_find (pid_t pid)
 {
   struct proc *p;
-  p = ihash_find (&pidhash, pid);
+  p = hurd_ihash_find (&pidhash, pid);
   return (!p || p->p_dead) ? 0 : p;
 }
 
@@ -45,7 +54,7 @@ pid_find (pid_t pid)
 struct proc *
 pid_find_allow_zombie (pid_t pid)
 {
-  return ihash_find (&pidhash, pid);
+  return hurd_ihash_find (&pidhash, pid);
 }
 
 /* Find the process corresponding to a given task. */
@@ -53,7 +62,7 @@ struct proc *
 task_find (task_t task)
 {
   struct proc *p;
-  p = ihash_find (&taskhash, task) ? : add_tasks (task);
+  p = hurd_ihash_find (&taskhash, task) ? : add_tasks (task);
   return (!p || p->p_dead) ? 0 : p;
 }
 
@@ -63,7 +72,7 @@ struct proc *
 task_find_nocreate (task_t task)
 {
   struct proc *p;
-  p = ihash_find (&taskhash, task);
+  p = hurd_ihash_find (&taskhash, task);
   return (!p || p->p_dead) ? 0 : p;
 }
 
@@ -82,58 +91,58 @@ reqport_find (mach_port_t reqport)
 struct pgrp *
 pgrp_find (pid_t pgid)
 {
-  return ihash_find (&pghash, pgid);
+  return hurd_ihash_find (&pghash, pgid);
 }
 
 /* Find the session corresponding to a given sid. */
 struct session *
 session_find (pid_t sid)
 {
-  return ihash_find (&sidhash, sid);
+  return hurd_ihash_find (&sidhash, sid);
 }
 
 /* Add a new process to the various hash tables. */
 void
 add_proc_to_hash (struct proc *p)
 {
-  ihash_add (&pidhash, p->p_pid, p, &p->p_pidhashloc);
-  ihash_add (&taskhash, p->p_task, p, &p->p_taskhashloc);
+  hurd_ihash_add (&pidhash, p->p_pid, p);
+  hurd_ihash_add (&taskhash, p->p_task, p);
 }
 
 /* Add a new process group to the various hash tables. */
 void
 add_pgrp_to_hash (struct pgrp *pg)
 {
-  ihash_add (&pghash, pg->pg_pgid, pg, &pg->pg_hashloc);
+  hurd_ihash_add (&pghash, pg->pg_pgid, pg);
 }
 
 /* Add a new session to the various hash tables. */
 void
 add_session_to_hash (struct session *s)
 {
-  ihash_add (&sidhash, s->s_sid, s, &s->s_hashloc);
+  hurd_ihash_add (&sidhash, s->s_sid, s);
 }
 
 /* Remove a process group from the various hash tables. */
 void
 remove_pgrp_from_hash (struct pgrp *pg)
 {
-  ihash_locp_remove(0, pg->pg_hashloc);
+  hurd_ihash_locp_remove (&pghash, pg->pg_hashloc);
 }
 
 /* Remove a process from the various hash tables. */
 void
 remove_proc_from_hash (struct proc *p)
 {
-  ihash_locp_remove(0, p->p_pidhashloc);
-  ihash_locp_remove(0, p->p_taskhashloc);
+  hurd_ihash_locp_remove (&pidhash, p->p_pidhashloc);
+  hurd_ihash_locp_remove (&taskhash, p->p_taskhashloc);
 }
 
 /* Remove a session from the various hash tables. */
 void
 remove_session_from_hash (struct session *s)
 {
-  ihash_locp_remove(0, s->s_hashloc);
+  hurd_ihash_locp_remove (&sidhash, s->s_hashloc);
 }
 
 /* Call function FUN of two args for each process.  FUN's first arg is
@@ -141,14 +150,12 @@ remove_session_from_hash (struct session *s)
 void
 prociterate (void (*fun) (struct proc *, void *), void *arg)
 {
-  error_t thunk(void *value)
+  HURD_IHASH_ITERATE (&pidhash, value)
     {
       struct proc *p = value;
       if (!p->p_dead)
 	(*fun)(p, arg);
-      return 0;
     }
-  ihash_iterate(&pidhash, thunk);
 }
 
 /* Tell if a pid is available for use */
diff --git a/proc/proc.h b/proc/proc.h
index 9e79192a..7943e0be 100644
--- a/proc/proc.h
+++ b/proc/proc.h
@@ -25,6 +25,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/resource.h>
 #include <sys/mman.h>
 #include <hurd/ports.h>
+#include <hurd/ihash.h>
 #include <cthreads.h>
 
 struct proc
@@ -35,8 +36,8 @@ struct proc
   struct proc *p_gnext, **p_gprevp; /* process group */
 
   /* Hash table pointers that point here */
-  void **p_pidhashloc;		/* by pid */
-  void **p_taskhashloc;		/* by task port */
+  hurd_ihash_locp_t p_pidhashloc;		/* by pid */
+  hurd_ihash_locp_t p_taskhashloc;		/* by task port */
 
   /* Identification of this process */
   task_t p_task;
@@ -89,7 +90,7 @@ typedef struct proc *pstruct_t;
 
 struct pgrp
 {
-  void **pg_hashloc;
+  hurd_ihash_locp_t pg_hashloc;
   struct proc *pg_plist;	/* member processes */
   struct pgrp *pg_next, **pg_prevp; /* list of pgrps in session */
   pid_t pg_pgid;
@@ -99,7 +100,7 @@ struct pgrp
 
 struct session
 {
-  void **s_hashloc;
+  hurd_ihash_locp_t s_hashloc;
   pid_t s_sid;
   struct pgrp *s_pgrps;		/* list of member pgrps */
   mach_port_t s_sessionid;	/* receive right */