From 3a95a07d88a6926bd2f67dc53c977b8dbc828f9c Mon Sep 17 00:00:00 2001 From: Christian Mauderer Date: Thu, 9 Jul 2020 10:21:29 +0200 Subject: media-server: Add ability for retry. This adds the possibility to request a retry in the media-listener if an operation failed. Usefull for example if you want to automatically reformat a disk if it wasn't possible to mount it. --- cpukit/libblock/src/media.c | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) (limited to 'cpukit/libblock') diff --git a/cpukit/libblock/src/media.c b/cpukit/libblock/src/media.c index 5b2b06b5b2..dd604d39bf 100644 --- a/cpukit/libblock/src/media.c +++ b/cpukit/libblock/src/media.c @@ -420,26 +420,30 @@ static rtems_status_code process_event( ) { rtems_status_code sc = RTEMS_SUCCESSFUL; + rtems_status_code sc_retry = RTEMS_SUCCESSFUL; rtems_media_state state = RTEMS_MEDIA_STATE_FAILED; char *dest = NULL; - sc = notify(event, RTEMS_MEDIA_STATE_INQUIRY, src, NULL); - if (sc == RTEMS_SUCCESSFUL) { - state = RTEMS_MEDIA_STATE_READY; - } else { - state = RTEMS_MEDIA_STATE_ABORTED; - } - - sc = (*worker)(state, src, &dest, worker_arg); - if (state == RTEMS_MEDIA_STATE_READY) { + do { + sc = notify(event, RTEMS_MEDIA_STATE_INQUIRY, src, NULL); if (sc == RTEMS_SUCCESSFUL) { - state = RTEMS_MEDIA_STATE_SUCCESS; + state = RTEMS_MEDIA_STATE_READY; } else { - state = RTEMS_MEDIA_STATE_FAILED; + state = RTEMS_MEDIA_STATE_ABORTED; + } + + sc = (*worker)(state, src, &dest, worker_arg); + if (state == RTEMS_MEDIA_STATE_READY) { + if (sc == RTEMS_SUCCESSFUL) { + state = RTEMS_MEDIA_STATE_SUCCESS; + } else { + state = RTEMS_MEDIA_STATE_FAILED; + } } - } - notify(event, state, src, dest); + sc_retry = notify(event, state, src, dest); + } while (state == RTEMS_MEDIA_STATE_FAILED + && sc_retry == RTEMS_INCORRECT_STATE); remember_event(event, state, src, dest); if (state == RTEMS_MEDIA_STATE_SUCCESS) { -- cgit v1.2.3