Revision

22880

Author

zarzycki@apple.com

Date

2006-09-24 14:04:05 -0700 (Sun, 24 Sep 2006)

Log Message

Just a simple rename of internal symbols.

More trending toward the vproc_t/vprocmgr_t APIs...

Modified Paths

• trunk/launchd/src/bootstrap.defs
• trunk/launchd/src/bootstrap_public.c
• trunk/launchd/src/launchd_core_logic.c
• trunk/launchd/src/launchd_mach_ipc.c

Diff

--- trunk/launchd/src/bootstrap.defs	2006-09-24 20:01:11 UTC (rev 22879)
+++ trunk/launchd/src/bootstrap.defs	2006-09-24 21:04:05 UTC (rev 22880)
@@ -46,10 +46,10 @@
         cusertype: vproc_mig_t;
 
 
-userprefix raw_;
-serverprefix x_;
+userprefix vproc_mig_;
+serverprefix job_mig_;
 
-routine bootstrap_create_server(
+routine create_server(
 		__bs_port	: job_t;
 		__server_cmd	: cmd_t;
 		__server_uid	: natural_t;
@@ -59,19 +59,19 @@
 
 skip; /* Last used in 10.4. Was bootstrap_unprivileged() */
 
-routine bootstrap_check_in(
+routine check_in(
 			__bs_port	: job_t;
 			__service_name	: name_t;
 	ServerAuditToken	__token	: audit_token_t;
 		out	__service_port	: mach_port_move_receive_t);
 
-routine bootstrap_register(
+routine register(
 		__bs_port	: job_t;
 	ServerAuditToken	__token	: audit_token_t;
 		__service_name	: name_t;
 		__service_port	: mach_port_t);
 
-routine bootstrap_look_up(
+routine look_up(
 		__bs_port	: job_t;
 	ServerAuditToken	__token	: audit_token_t;
 		__service_name	: name_t;
@@ -79,28 +79,28 @@
 
 skip; /* last used in 10.4 */
 
-routine bootstrap_parent(
+routine parent(
 		__bs_port	: job_t;
 	out	__parent_port	: mach_port_send_t);
 
 skip; /* last used in 10.4 */
 
-routine bootstrap_info(
+routine info(
 		__bs_port	: job_t;
 	out	__service_names	: name_array_t, dealloc;
 	out __service_active	: bootstrap_status_array_t, dealloc);
 
-routine bootstrap_subset(
+routine subset(
 		__bs_port	: job_t;
 		__requestor_port: mach_port_t;
 	out	__subset_port	: mach_port_make_send_t);
 
-routine bootstrap_create_service(
+routine create_service(
 		__bs_port	: job_t;
 		__service_name	: name_t;
 	out	__service_port	: mach_port_t);
 
-routine bootstrap_transfer_subset(
+routine transfer_subset(
 		__bs_port	: job_t;
 	out	__bs_reqport	: mach_port_t;
 	out	__bs_rcvright	: mach_port_move_receive_t;
@@ -108,11 +108,11 @@
 	out	__service_pids	: pointer_t, dealloc;
 	out	__service_ports	: mach_port_array_t, dealloc);
 
-routine bootstrap_getsocket(
+routine getsocket(
 		__bs_port	: job_t;
 	out	__sockpath	: name_t);
 
-routine mpm_spawn(
+routine spawn(
 		__bs_port	: job_t;
 	ServerAuditToken	__token	: audit_token_t;
 		__chars		: _internal_string_t;
@@ -123,18 +123,18 @@
 	out	__pid		: pid_t;
 	out	__obsvr_port	: mach_port_make_send_t);
 
-routine mpm_wait(
+routine wait(
 		__bs_port	: job_t;
 	sreplyport		__rport	: mach_port_make_send_once_t;
 	ServerAuditToken	__token	: audit_token_t;
 	out	__waitval	: integer_t);
 
-routine mpm_uncork_fork(
+routine uncork_fork(
 		__bs_port	: job_t;
 	ServerAuditToken	__token	: audit_token_t);
 
 /* Essentially the inverse of bootstrap_unprivileged() */
-routine bootstrap_get_self(
+routine get_self(
 		__bs_port	: job_t;
 	ServerAuditToken        __token : audit_token_t;
 	out	__job_port	: mach_port_make_send_t);

--- trunk/launchd/src/bootstrap_public.c	2006-09-24 20:01:11 UTC (rev 22879)
+++ trunk/launchd/src/bootstrap_public.c	2006-09-24 21:04:05 UTC (rev 22880)
@@ -44,7 +44,7 @@
 		vm_offset_t *service_pids, mach_msg_type_number_t *service_pidsCnt,
 		mach_port_array_t *ports, mach_msg_type_number_t *portCnt)
 {
-	return raw_bootstrap_transfer_subset(bp, reqport, rcvright, service_names, service_namesCnt, service_pids, service_pidsCnt, ports, portCnt);
+	return vproc_mig_transfer_subset(bp, reqport, rcvright, service_names, service_namesCnt, service_pids, service_pidsCnt, ports, portCnt);
 }
 
 pid_t
@@ -114,7 +114,7 @@
 		break;
 	}
 
-	kr = raw_mpm_spawn(bootstrap_port, buf, buf_len, argc, envc, flags, u_mask, &p, &obsvr_port);
+	kr = vproc_mig_spawn(bootstrap_port, buf, buf_len, argc, envc, flags, u_mask, &p, &obsvr_port);
 
 	free(buf);
 
@@ -141,25 +141,25 @@
 kern_return_t
 mpm_wait(mach_port_t ajob, int *wstatus)
 {
-	return raw_mpm_wait(ajob, wstatus);
+	return vproc_mig_wait(ajob, wstatus);
 }
 
 kern_return_t
 mpm_uncork_fork(mach_port_t ajob)
 {
-	return raw_mpm_uncork_fork(ajob);
+	return vproc_mig_uncork_fork(ajob);
 }
 
 kern_return_t
 bootstrap_create_server(mach_port_t bp, cmd_t server_cmd, uid_t server_uid, boolean_t on_demand, mach_port_t *server_port)
 {
-	return raw_bootstrap_create_server(bp, server_cmd, server_uid, on_demand, server_port);
+	return vproc_mig_create_server(bp, server_cmd, server_uid, on_demand, server_port);
 }
 
 kern_return_t
 bootstrap_subset(mach_port_t bp, mach_port_t requestor_port, mach_port_t *subset_port)
 {
-	return raw_bootstrap_subset(bp, requestor_port, subset_port);
+	return vproc_mig_subset(bp, requestor_port, subset_port);
 }
 
 kern_return_t
@@ -181,25 +181,25 @@
 kern_return_t
 bootstrap_getsocket(mach_port_t bp, name_t sockpath)
 {
-	return raw_bootstrap_getsocket(bp, sockpath);
+	return vproc_mig_getsocket(bp, sockpath);
 }
 
 kern_return_t
 bootstrap_parent(mach_port_t bp, mach_port_t *parent_port)
 {
-	return raw_bootstrap_parent(bp, parent_port);
+	return vproc_mig_parent(bp, parent_port);
 }
 
 kern_return_t
 bootstrap_register(mach_port_t bp, name_t service_name, mach_port_t sp)
 {
-	return raw_bootstrap_register(bp, service_name, sp);
+	return vproc_mig_register(bp, service_name, sp);
 }
 
 kern_return_t
 bootstrap_create_service(mach_port_t bp, name_t service_name, mach_port_t *sp)
 {
-	return raw_bootstrap_create_service(bp, service_name, sp);
+	return vproc_mig_create_service(bp, service_name, sp);
 }
 
 kern_return_t
@@ -211,13 +211,13 @@
 
 	vproc_get_self();
 
-	return raw_bootstrap_check_in(vproc_self, service_name, sp);
+	return vproc_mig_check_in(vproc_self, service_name, sp);
 }
 
 kern_return_t
 bootstrap_look_up(mach_port_t bp, name_t service_name, mach_port_t *sp)
 {
-	return raw_bootstrap_look_up(bp, service_name, sp);
+	return vproc_mig_look_up(bp, service_name, sp);
 }
 
 kern_return_t
@@ -274,7 +274,7 @@
 		name_array_t *service_names, mach_msg_type_number_t *service_namesCnt,
 		bootstrap_status_array_t *service_active, mach_msg_type_number_t *service_activeCnt)
 {
-	return raw_bootstrap_info(bp, service_names, service_namesCnt,
+	return vproc_mig_info(bp, service_names, service_namesCnt,
 			service_active, service_activeCnt);
 }
 
@@ -288,7 +288,7 @@
 		return;
 	}
 
-	if (raw_bootstrap_get_self(bootstrap_port, &bp_self) != 0) {
+	if (vproc_mig_get_self(bootstrap_port, &bp_self) != 0) {
 		return;
 	}
 

--- trunk/launchd/src/launchd_core_logic.c	2006-09-24 20:01:11 UTC (rev 22879)
+++ trunk/launchd/src/launchd_core_logic.c	2006-09-24 21:04:05 UTC (rev 22880)
@@ -601,9 +601,9 @@
 	}
 
 	/* Sigh... at the moment, MIG has maxsize == sizeof(reply union) */
-	mxmsgsz = sizeof(union __RequestUnion__x_bootstrap_subsystem);
-	if (x_bootstrap_subsystem.maxsize > mxmsgsz) {
-		mxmsgsz = x_bootstrap_subsystem.maxsize;
+	mxmsgsz = sizeof(union __RequestUnion__job_mig_bootstrap_subsystem);
+	if (job_mig_bootstrap_subsystem.maxsize > mxmsgsz) {
+		mxmsgsz = job_mig_bootstrap_subsystem.maxsize;
 	}
 
 	if (!job_assumes(j, runtime_add_mport(j->bs_port, bootstrap_server, mxmsgsz) == KERN_SUCCESS)) {
@@ -2847,9 +2847,9 @@
 	sprintf(j->label, "%d", MACH_PORT_INDEX(j->bs_port));
 
 	/* Sigh... at the moment, MIG has maxsize == sizeof(reply union) */
-	mxmsgsz = sizeof(union __RequestUnion__x_bootstrap_subsystem);
-	if (x_bootstrap_subsystem.maxsize > mxmsgsz) {
-		mxmsgsz = x_bootstrap_subsystem.maxsize;
+	mxmsgsz = sizeof(union __RequestUnion__job_mig_bootstrap_subsystem);
+	if (job_mig_bootstrap_subsystem.maxsize > mxmsgsz) {
+		mxmsgsz = job_mig_bootstrap_subsystem.maxsize;
 	}
 
 	if (!job_assumes(j, runtime_add_mport(j->bs_port, bootstrap_server, mxmsgsz) == KERN_SUCCESS)) {

--- trunk/launchd/src/launchd_mach_ipc.c	2006-09-24 20:01:11 UTC (rev 22879)
+++ trunk/launchd/src/launchd_mach_ipc.c	2006-09-24 21:04:05 UTC (rev 22880)
@@ -145,7 +145,7 @@
 }
 
 kern_return_t
-x_bootstrap_create_server(job_t j, cmd_t server_cmd, uid_t server_uid, boolean_t on_demand,
+job_mig_create_server(job_t j, cmd_t server_cmd, uid_t server_uid, boolean_t on_demand,
 		audit_token_t au_tok, mach_port_t *server_portp)
 {
 	struct ldcred ldc;
@@ -185,7 +185,7 @@
 }
 
 kern_return_t
-x_bootstrap_getsocket(job_t j, name_t spr)
+job_mig_getsocket(job_t j, name_t spr)
 {
 	if (!sockpath) {
 		return BOOTSTRAP_NO_MEMORY;
@@ -199,7 +199,7 @@
 }
 
 kern_return_t
-x_bootstrap_get_self(job_t j, audit_token_t au_tok, mach_port_t *unprivportp)
+job_mig_get_self(job_t j, audit_token_t au_tok, mach_port_t *unprivportp)
 {
 	struct ldcred ldc;
 	job_t j2;
@@ -229,7 +229,7 @@
 
   
 kern_return_t
-x_bootstrap_check_in(job_t j, name_t servicename, audit_token_t au_tok, mach_port_t *serviceportp)
+job_mig_check_in(job_t j, name_t servicename, audit_token_t au_tok, mach_port_t *serviceportp)
 {
 	static pid_t last_warned_pid = 0;
 	struct machservice *ms;
@@ -266,7 +266,7 @@
 }
 
 kern_return_t
-x_bootstrap_register(job_t j, audit_token_t au_tok, name_t servicename, mach_port_t serviceport)
+job_mig_register(job_t j, audit_token_t au_tok, name_t servicename, mach_port_t serviceport)
 {
 	struct machservice *ms;
 	struct ldcred ldc;
@@ -315,7 +315,7 @@
 }
 
 kern_return_t
-x_bootstrap_look_up(job_t j, audit_token_t au_tok, name_t servicename, mach_port_t *serviceportp, mach_msg_type_name_t *ptype)
+job_mig_look_up(job_t j, audit_token_t au_tok, name_t servicename, mach_port_t *serviceportp, mach_msg_type_name_t *ptype)
 {
 	struct machservice *ms;
 	struct ldcred ldc;
@@ -345,7 +345,7 @@
 }
 
 kern_return_t
-x_bootstrap_parent(job_t j, mach_port_t *parentport, mach_msg_type_name_t *pptype)
+job_mig_parent(job_t j, mach_port_t *parentport, mach_msg_type_name_t *pptype)
 {
 	job_log(j, LOG_DEBUG, "Requested parent bootstrap port");
 
@@ -365,7 +365,7 @@
 }
 
 static void
-x_bootstrap_info_countservices(struct machservice *ms, void *context)
+job_mig_info_countservices(struct machservice *ms, void *context)
 {
 	unsigned int *cnt = context;
 
@@ -381,7 +381,7 @@
 };
 
 static void
-x_bootstrap_info_copyservices(struct machservice *ms, void *context)
+job_mig_info_copyservices(struct machservice *ms, void *context)
 {
 	struct x_bootstrap_info_copyservices_cb *info_resp = context;
 
@@ -399,7 +399,7 @@
 }
 
 kern_return_t
-x_bootstrap_info(job_t j, name_array_t *servicenamesp, unsigned int *servicenames_cnt,
+job_mig_info(job_t j, name_array_t *servicenamesp, unsigned int *servicenames_cnt,
 		bootstrap_status_array_t *serviceactivesp, unsigned int *serviceactives_cnt)
 {
 	struct x_bootstrap_info_copyservices_cb info_resp = { NULL, NULL, NULL, NULL, 0 };
@@ -407,7 +407,7 @@
 	job_t ji;
 
 	for (ji = j; ji; ji = job_parent(ji))
-		job_foreach_service(ji, x_bootstrap_info_countservices, &cnt, false);
+		job_foreach_service(ji, job_mig_info_countservices, &cnt, false);
 
 	mig_allocate((vm_address_t *)&info_resp.service_names, cnt * sizeof(info_resp.service_names[0]));
 	if (!launchd_assumes(info_resp.service_names != NULL)) {
@@ -420,7 +420,7 @@
 	}
 
 	for (ji = j; ji; ji = job_parent(ji))
-		job_foreach_service(ji, x_bootstrap_info_copyservices, &info_resp, false);
+		job_foreach_service(ji, job_mig_info_copyservices, &info_resp, false);
 
 	launchd_assumes(info_resp.i == cnt);
 
@@ -442,7 +442,7 @@
 }
 
 kern_return_t
-x_bootstrap_transfer_subset(job_t j, mach_port_t *reqport, mach_port_t *rcvright,
+job_mig_transfer_subset(job_t j, mach_port_t *reqport, mach_port_t *rcvright,
 		name_array_t *servicenamesp, unsigned int *servicenames_cnt,
 		vm_offset_t *service_pids, mach_msg_type_number_t *service_pidsCnt,
 		mach_port_array_t *ports, unsigned int *ports_cnt)
@@ -460,7 +460,7 @@
 
 	job_log(j, LOG_DEBUG, "Transferring sub-bootstrap to the per session launchd.");
 
-	job_foreach_service(j, x_bootstrap_info_countservices, &cnt, true);
+	job_foreach_service(j, job_mig_info_countservices, &cnt, true);
 
 	mig_allocate((vm_address_t *)&info_resp.service_names, cnt * sizeof(info_resp.service_names[0]));
 	if (!launchd_assumes(info_resp.service_names != NULL)) {
@@ -477,7 +477,7 @@
 		goto out_bad;
 	}
 
-	job_foreach_service(j, x_bootstrap_info_copyservices, &info_resp, true);
+	job_foreach_service(j, job_mig_info_copyservices, &info_resp, true);
 
 	launchd_assumes(info_resp.i == cnt);
 
@@ -511,7 +511,7 @@
 }
 
 kern_return_t
-x_bootstrap_subset(job_t j, mach_port_t requestorport, mach_port_t *subsetportp)
+job_mig_subset(job_t j, mach_port_t requestorport, mach_port_t *subsetportp)
 {
 	int bsdepth = 0;
 	job_t js = j;
@@ -538,7 +538,7 @@
 }
 
 kern_return_t
-x_bootstrap_create_service(job_t j, name_t servicename, mach_port_t *serviceportp)
+job_mig_create_service(job_t j, name_t servicename, mach_port_t *serviceportp)
 {
 	struct machservice *ms;
 
@@ -570,7 +570,7 @@
 }
 
 kern_return_t
-x_mpm_wait(job_t j, mach_port_t srp, audit_token_t au_tok, integer_t *waitstatus)
+job_mig_wait(job_t j, mach_port_t srp, audit_token_t au_tok, integer_t *waitstatus)
 {
 #if 0
 	struct ldcred ldc;
@@ -580,7 +580,7 @@
 }
 
 kern_return_t
-x_mpm_uncork_fork(job_t j, audit_token_t au_tok)
+job_mig_uncork_fork(job_t j, audit_token_t au_tok)
 {
 	if (!j) {
 		return BOOTSTRAP_NOT_PRIVILEGED;
@@ -592,7 +592,7 @@
 }
 
 kern_return_t
-x_mpm_spawn(job_t j, audit_token_t au_tok,
+job_mig_spawn(job_t j, audit_token_t au_tok,
 		_internal_string_t charbuf, mach_msg_type_number_t charbuf_cnt,
 		uint32_t argc, uint32_t envc, uint64_t flags, uint16_t mig_umask,
 		pid_t *child_pid, mach_port_t *obsvr_port)