summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--proc/hash.c11
-rw-r--r--proc/mig-decls.h18
-rw-r--r--proc/mig-mutate.h6
-rw-r--r--proc/proc.h7
4 files changed, 21 insertions, 21 deletions
diff --git a/proc/hash.c b/proc/hash.c
index ed670a16..e4dc5ffd 100644
--- a/proc/hash.c
+++ b/proc/hash.c
@@ -76,17 +76,6 @@ task_find_nocreate (task_t task)
return (!p || p->p_dead) ? 0 : p;
}
-/* Find the process corresponding to a given request port. */
-struct proc *
-reqport_find (mach_port_t reqport)
-{
- struct proc *p;
- p = ports_lookup_port (proc_bucket, reqport, proc_class);
- if (p && p->p_dead)
- ports_port_deref (p);
- return (!p || p->p_dead) ? 0 : p;
-}
-
/* Find the process group corresponding to a given pgid. */
struct pgrp *
pgrp_find (pid_t pgid)
diff --git a/proc/mig-decls.h b/proc/mig-decls.h
index 0d5bd4df..7d36a870 100644
--- a/proc/mig-decls.h
+++ b/proc/mig-decls.h
@@ -24,6 +24,24 @@
#include "proc.h"
+/* Find the process corresponding to a given request port. */
+static inline struct proc * __attribute__ ((unused))
+begin_using_proc_port (mach_port_t port)
+{
+ struct proc *p;
+ p = ports_lookup_port (proc_bucket, port, proc_class);
+ if (p && p->p_dead)
+ ports_port_deref (p);
+ return (!p || p->p_dead) ? NULL : p;
+}
+
+static inline void __attribute__ ((unused))
+end_using_proc (struct proc *p)
+{
+ if (p)
+ ports_port_deref (p);
+}
+
typedef struct exc* exc_t;
static inline exc_t __attribute__ ((unused))
diff --git a/proc/mig-mutate.h b/proc/mig-mutate.h
index ad6eb321..ce9f88e6 100644
--- a/proc/mig-mutate.h
+++ b/proc/mig-mutate.h
@@ -19,11 +19,11 @@
#define PROCESS_INTRAN \
- pstruct_t reqport_find (process_t)
+ pstruct_t begin_using_proc_port (process_t)
#define PROCESS_DESTRUCTOR \
- process_drop (pstruct_t)
+ end_using_proc (pstruct_t)
#define PROCESS_IMPORTS \
- import "proc.h";
+ import "mig-decls.h";
#define NOTIFY_INTRAN \
port_info_t begin_using_port_info_port (mach_port_t)
diff --git a/proc/proc.h b/proc/proc.h
index 12f56da1..a2e3c537 100644
--- a/proc/proc.h
+++ b/proc/proc.h
@@ -145,13 +145,6 @@ mach_port_t generic_port; /* messages not related to a specific proc */
pthread_mutex_t global_lock;
-static inline void __attribute__ ((unused))
-process_drop (struct proc *p)
-{
- if (p)
- ports_port_deref (p);
-}
-
/* Forward declarations */
void complete_wait (struct proc *, int);
int check_uid (struct proc *, uid_t);