Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use 32KB buffer for copyFile() (reduces copy time by 30%) #1749

Merged
merged 5 commits into from
Jun 14, 2024
Merged

Use 32KB buffer for copyFile() (reduces copy time by 30%) #1749

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54953ec
Use 32KB buffer for `copyFile()` (reduces copy time by 30%)
MahouShoujoMivutilde Jun 12, 2024
ed7ee99
Apply suggested changes
MahouShoujoMivutilde Jun 14, 2024
7f681ca
Just delete incomplete an file on all errors
MahouShoujoMivutilde Jun 14, 2024
7487704
Mention new progress UI update frequency
MahouShoujoMivutilde Jun 14, 2024
f5d43fe
Return the old (each 4MB copied) progress update frequency
MahouShoujoMivutilde Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 23 additions & 19 deletions copy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,24 @@ import (
"github.com/djherbis/times"
)

type ProgressWriter struct {
writer io.Writer
nums chan<- int64
}

func NewProgressWriter(writer io.Writer, nums chan<- int64) *ProgressWriter {
return &ProgressWriter{
writer: writer,
nums: nums,
}
}

func (progressWriter *ProgressWriter) Write(b []byte) (int, error) {
n, err := progressWriter.writer.Write(b)
progressWriter.nums <- int64(n)
return n, err
}

func copySize(srcs []string) (int64, error) {
var total int64

Expand Down Expand Up @@ -47,8 +65,6 @@ func copyFile(src, dst string, preserve []string, info os.FileInfo, nums chan in
}
}

buf := make([]byte, 4096)

r, err := os.Open(src)
if err != nil {
return err
Expand All @@ -60,23 +76,11 @@ func copyFile(src, dst string, preserve []string, info os.FileInfo, nums chan in
return err
}

for {
n, err := r.Read(buf)
if err != nil && err != io.EOF {
w.Close()
os.Remove(dst)
return err
}

if n == 0 {
break
}

if _, err := w.Write(buf[:n]); err != nil {
return err
}

nums <- int64(n)
_, err = io.Copy(NewProgressWriter(w, nums), r)
if err != nil {
w.Close()
os.Remove(dst)
return err
}

if err := w.Close(); err != nil {
Expand Down