mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 22:35:33 +00:00
Code Issues Releases Wiki Activity

zdtm/maps007: limit delta betwen parent and child from both sides

Browse Source 
Currenty a parent can go far away from child and we will need to wait
too long for checking results.

This pach limits delta to [MIN_DELTA, 2 * MIN_DELTA].

Thi patch should fix current errors for the CRIU-iter job in Jenkins.

Signed-off-by: Andrey Vagin <avagin@openvz.org>
Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin
2014-02-25 15:11:18 +04:00
committed by Pavel Emelyanov
parent 1a89dbb5da
commit 1b16fa048c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/zdtm/live/transition/maps007.c
View File

@@ -37,7 +37,7 @@ int main(int argc, char **argv)
void *start, *end, *p; void *start, *end, *p;
pid_t child; pid_t child;
struct { struct {
uint32_t delta; futex_t delta;
futex_t stop; futex_t stop;
} *shm; } *shm;
uint32_t v; uint32_t v;
@@ -61,7 +61,7 @@ int main(int argc, char **argv)
end = start + MEM_SIZE; end = start + MEM_SIZE;
v = 0; v = 0;
atomic_set(&shm->delta, v); futex_set(&shm->delta, v);
futex_set(&shm->stop, 0); futex_set(&shm->stop, 0);
child = fork(); child = fork();
@@ -79,15 +79,16 @@ int main(int argc, char **argv)
int prot = PROT_NONE; int prot = PROT_NONE;
if (child) { if (child) {
atomic_inc(&shm->delta); futex_wait_while_gt(&shm->delta, 2 * MAX_DELTA);
futex_inc(&shm->delta);
} else { } else {
if (!futex_get(&shm->stop)) if (!futex_get(&shm->stop))
/* MAX_DELTA steps behind the parent */ /* MAX_DELTA steps behind the parent */
while (atomic_get(&shm->delta) < MAX_DELTA && while (futex_get(&shm->delta) < MAX_DELTA &&
!futex_get(&shm->stop)); !futex_get(&shm->stop));
else if (atomic_get(&shm->delta) == 0) else if (atomic_get(&shm->delta) == 0)
break; break;
atomic_dec(&shm->delta); futex_dec_and_wake(&shm->delta);
} }
count++; count++;