Skip to content

copy_n: fast copy with memmove fixed #15

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

Open
ph4r05 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

copy_n: fast copy with memmove fixed #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
be833ef
copy_n: fast copy with memmove fixed
ph4r05 Jan 17, 2017
4e0da30
copy_n: if n is null return immediately
ph4r05 Jan 17, 2017
f6d8d8d
randomised tests - more rounds, helped with debugging fast_copy in co…
ph4r05 Jan 17, 2017
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
27 changes: 18 additions & 9 deletions bitarray/_bitarray.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,25 +253,34 @@ copy_n(bitarrayobject *self, idx_t a,
assert(0 <= n && n <= self->nbits && n <= other->nbits);
assert(0 <= a && a <= self->nbits - n);
assert(0 <= b && b <= other->nbits - n);
if (n == 0){
return;
}

/* XXX
if (self->endian == other->endian && a % 8 == 0 && b % 8 == 0 && n >= 8)
{
Py_ssize_t bytes;
idx_t bits;
const Py_ssize_t bytes = (Py_ssize_t) n / 8;
const idx_t bits = bytes * 8;

if (a <= b){
memmove(self->ob_item + a / 8, other->ob_item + b / 8, bytes);
}

if (n != bits) {
copy_n(self, bits + a, other, bits + b, n - bits);
}

if (a > b){
memmove(self->ob_item + a / 8, other->ob_item + b / 8, bytes);
}

bytes = n / 8;
bits = 8 * bytes;
copy_n(self, bits + a, other, bits + b, n - bits);
memmove(self->ob_item + a / 8, other->ob_item + b / 8, bytes);
return;
}
*/

/* the different type of looping is only relevant when other and self
are the same object, i.e. when copying a piece of an bitarrayobject
onto itself */
if (a < b) {
if (a <= b) {
for (i = 0; i < n; i++) /* loop forward (delete) */
setbit(self, i + a, GETBIT(other, i + b));
}
Expand Down
4 changes: 2 additions & 2 deletions test/test_bitarray.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,7 +506,7 @@ def test_setitem4(self):
for a in self.randombitarrays():
la = len(a)
if la == 0: continue
for dum in range(3):
for dum in range(50):
step = self.rndsliceidx(la)
if step == 0: step = None
s = slice(self.rndsliceidx(la),
Expand Down Expand Up @@ -580,7 +580,7 @@ def test_delitem2(self):
for a in self.randombitarrays():
la = len(a)
if la == 0: continue
for dum in range(10):
for dum in range(50):
step = self.rndsliceidx(la)
if step == 0: step = None
s = slice(self.rndsliceidx(la),
Expand Down