diff options
| author | Sverker Eriksson <[email protected]> | 2017-12-21 13:26:49 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-12-21 13:26:49 +0100 |
| commit | fb60cf1408edc6ee03c7e391419367d047721809 (patch) | |
| tree | ca55518da06cca15003d3415aa3f32f1e152619a /erts/emulator | |
| parent | ef4f493c4ccc23d8d43f97f99f35f1bb987b6c44 (diff) | |
| parent | f0cf0f34e72db49c9b6011a3379b300fe66035fd (diff) | |
| download | otp-fb60cf1408edc6ee03c7e391419367d047721809.tar.gz otp-fb60cf1408edc6ee03c7e391419367d047721809.tar.bz2 otp-fb60cf1408edc6ee03c7e391419367d047721809.zip | |
Merge branch 'sverker/cuddle-valgrind' into maint
Diffstat (limited to 'erts/emulator')
| -rw-r--r-- | erts/emulator/test/driver_SUITE.erl | 5 | ||||
| -rw-r--r-- | erts/emulator/test/driver_SUITE_data/chkio_drv.c | 17 |
2 files changed, 14 insertions, 8 deletions
diff --git a/erts/emulator/test/driver_SUITE.erl b/erts/emulator/test/driver_SUITE.erl index 6810729285..c31ceb4d4b 100644 --- a/erts/emulator/test/driver_SUITE.erl +++ b/erts/emulator/test/driver_SUITE.erl @@ -1673,7 +1673,10 @@ smp_select0(Config) -> smp_select_loop(_, 0) -> ok; smp_select_loop(Port, N) -> - "ok" = erlang:port_control(Port, ?CHKIO_SMP_SELECT, []), + case erlang:port_control(Port, ?CHKIO_SMP_SELECT, []) of + "yield" -> erlang:yield(); + "ok" -> ok + end, receive stop -> io:format("Worker ~p stopped with ~p laps left\n",[self(), N]), diff --git a/erts/emulator/test/driver_SUITE_data/chkio_drv.c b/erts/emulator/test/driver_SUITE_data/chkio_drv.c index 8e5e81665c..e55b9e10ba 100644 --- a/erts/emulator/test/driver_SUITE_data/chkio_drv.c +++ b/erts/emulator/test/driver_SUITE_data/chkio_drv.c @@ -1225,7 +1225,6 @@ chkio_drv_control(ErlDrvData drv_data, break; } case CHKIO_SMP_SELECT: { - int rounds = 1; /*rand(); */ ChkioSmpSelect* pip = (ChkioSmpSelect*) cddp->test_data; if (pip == NULL) { erl_drv_mutex_lock(smp_pipes_mtx); @@ -1242,7 +1241,8 @@ chkio_drv_control(ErlDrvData drv_data, } erl_drv_mutex_unlock(smp_pipes_mtx); } - while (rounds--) { + res_str = NULL; + { int op = rand_r(&pip->rand_state); switch (pip->state) { case Closed: { @@ -1252,7 +1252,6 @@ chkio_drv_control(ErlDrvData drv_data, fcntl(fds[0], F_SETFL, flags|O_NONBLOCK) < 0) { driver_failure_posix(cddp->port, errno); - rounds = 0; break; } TRACEF(("%T: Created pipe [%d->%d]\n", cddp->id, fds[1], fds[0])); @@ -1332,7 +1331,9 @@ chkio_drv_control(ErlDrvData drv_data, pip->next_write++; } break; - case Waiting: + case Waiting: + res_str = "yield"; + res_len = -1; break; default: fprintf(stderr, "Strange state %d\n", pip->state); @@ -1348,9 +1349,11 @@ chkio_drv_control(ErlDrvData drv_data, else { cddp->test_data = pip; } - } - res_str = "ok"; - res_len = -1; + } + if (!res_str) { + res_str = "ok"; + res_len = -1; + } break; } case CHKIO_DRV_USE: |