aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-26 04:04:07 -04:00
Code Activity

updated for version 7.4.615

Browse Source 
Problem:    Vim hangs when freeing a lot of objects.
Solution:   Do not go back to the start of the list every time.  (Yasuhiro
            Matsumoto and Ariya Mizutani)
This commit is contained in:
Bram Moolenaar
2015-02-03 17:10:06 +01:00
parent d7ce7a9ad2
commit e71eea801e
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/eval.c
View File

@@ -5974,7 +5974,7 @@ list_unref(l)
} }
/* /*
* Free a list, including all items it points to. * Free a list, including all non-container items it points to.
* Ignores the reference count. * Ignores the reference count.
*/ */
void void
@@ -6941,14 +6941,16 @@ garbage_collect()
free_unref_items(copyID) free_unref_items(copyID)
int copyID; int copyID;
{ {
dict_T *dd; dict_T *dd, *dd_next;
list_T *ll; list_T *ll, *ll_next;
int did_free = FALSE; int did_free = FALSE;
/* /*
* Go through the list of dicts and free items without the copyID. * Go through the list of dicts and free items without the copyID.
*/ */
for (dd = first_dict; dd != NULL; ) for (dd = first_dict; dd != NULL; )
{
dd_next = dd->dv_used_next;
if ((dd->dv_copyID & COPYID_MASK) != (copyID & COPYID_MASK)) if ((dd->dv_copyID & COPYID_MASK) != (copyID & COPYID_MASK))
{ {
/* Free the Dictionary and ordinary items it contains, but don't /* Free the Dictionary and ordinary items it contains, but don't
@@ -6956,12 +6958,9 @@ free_unref_items(copyID)
* of dicts or list of lists. */ * of dicts or list of lists. */
dict_free(dd, FALSE); dict_free(dd, FALSE);
did_free = TRUE; did_free = TRUE;
/* restart, next dict may also have been freed */
dd = first_dict;
} }
else dd = dd_next;
dd = dd->dv_used_next; }
/* /*
* Go through the list of lists and free items without the copyID. * Go through the list of lists and free items without the copyID.
@@ -6969,6 +6968,8 @@ free_unref_items(copyID)
* are not referenced anywhere. * are not referenced anywhere.
*/ */
for (ll = first_list; ll != NULL; ) for (ll = first_list; ll != NULL; )
{
ll_next = ll->lv_used_next;
if ((ll->lv_copyID & COPYID_MASK) != (copyID & COPYID_MASK) if ((ll->lv_copyID & COPYID_MASK) != (copyID & COPYID_MASK)
&& ll->lv_watch == NULL) && ll->lv_watch == NULL)
{ {
@@ -6977,13 +6978,9 @@ free_unref_items(copyID)
* or list of lists. */ * or list of lists. */
list_free(ll, FALSE); list_free(ll, FALSE);
did_free = TRUE; did_free = TRUE;
/* restart, next list may also have been freed */
ll = first_list;
} }
else ll = ll_next;
ll = ll->lv_used_next; }
return did_free; return did_free;
} }
@@ -7213,7 +7210,7 @@ dict_unref(d)
} }
/* /*
* Free a Dictionary, including all items it contains. * Free a Dictionary, including all non-container items it contains.
* Ignores the reference count. * Ignores the reference count.
*/ */
void void

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
615,
/**/ /**/
614, 614,
/**/ /**/