<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10721">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Vector: Copy arrays in a sane way for non-trivially copyable types<br><br>Avoids this type of compilation warnings:<br>‘void* memcpy(void*, const void*, size_t)’ writing to an object of non-trivially copyable type ‘class Complex<float>’; use copy-assignment or copy-initialization instead [-Werror=class-memaccess]<br><br>Change-Id: I9724454dfb7b87f74f39074e4004580ac3b5fe5c<br>---<br>M CommonLibs/Vector.h<br>M Transceiver52M/signalVector.cpp<br>2 files changed, 23 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/CommonLibs/Vector.h b/CommonLibs/Vector.h</span><br><span>index 51a9fb1..9119683 100644</span><br><span>--- a/CommonLibs/Vector.h</span><br><span>+++ b/CommonLibs/Vector.h</span><br><span>@@ -204,10 +204,15 @@</span><br><span> */</span><br><span> void copyToSegment(Vector<T>& other, size_t start, size_t span) const</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- T* base = other.mStart + start;</span><br><span style="color: hsl(0, 100%, 40%);">- assert(base+span<=other.mEnd);</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ T* dst = other.mStart + start;</span><br><span style="color: hsl(120, 100%, 40%);">+ T* src = mStart;</span><br><span style="color: hsl(120, 100%, 40%);">+ assert(dst+span<=other.mEnd);</span><br><span> assert(mStart+span<=mEnd);</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(base,mStart,span*sizeof(T));</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < span; i++, src++, dst++)</span><br><span style="color: hsl(120, 100%, 40%);">+ *dst = *src;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*TODO if not non-trivially copyable type class, optimize:</span><br><span style="color: hsl(120, 100%, 40%);">+ memcpy(dst,mStart,span*sizeof(T)); */</span><br><span> }</span><br><span> </span><br><span> /** Copy all of this Vector to a segment of another Vector. */</span><br><span>diff --git a/Transceiver52M/signalVector.cpp b/Transceiver52M/signalVector.cpp</span><br><span>index 55dad92..fc8157e 100644</span><br><span>--- a/Transceiver52M/signalVector.cpp</span><br><span>+++ b/Transceiver52M/signalVector.cpp</span><br><span>@@ -41,7 +41,14 @@</span><br><span> void signalVector::operator=(const signalVector& vector)</span><br><span> {</span><br><span> resize(vector.size() + vector.getStart());</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(mData, vector.mData, bytes());</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ complex *dst = mData;</span><br><span style="color: hsl(120, 100%, 40%);">+ complex *src = vector.mData;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < size(); i++, src++, dst++)</span><br><span style="color: hsl(120, 100%, 40%);">+ *dst = *src;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: optimize for non non-trivially copyable types: */</span><br><span style="color: hsl(120, 100%, 40%);">+ /*memcpy(mData, vector.mData, bytes()); */</span><br><span> mStart = mData + vector.getStart();</span><br><span> }</span><br><span> </span><br><span>@@ -58,8 +65,13 @@</span><br><span> size_t signalVector::updateHistory()</span><br><span> {</span><br><span> size_t num = getStart();</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- memmove(mData, mStart + this->size() - num, num * sizeof(complex));</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ complex *dst = mData;</span><br><span style="color: hsl(120, 100%, 40%);">+ complex *src = mStart + this->size() - num;</span><br><span style="color: hsl(120, 100%, 40%);">+ for (i = 0; i < num; i++, src++, dst++)</span><br><span style="color: hsl(120, 100%, 40%);">+ *dst = *src;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* TODO: optimize for non non-trivially copyable types: */</span><br><span style="color: hsl(120, 100%, 40%);">+ /*memmove(mData, mStart + this->size() - num, num * sizeof(complex)); */</span><br><span> </span><br><span> return num;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10721">change 10721</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/10721"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-trx </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I9724454dfb7b87f74f39074e4004580ac3b5fe5c </div>
<div style="display:none"> Gerrit-Change-Number: 10721 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-CC: Vadim Yanitskiy <axilirator@gmail.com> </div>