1
=== modified file 'src/tar/tar-creator.cpp'
2
--- src/tar/tar-creator.cpp	2016-09-05 18:38:36 +0000
3
+++ src/tar/tar-creator.cpp	2016-11-28 21:38:06 +0000
4
@@ -78,24 +78,20 @@
5
78
            step_filenum_ = -1;
78
            step_filenum_ = -1;
6
79
        }
79
        }
7
80
80
9
81
        for(;;)
81
        // if we don't have a file we're working on, then get one
10
82
        if (!step_file_)
11
82
        {
83
        {
28
83
            // if we don't have a file we're working on, then get one
84
            if (step_filenum_ >= filenames_.size()) // tried to read past the end
29
84
            if (!step_file_)
85
            {
30
85
            {
86
                success = false;
31
86
                if (step_filenum_ >= filenames_.size()) // tried to read past the end
87
            }
32
87
                {
88
            // step to next file
33
88
                    success = false;
89
            else if (++step_filenum_ == filenames_.size()) // we made it to the end!
34
89
                    break;
90
            {
35
90
                }
91
                archive_write_close(step_archive_.get());
36
91
92
            }
37
92
                // step to next file
93
            else
38
93
                if (++step_filenum_ == filenames_.size()) // we made it to the end!
94
            {
23
94
                {
24
95
                    archive_write_close(step_archive_.get());
25
96
                    break;
26
97
                }
27
98
39
99
                // write the file's header
95
                // write the file's header
40
100
                const auto& filename = filenames_[step_filenum_];
96
                const auto& filename = filenames_[step_filenum_];
41
101
                add_file_header_to_archive(step_archive_.get(), filename);
97
                add_file_header_to_archive(step_archive_.get(), filename);
42
@@ -104,15 +100,24 @@
43
104
                step_file_.reset(new QFile(filename));
100
                step_file_.reset(new QFile(filename));
44
105
                step_file_->open(QIODevice::ReadOnly);
101
                step_file_->open(QIODevice::ReadOnly);
45
106
            }
102
            }
46
103
        }
47
107
104
48
105
        if (step_file_)
49
106
        {
50
108
            static constexpr int BUFSIZE {1024*10};
107
            static constexpr int BUFSIZE {1024*10};
51
109
            char inbuf[BUFSIZE];
108
            char inbuf[BUFSIZE];
54
110
            const auto n = step_file_->read(inbuf, sizeof(inbuf));
109
            auto inbuf_len = step_file_->read(inbuf, sizeof(inbuf));
55
111
            if (n > 0) // got data
110
            if (inbuf_len > 0) // got data
56
112
            {
111
            {
60
113
                for(;;) {
112
                decltype(inbuf_len) offset = 0;
61
114
                    if (archive_write_data(step_archive_.get(), inbuf, size_t(n)) != -1)
113
                while(offset < inbuf_len) {
62
115
                        break;
114
                    auto const n_written = archive_write_data(step_archive_.get(), inbuf+offset, inbuf_len-offset);
63
115
                    if (n_written > 0) {
64
116
                        offset += n_written;
65
117
                        if (offset == inbuf_len)
66
118
                            break;
67
119
                        continue;
68
120
                    }
69
116
                    const auto err = archive_errno(step_archive_.get());
121
                    const auto err = archive_errno(step_archive_.get());
70
117
                    if (err == ARCHIVE_RETRY)
122
                    if (err == ARCHIVE_RETRY)
71
118
                        continue;
123
                        continue;
72
@@ -125,22 +130,19 @@
73
125
                        throw std::runtime_error(errstr.toStdString());
130
                        throw std::runtime_error(errstr.toStdString());
74
126
                }
131
                }
75
127
            }
132
            }
77
128
            else if (n < 0) // read error
133
            else if (inbuf_len < 0) // read error
78
129
            {
134
            {
79
130
                success = false;
135
                success = false;
80
131
                auto errstr = QStringLiteral("read()ing %1 returned %2 (%3)")
136
                auto errstr = QStringLiteral("read()ing %1 returned %2 (%3)")
81
132
                                  .arg(step_file_->fileName())
137
                                  .arg(step_file_->fileName())
83
133
                                  .arg(n)
138
                                  .arg(inbuf_len)
84
134
                                  .arg(step_file_->errorString());
139
                                  .arg(step_file_->errorString());
85
135
                qWarning() << errstr;
140
                qWarning() << errstr;
86
136
                throw std::runtime_error(errstr.toStdString());
141
                throw std::runtime_error(errstr.toStdString());
87
137
            }
142
            }
91
138
            else if (step_file_->atEnd()) // eof
143
92
139
            {
144
            if (step_file_->atEnd()) // if we're done with the file, close it
90
140
                // loop to next file
93
141
                step_file_.reset();
145
                step_file_.reset();
94
142
                continue;
95
143
            }
96
144
        }
146
        }
97
145
147
98
146
        std::swap(fillme,step_buf_);
148
        std::swap(fillme,step_buf_);
Status:	Merged
Approved by:	Charles Kerr on 2016-11-29
Approved revision:	143
Merged at revision:	122
Proposed branch:	lp:~charlesk/keeper/fix-slow-tar-creator-test
Merge into:	lp:keeper/devel
Prerequisite:	lp:~xavi-garcia-mena/keeper/restore
Diff against target:	98 lines (+31/-29) 1 file modified src/tar/tar-creator.cpp (+31/-29)
To merge this branch:	bzr merge lp:~charlesk/keeper/fix-slow-tar-creator-test
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Xavi Garcia (community)		2016-11-28	Approve on 2016-11-29
unity-api-1-bot	continuous-integration		Approve on 2016-11-29
Review via email: mp+311984@code.launchpad.net