From 8d327ced8c2e539a0e845f522f56a84f6474f5ca Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Sun, 2 Oct 2016 00:37:43 +0200 Subject: Remove deprecated external memory management interface. * NEWS: Update. * device/dev_pager.c (device_pager_data_request): Prune unused branch. (device_pager_data_request_done): Remove function. (device_pager_data_write): Likewise. (device_pager_data_write_done): Likewise. (device_pager_copy): Use 'memory_object_ready'. * device/dev_pager.h (device_pager_data_write_done): Remove prototype. * device/device_pager.srv (memory_object_data_write): Remove macro. * doc/mach.texi: Update documentation. * include/mach/mach.defs (memory_object_data_provided): Drop RPC. (memory_object_set_attributes): Likewise. * include/mach/memory_object.defs: Update comments. (memory_object_data_write): Drop RPC. * include/mach/memory_object_default.defs: Update comments. * include/mach_debug/vm_info.h (VOI_STATE_USE_OLD_PAGEOUT): Drop macro. * vm/memory_object.c (memory_object_data_provided): Remove function. (memory_object_data_error): Simplify. (memory_object_set_attributes_common): Make static, remove unused parameters, simplify. (memory_object_change_attributes): Update callsite. (memory_object_set_attributes): Remove function. (memory_object_ready): Update callsite. * vm/vm_debug.c (mach_vm_object_info): Adapt to the changes. * vm/vm_object.c (vm_object_bootstrap): Likewise. * vm/vm_object.h (struct vm_object): Drop flag 'use_old_pageout'. * vm/vm_pageout.c: Update comments. (vm_pageout_page): Simplify. --- include/mach/memory_object.defs | 60 +++++++++++++++-------------------------- 1 file changed, 21 insertions(+), 39 deletions(-) (limited to 'include/mach/memory_object.defs') diff --git a/include/mach/memory_object.defs b/include/mach/memory_object.defs index 6372ded8..0d3c2786 100644 --- a/include/mach/memory_object.defs +++ b/include/mach/memory_object.defs @@ -57,10 +57,10 @@ serverdemux seqnos_memory_object_server; * a name port that identifies this object to callers of * vm_regions. * [To allow the mapping of this object to be used, the - * memory manager must call memory_object_set_attributes, - * specifying the "ready" parameter as TRUE. To reject - * all mappings of this object, the memory manager may - * use memory_object_destroy.] + * memory manager must call memory_object_ready or + * memory_object_change_attributes. To reject all mappings of + * this object, the memory manager may use + * memory_object_destroy.] */ simpleroutine memory_object_init( memory_object : memory_object_t; @@ -76,11 +76,12 @@ simpleroutine memory_object_init( memory_object_page_size : vm_size_t); /* - * Indicates that the specified memory object is no longer - * mapped (or cached -- see memory_object_set_attributes), - * and that further mappings will cause another memory_object_init - * call to be made. No further calls will be made on - * the memory object by this kernel. + * Indicates that the specified memory object is no longer mapped + * (or cached -- see memory_object_ready or + * memory_object_change_attributes), and that further mappings + * will cause another memory_object_init call to be made. No + * further calls will be made on the memory object by this + * kernel. * * [All rights to the control and name ports are included * in this call. The memory manager should use port_deallocate @@ -144,8 +145,9 @@ simpleroutine memory_object_terminate( * call to indicate that the appropriate page of the original * memory object may be used to fulfill a data request. * - * [Reply should be memory_object_set_attributes on the - * new memory object control port to indicate readiness.] + * [Reply should be memory_object_ready or + * memory_object_change_attributes on the new memory object control + * port to indicate readiness.] */ simpleroutine memory_object_copy( old_memory_object : memory_object_t; @@ -171,7 +173,7 @@ simpleroutine memory_object_copy( * the specified data should be returned with at * least the specified access permitted. * - * [Reply should be memory_object_data_provided.] + * [Reply should be memory_object_data_supply.] */ simpleroutine memory_object_data_request( memory_object : memory_object_t; @@ -204,26 +206,7 @@ simpleroutine memory_object_data_unlock( length : vm_size_t; desired_access : vm_prot_t); -/* - * Write back modifications made to this portion of - * the memory object while in memory. - * - * Unless explicitly requested by a memory_object_lock_request - * (clean, but not flush), the kernel will not retain - * the data. - * - * [Reply should be vm_deallocate to release the data.] - */ -simpleroutine memory_object_data_write( - memory_object : memory_object_t; -#if SEQNOS - msgseqno seqno : mach_port_seqno_t; -#endif /* SEQNOS */ - memory_control : memory_object_control_t = - MACH_MSG_TYPE_MAKE_SEND - ctype: mach_port_t; - offset : vm_offset_t; - data : pointer_t); +skip; /* was: memory_object_data_write */ /* * Indicate that a previous memory_object_lock_reqeust has been @@ -300,13 +283,12 @@ simpleroutine memory_object_supply_completed( error_offset : vm_offset_t); /* - * Return data to manager. This call is used in place of data_write - * for objects initialized by object_ready instead of set_attributes. - * This call indicates whether the returned data is dirty and whether - * the kernel kept a copy. Precious data remains precious if the - * kernel keeps a copy. The indication that the kernel kept a copy - * is only a hint if the data is not precious; the cleaned copy may - * be discarded without further notifying the manager. + * Return data to manager. This call indicates whether the + * returned data is dirty and whether the kernel kept a copy. + * Precious data remains precious if the kernel keeps a copy. + * The indication that the kernel kept a copy is only a hint if + * the data is not precious; the cleaned copy may be discarded + * without further notifying the manager. * * [Reply should be vm_deallocate to release the data.] */ -- cgit v1.2.3