diff options
Diffstat (limited to 'tools/xenpaging')
-rw-r--r-- | tools/xenpaging/pagein.c | 2 | ||||
-rw-r--r-- | tools/xenpaging/policy.h | 4 | ||||
-rw-r--r-- | tools/xenpaging/policy_default.c | 4 | ||||
-rw-r--r-- | tools/xenpaging/xenpaging.c | 30 | ||||
-rw-r--r-- | tools/xenpaging/xenpaging.h | 6 |
5 files changed, 23 insertions, 23 deletions
diff --git a/tools/xenpaging/pagein.c b/tools/xenpaging/pagein.c index 579620f241..fe84b3cca9 100644 --- a/tools/xenpaging/pagein.c +++ b/tools/xenpaging/pagein.c @@ -61,7 +61,7 @@ void page_in_trigger(void) pthread_cond_signal(&page_in_cond); } -void create_page_in_thread(xenpaging_t *paging) +void create_page_in_thread(struct xenpaging *paging) { page_in_args.dom = paging->mem_event.domain_id; page_in_args.pagein_queue = paging->pagein_queue; diff --git a/tools/xenpaging/policy.h b/tools/xenpaging/policy.h index 27a5b2d2fc..905ee7b209 100644 --- a/tools/xenpaging/policy.h +++ b/tools/xenpaging/policy.h @@ -28,8 +28,8 @@ #include "xenpaging.h" -int policy_init(xenpaging_t *paging); -int policy_choose_victim(xenpaging_t *paging, struct victim *victim); +int policy_init(struct xenpaging *paging); +int policy_choose_victim(struct xenpaging *paging, struct victim *victim); void policy_notify_paged_out(unsigned long gfn); void policy_notify_paged_in(unsigned long gfn); void policy_notify_paged_in_nomru(unsigned long gfn); diff --git a/tools/xenpaging/policy_default.c b/tools/xenpaging/policy_default.c index bc1353e5cb..c5c71f1b37 100644 --- a/tools/xenpaging/policy_default.c +++ b/tools/xenpaging/policy_default.c @@ -37,7 +37,7 @@ static unsigned long current_gfn; static unsigned long max_pages; -int policy_init(xenpaging_t *paging) +int policy_init(struct xenpaging *paging) { int i; int rc = -ENOMEM; @@ -77,7 +77,7 @@ int policy_init(xenpaging_t *paging) return rc; } -int policy_choose_victim(xenpaging_t *paging, struct victim *victim) +int policy_choose_victim(struct xenpaging *paging, struct victim *victim) { xc_interface *xch = paging->xc_handle; unsigned long wrap = current_gfn; diff --git a/tools/xenpaging/xenpaging.c b/tools/xenpaging/xenpaging.c index 4b2589b21c..7df4fc00a3 100644 --- a/tools/xenpaging/xenpaging.c +++ b/tools/xenpaging/xenpaging.c @@ -61,7 +61,7 @@ static void close_handler(int sig) unlink_pagefile(); } -static int xenpaging_mem_paging_flush_ioemu_cache(xenpaging_t *paging) +static int xenpaging_mem_paging_flush_ioemu_cache(struct xenpaging *paging) { struct xs_handle *xsh = paging->xs_handle; domid_t domain_id = paging->mem_event.domain_id; @@ -75,7 +75,7 @@ static int xenpaging_mem_paging_flush_ioemu_cache(xenpaging_t *paging) return rc == true ? 0 : -1; } -static int xenpaging_wait_for_event_or_timeout(xenpaging_t *paging) +static int xenpaging_wait_for_event_or_timeout(struct xenpaging *paging) { xc_interface *xch = paging->xc_handle; xc_evtchn *xce = paging->mem_event.xce_handle; @@ -163,7 +163,7 @@ err: return rc; } -static int xenpaging_get_tot_pages(xenpaging_t *paging) +static int xenpaging_get_tot_pages(struct xenpaging *paging) { xc_interface *xch = paging->xc_handle; xc_domaininfo_t domain_info; @@ -218,7 +218,7 @@ static void usage(void) printf(" -h --help this output.\n"); } -static int xenpaging_getopts(xenpaging_t *paging, int argc, char *argv[]) +static int xenpaging_getopts(struct xenpaging *paging, int argc, char *argv[]) { int ch; static const char sopts[] = "hvd:f:m:r:"; @@ -277,9 +277,9 @@ static int xenpaging_getopts(xenpaging_t *paging, int argc, char *argv[]) return 0; } -static xenpaging_t *xenpaging_init(int argc, char *argv[]) +static struct xenpaging *xenpaging_init(int argc, char *argv[]) { - xenpaging_t *paging; + struct xenpaging *paging; xc_domaininfo_t domain_info; xc_interface *xch = NULL; xentoollog_logger *dbg = NULL; @@ -287,7 +287,7 @@ static xenpaging_t *xenpaging_init(int argc, char *argv[]) int rc; /* Allocate memory */ - paging = calloc(1, sizeof(xenpaging_t)); + paging = calloc(1, sizeof(struct xenpaging)); if ( !paging ) goto err; @@ -475,7 +475,7 @@ static xenpaging_t *xenpaging_init(int argc, char *argv[]) return NULL; } -static int xenpaging_teardown(xenpaging_t *paging) +static int xenpaging_teardown(struct xenpaging *paging) { int rc; xc_interface *xch; @@ -561,7 +561,7 @@ static void put_response(mem_event_t *mem_event, mem_event_response_t *rsp) RING_PUSH_RESPONSES(back_ring); } -static int xenpaging_evict_page(xenpaging_t *paging, struct victim *victim, int fd, int i) +static int xenpaging_evict_page(struct xenpaging *paging, struct victim *victim, int fd, int i) { xc_interface *xch = paging->xc_handle; void *page; @@ -612,7 +612,7 @@ static int xenpaging_evict_page(xenpaging_t *paging, struct victim *victim, int return ret; } -static int xenpaging_resume_page(xenpaging_t *paging, mem_event_response_t *rsp, int notify_policy) +static int xenpaging_resume_page(struct xenpaging *paging, mem_event_response_t *rsp, int notify_policy) { int ret; @@ -646,7 +646,7 @@ static int xenpaging_resume_page(xenpaging_t *paging, mem_event_response_t *rsp, return ret; } -static int xenpaging_populate_page(xenpaging_t *paging, +static int xenpaging_populate_page(struct xenpaging *paging, xen_pfn_t gfn, int fd, int i) { xc_interface *xch = paging->xc_handle; @@ -690,7 +690,7 @@ static int xenpaging_populate_page(xenpaging_t *paging, } /* Trigger a page-in for a batch of pages */ -static void resume_pages(xenpaging_t *paging, int num_pages) +static void resume_pages(struct xenpaging *paging, int num_pages) { xc_interface *xch = paging->xc_handle; int i, num = 0; @@ -710,7 +710,7 @@ static void resume_pages(xenpaging_t *paging, int num_pages) page_in_trigger(); } -static int evict_victim(xenpaging_t *paging, struct victim *victim, int fd, int i) +static int evict_victim(struct xenpaging *paging, struct victim *victim, int fd, int i) { xc_interface *xch = paging->xc_handle; int j = 0; @@ -753,7 +753,7 @@ static int evict_victim(xenpaging_t *paging, struct victim *victim, int fd, int } /* Evict a batch of pages and write them to a free slot in the paging file */ -static int evict_pages(xenpaging_t *paging, int fd, struct victim *victims, int num_pages) +static int evict_pages(struct xenpaging *paging, int fd, struct victim *victims, int num_pages) { xc_interface *xch = paging->xc_handle; int rc, slot, num = 0; @@ -779,7 +779,7 @@ static int evict_pages(xenpaging_t *paging, int fd, struct victim *victims, int int main(int argc, char *argv[]) { struct sigaction act; - xenpaging_t *paging; + struct xenpaging *paging; struct victim *victims; mem_event_request_t req; mem_event_response_t rsp; diff --git a/tools/xenpaging/xenpaging.h b/tools/xenpaging/xenpaging.h index 4ac915da1c..d6400c90c4 100644 --- a/tools/xenpaging/xenpaging.h +++ b/tools/xenpaging/xenpaging.h @@ -40,7 +40,7 @@ typedef struct mem_event { void *ring_page; } mem_event_t; -typedef struct xenpaging { +struct xenpaging { xc_interface *xc_handle; struct xs_handle *xs_handle; @@ -54,7 +54,7 @@ typedef struct xenpaging { int policy_mru_size; int debug; unsigned long pagein_queue[XENPAGING_PAGEIN_QUEUE_SIZE]; -} xenpaging_t; +}; struct victim { @@ -63,7 +63,7 @@ struct victim { }; -extern void create_page_in_thread(xenpaging_t *paging); +extern void create_page_in_thread(struct xenpaging *paging); extern void page_in_trigger(void); #endif // __XEN_PAGING_H__ |