lazymio/unicorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove page-collection-locs

Browse Source
This commit is contained in:
mio
2024-09-21 22:03:44 +08:00
parent 6cc7e1d431 cfaa5be912
commit 920d076e51
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
qemu/accel/tcg/translate-all.c
View File

@@ -522,6 +522,7 @@ static inline void page_unlock_tb(struct uc_struct *uc, const TranslationBlock *
} }
} }
#if 0
static inline struct page_entry * static inline struct page_entry *
page_entry_new(PageDesc *pd, tb_page_addr_t index) page_entry_new(PageDesc *pd, tb_page_addr_t index)
{ {
@@ -542,7 +543,6 @@ static void page_entry_destroy(gpointer p)
g_free(pe); g_free(pe);
} }
#if 0
/* returns false on success */ /* returns false on success */
static bool page_entry_trylock(struct page_entry *pe) static bool page_entry_trylock(struct page_entry *pe)
{ {
@@ -582,7 +582,6 @@ static gboolean page_entry_unlock(gpointer key, gpointer value, gpointer data)
} }
return FALSE; return FALSE;
} }
#endif
/* /*
* Trylock a page, and if successful, add the page to a collection. * Trylock a page, and if successful, add the page to a collection.
@@ -613,20 +612,14 @@ static bool page_trylock_add(struct uc_struct *uc, struct page_collection *set,
*/ */
if (set->max == NULL || pe->index > set->max->index) { if (set->max == NULL || pe->index > set->max->index) {
set->max = pe; set->max = pe;
#if 0
do_page_entry_lock(pe); do_page_entry_lock(pe);
#endif
return false; return false;
} }
/* /*
* Try to acquire out-of-order lock; if busy, return busy so that we acquire * Try to acquire out-of-order lock; if busy, return busy so that we acquire
* locks in order. * locks in order.
*/ */
#if 0
return page_entry_trylock(pe); return page_entry_trylock(pe);
#else
return 0;
#endif
} }
static gint tb_page_addr_cmp(gconstpointer ap, gconstpointer bp, gpointer udata) static gint tb_page_addr_cmp(gconstpointer ap, gconstpointer bp, gpointer udata)
@@ -641,6 +634,7 @@ static gint tb_page_addr_cmp(gconstpointer ap, gconstpointer bp, gpointer udata)
} }
return 1; return 1;
} }
#endif
/* /*
* Lock a range of pages ([@start,@end[) as well as the pages of all * Lock a range of pages ([@start,@end[) as well as the pages of all
@@ -650,6 +644,7 @@ static gint tb_page_addr_cmp(gconstpointer ap, gconstpointer bp, gpointer udata)
struct page_collection * struct page_collection *
page_collection_lock(struct uc_struct *uc, tb_page_addr_t start, tb_page_addr_t end) page_collection_lock(struct uc_struct *uc, tb_page_addr_t start, tb_page_addr_t end)
{ {
#if 0
struct page_collection *set = g_malloc(sizeof(*set)); struct page_collection *set = g_malloc(sizeof(*set));
tb_page_addr_t index; tb_page_addr_t index;
PageDesc *pd; PageDesc *pd;
@@ -664,9 +659,7 @@ page_collection_lock(struct uc_struct *uc, tb_page_addr_t start, tb_page_addr_t
assert_no_pages_locked(); assert_no_pages_locked();
retry: retry:
#if 0
g_tree_foreach(set->tree, page_entry_lock, NULL); g_tree_foreach(set->tree, page_entry_lock, NULL);
#endif
for (index = start; index <= end; index++) { for (index = start; index <= end; index++) {
TranslationBlock *tb; TranslationBlock *tb;
@@ -677,9 +670,7 @@ page_collection_lock(struct uc_struct *uc, tb_page_addr_t start, tb_page_addr_t
continue; continue;
} }
if (page_trylock_add(uc, set, index << TARGET_PAGE_BITS)) { if (page_trylock_add(uc, set, index << TARGET_PAGE_BITS)) {
#if 0
g_tree_foreach(set->tree, page_entry_unlock, NULL); g_tree_foreach(set->tree, page_entry_unlock, NULL);
#endif
goto retry; goto retry;
} }
assert_page_locked(pd); assert_page_locked(pd);
@@ -688,21 +679,24 @@ page_collection_lock(struct uc_struct *uc, tb_page_addr_t start, tb_page_addr_t
(tb->page_addr[1] != -1 && (tb->page_addr[1] != -1 &&
page_trylock_add(uc, set, tb->page_addr[1]))) { page_trylock_add(uc, set, tb->page_addr[1]))) {
/* drop all locks, and reacquire in order */ /* drop all locks, and reacquire in order */
#if 0
g_tree_foreach(set->tree, page_entry_unlock, NULL); g_tree_foreach(set->tree, page_entry_unlock, NULL);
#endif
goto retry; goto retry;
} }
} }
} }
return set; return set;
#else
return NULL;
#endif
} }
void page_collection_unlock(struct page_collection *set) void page_collection_unlock(struct page_collection *set)
{ {
#if 0
/* entries are unlocked and freed via page_entry_destroy */ /* entries are unlocked and freed via page_entry_destroy */
g_tree_destroy(set->tree); g_tree_destroy(set->tree);
g_free(set); g_free(set);
#endif
} }
static void page_lock_pair(struct uc_struct *uc, PageDesc **ret_p1, tb_page_addr_t phys1, static void page_lock_pair(struct uc_struct *uc, PageDesc **ret_p1, tb_page_addr_t phys1,