2011-12-02 21:25:29 +01:00
|
|
|
changeset: 24215:dc7dabe2fe99
|
|
|
|
user: Olaf Hering <olaf@aepfle.de>
|
|
|
|
date: Sun Nov 20 17:02:38 2011 +0100
|
|
|
|
files: tools/xenpaging/xenpaging.c tools/xenpaging/xenpaging.h
|
|
|
|
description:
|
2011-11-03 23:59:30 +01:00
|
|
|
xenpaging: track the number of paged-out pages
|
|
|
|
|
|
|
|
This change is required by subsequent changes.
|
|
|
|
|
|
|
|
Signed-off-by: Olaf Hering <olaf@aepfle.de>
|
2011-12-02 21:25:29 +01:00
|
|
|
Committed-by: Ian Jackson <ian.jackson.citrix.com>
|
|
|
|
|
2011-11-03 23:59:30 +01:00
|
|
|
|
|
|
|
---
|
|
|
|
tools/xenpaging/xenpaging.c | 8 ++++++++
|
|
|
|
tools/xenpaging/xenpaging.h | 1 +
|
|
|
|
2 files changed, 9 insertions(+)
|
|
|
|
|
|
|
|
Index: xen-4.1.2-testing/tools/xenpaging/xenpaging.c
|
|
|
|
===================================================================
|
|
|
|
--- xen-4.1.2-testing.orig/tools/xenpaging/xenpaging.c
|
|
|
|
+++ xen-4.1.2-testing/tools/xenpaging/xenpaging.c
|
|
|
|
@@ -467,6 +467,9 @@ static int xenpaging_evict_page(xenpagin
|
|
|
|
/* Notify policy of page being paged out */
|
|
|
|
policy_notify_paged_out(victim->gfn);
|
|
|
|
|
|
|
|
+ /* Record number of evicted pages */
|
|
|
|
+ paging->num_paged_out++;
|
|
|
|
+
|
|
|
|
out:
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
@@ -480,8 +483,13 @@ static int xenpaging_resume_page(xenpagi
|
|
|
|
|
|
|
|
/* Notify policy of page being paged in */
|
|
|
|
if ( notify_policy )
|
|
|
|
+ {
|
|
|
|
policy_notify_paged_in(rsp->gfn);
|
|
|
|
|
|
|
|
+ /* Record number of resumed pages */
|
|
|
|
+ paging->num_paged_out--;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
/* Tell Xen page is ready */
|
|
|
|
ret = xc_mem_paging_resume(paging->xc_handle, paging->mem_event.domain_id,
|
|
|
|
rsp->gfn);
|
|
|
|
Index: xen-4.1.2-testing/tools/xenpaging/xenpaging.h
|
|
|
|
===================================================================
|
|
|
|
--- xen-4.1.2-testing.orig/tools/xenpaging/xenpaging.h
|
|
|
|
+++ xen-4.1.2-testing/tools/xenpaging/xenpaging.h
|
|
|
|
@@ -49,6 +49,7 @@ typedef struct xenpaging {
|
|
|
|
mem_event_t mem_event;
|
|
|
|
/* number of pages for which data structures were allocated */
|
|
|
|
int max_pages;
|
|
|
|
+ int num_paged_out;
|
|
|
|
int num_pages;
|
|
|
|
int policy_mru_size;
|
|
|
|
unsigned long pagein_queue[XENPAGING_PAGEIN_QUEUE_SIZE];
|