summaryrefslogtreecommitdiff
path: root/proc
diff options
context:
space:
mode:
Diffstat (limited to 'proc')
-rw-r--r--proc/hash.c151
1 files changed, 28 insertions, 123 deletions
diff --git a/proc/hash.c b/proc/hash.c
index ad13f271..9ccb6b90 100644
--- a/proc/hash.c
+++ b/proc/hash.c
@@ -27,125 +27,30 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <sys/resource.h>
#include "proc.h"
+#include "ihash.h"
-#define HASH(id, ht) ((id) % (ht)->size)
-#define REHASH(id, ht, h) (((id) + (h)) % (ht)->size)
-
-struct htable
-{
- void **tab;
- int *ids;
- void ****locps; /* four, count them, four stars */
- int size;
-};
-#define HASH_DEL ((void *) -1)
-
-static struct htable pghash, pidhash, taskhash, porthash, sidhash;
-static struct htable exchash;
-
-/* Add ITEM to the hash table HT. LOCP is the address of a pointer located
- in ITEM; *LOCP will be set to the address of ITEM's hash table pointer.
- The lookup key of ITEM is ID. */
-static void
-addhash (struct htable *ht,
- void *item,
- void ***locp,
- int id)
-{
- int h, firsth = -1;
- void **oldlist;
- void ****oldlocps;
- int *oldids;
- int oldsize;
- int i;
-
- if (ht->size)
- {
- for (h = HASH (id, ht);
- (ht->tab[h] != 0 && ht->tab[h] != HASH_DEL && h != firsth);
- firsth = (firsth == -1) ? h : firsth, h = REHASH (id, ht, h))
- ;
-
- if (ht->tab[h] == 0
- || ht->tab[h] == HASH_DEL)
- {
- ht->tab[h] = item;
- ht->ids[h] = id;
- ht->locps[h] = locp;
- *locp = &ht->tab[h];
- return;
- }
- }
-
- /* We have to rehash this again? */
- oldlist = ht->tab;
- oldsize = ht->size;
- oldids = ht->ids;
- oldlocps = ht->locps;
-
- ht->size = nextprime (2 * ht->size);
- ht->tab = malloc (ht->size * sizeof (void *));
- ht->locps = malloc (ht->size * sizeof (void ***));
- ht->ids = malloc (ht->size * sizeof (int));
- bzero (ht->tab, (ht->size * sizeof (void *)));
-
- if (oldlist)
- for (i = 0; i < oldsize; i++)
- if (oldlist[i] != 0
- && oldlist[i] != HASH_DEL)
- addhash (ht, oldlist[i], oldlocps[i], oldids[i]);
- addhash (ht, item, locp, id);
-
- if (oldlist)
- {
- free (oldlist);
- free (oldids);
- free (oldlocps);
- }
-}
-
-/* Find and return the item in hash table HT with key ID. */
-static void *
-findhash (struct htable *ht,
- int id)
-{
- int h, firsth = -1;
- void *ret;
-
- if (ht->size == 0)
- return 0;
-
- for (h = HASH (id, ht);
- (ht->tab[h] != 0 && ht->ids[h] != id && h != firsth);
- firsth = (firsth == -1) ? h : firsth, h = REHASH (id, ht, h))
- ;
-
- if (ht->ids[h] == id)
- ret = ht->tab[h] == HASH_DEL ? 0 : ht->tab[h];
- else
- ret = 0;
- return ret;
-}
+static struct ihash pghash, pidhash, taskhash, porthash, sidhash;
+static struct ihash exchash;
/* Find the exception structure corresponding to a given exc port. */
struct exc *
exc_find (mach_port_t port)
{
- return findhash (&exchash, port);
+ return ihash_find (&exchash, port);
}
/* Find the process corresponding to a given pid. */
struct proc *
pid_find (pid_t pid)
{
- return findhash (&pidhash, pid);
+ return ihash_find (&pidhash, pid);
}
/* Find the process corresponding to a given task. */
struct proc *
task_find (task_t task)
{
- return findhash (&taskhash, task) ? : add_tasks (task);
+ return ihash_find (&taskhash, task) ? : add_tasks (task);
}
/* Find the process corresponding to a given task, but
@@ -153,88 +58,88 @@ task_find (task_t task)
struct proc *
task_find_nocreate (task_t task)
{
- return findhash (&taskhash, task);
+ return ihash_find (&taskhash, task);
}
/* Find the process corresponding to a given request port. */
struct proc *
reqport_find (mach_port_t reqport)
{
- return findhash (&porthash, reqport);
+ return ihash_find (&porthash, reqport);
}
/* Find the process group corresponding to a given pgid. */
struct pgrp *
pgrp_find (pid_t pgid)
{
- return findhash (&pghash, pgid);
+ return ihash_find (&pghash, pgid);
}
/* Find the session corresponding to a given sid. */
struct session *
session_find (pid_t sid)
{
- return findhash (&sidhash, sid);
+ return ihash_find (&sidhash, sid);
}
/* Add a new exc to the various hash tables. */
void
add_exc_to_hash (struct exc *e)
{
- addhash (&exchash, e, &e->hashloc, e->excport);
+ ihash_add (&exchash, e->excport, e, &e->hashloc);
}
/* Add a new process to the various hash tables. */
void
add_proc_to_hash (struct proc *p)
{
- addhash (&pidhash, p, &p->p_pidhashloc, p->p_pid);
- addhash (&taskhash, p, &p->p_taskhashloc, p->p_task);
- addhash (&porthash, p, &p->p_porthashloc, p->p_reqport);
+ ihash_add (&pidhash, p->p_pid, p, &p->p_pidhashloc);
+ ihash_add (&taskhash, p->p_task, p, &p->p_taskhashloc);
+ ihash_add (&porthash, p->p_reqport, p, &p->p_porthashloc);
}
/* Add a new process group to the various hash tables. */
void
add_pgrp_to_hash (struct pgrp *pg)
{
- addhash (&pghash, pg, &pg->pg_hashloc, pg->pg_pgid);
+ ihash_add (&pghash, pg->pg_pgid, pg, &pg->pg_hashloc);
}
/* Add a new session to the various hash tables. */
void
add_session_to_hash (struct session *s)
{
- addhash (&sidhash, s, &s->s_hashloc, s->s_sid);
+ ihash_add (&sidhash, s->s_sid, s, &s->s_hashloc);
}
/* Remove an exc from the hash tables */
void
remove_exc_from_hash (struct exc *e)
{
- *e->hashloc = HASH_DEL;
+ ihash_locp_remove(0, e->hashloc);
}
/* Remove a process group from the various hash tables. */
void
remove_pgrp_from_hash (struct pgrp *pg)
{
- *pg->pg_hashloc = HASH_DEL;
+ ihash_locp_remove(0, pg->pg_hashloc);
}
/* Remove a process from the various hash tables. */
void
remove_proc_from_hash (struct proc *p)
{
- *p->p_pidhashloc = HASH_DEL;
- *p->p_taskhashloc = HASH_DEL;
- *p->p_porthashloc = HASH_DEL;
+ ihash_locp_remove(0, p->p_pidhashloc);
+ ihash_locp_remove(0, p->p_taskhashloc);
+ ihash_locp_remove(0, p->p_porthashloc);
}
/* Remove a session from the various hash tables. */
void
remove_session_from_hash (struct session *s)
{
- *s->s_hashloc = HASH_DEL;
+ ihash_locp_remove(0, s->s_hashloc);
}
/* Call function FUN of two args for each process. FUN's first arg is
@@ -242,11 +147,12 @@ remove_session_from_hash (struct session *s)
void
prociterate (void (*fun) (struct proc *, void *), void *arg)
{
- int i;
-
- for (i = 0; i < pidhash.size; i++)
- if (pidhash.tab[i] && pidhash.tab[i] != HASH_DEL)
- (*fun)(pidhash.tab[i], arg);
+ error_t thunk(void *value)
+ {
+ (*fun)(value, arg);
+ return 0;
+ }
+ ihash_iterate(&pidhash, thunk);
}
/* Tell if a pid is available for use */
@@ -256,4 +162,3 @@ pidfree (pid_t pid)
return (!pid_find (pid) && !pgrp_find (pid)
&& !session_find (pid) && !zombie_check_pid (pid));
}
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 20:45:35 +0000