mirror of
https://github.com/vim/vim.git
synced 2026-05-28 00:21:37 +02:00
patch 9.2.0151: blob_from_string() is slow for long strings
Problem: blob_from_string() is slow for long strings
Solution: Use ga_grow() to allocate memory once, perform a bulk copy
with mch_memmove() then translate NL to NUL in-place
(Yasuhiro Matsumoto).
closes: #19665
Signed-off-by: Yasuhiro Matsumoto <mattn.jp@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
committed by
Christian Brabandt
parent
7c8168aa0a
commit
475d6e2f1d
+13
-6
@@ -1232,13 +1232,20 @@ convert_string(string_T *str, char_u *from, char_u *to, string_T *ret)
|
||||
static void
|
||||
blob_from_string(char_u *str, blob_T *blob)
|
||||
{
|
||||
char_u *p;
|
||||
int len = (int)STRLEN(str);
|
||||
char_u *dest;
|
||||
|
||||
for (p = str; *p != NUL; ++p)
|
||||
{
|
||||
// Translate newlines in the string to NUL character
|
||||
ga_append(&blob->bv_ga, (*p == NL) ? NUL : (int)*p);
|
||||
}
|
||||
if (len == 0)
|
||||
return;
|
||||
if (ga_grow(&blob->bv_ga, len) == FAIL)
|
||||
return;
|
||||
dest = (char_u *)blob->bv_ga.ga_data + blob->bv_ga.ga_len;
|
||||
mch_memmove(dest, str, (size_t)len);
|
||||
// Translate newlines in the string to NUL characters
|
||||
for (int i = 0; i < len; ++i)
|
||||
if (dest[i] == NL)
|
||||
dest[i] = NUL;
|
||||
blob->bv_ga.ga_len += len;
|
||||
}
|
||||
|
||||
/*
|
||||
|
||||
@@ -734,6 +734,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
151,
|
||||
/**/
|
||||
150,
|
||||
/**/
|
||||
|
||||
Reference in New Issue
Block a user