Merge pull request #882 from DarcySail:darcy_faster_CopyStringIn
PiperOrigin-RevId: 271675009
This commit is contained in:
commit
eebc38be7a
|
@ -16,6 +16,7 @@
|
||||||
package usermem
|
package usermem
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"errors"
|
"errors"
|
||||||
"io"
|
"io"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
@ -270,11 +271,10 @@ func CopyStringIn(ctx context.Context, uio IO, addr Addr, maxlen int, opts IOOpt
|
||||||
n, err := uio.CopyIn(ctx, addr, buf[done:done+readlen], opts)
|
n, err := uio.CopyIn(ctx, addr, buf[done:done+readlen], opts)
|
||||||
// Look for the terminating zero byte, which may have occurred before
|
// Look for the terminating zero byte, which may have occurred before
|
||||||
// hitting err.
|
// hitting err.
|
||||||
for i, c := range buf[done : done+n] {
|
if i := bytes.IndexByte(buf[done:done+n], byte(0)); i >= 0 {
|
||||||
if c == 0 {
|
return stringFromImmutableBytes(buf[:done+i]), nil
|
||||||
return stringFromImmutableBytes(buf[:done+i]), nil
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
done += n
|
done += n
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return stringFromImmutableBytes(buf[:done]), err
|
return stringFromImmutableBytes(buf[:done]), err
|
||||||
|
|
Loading…
Reference in New Issue