From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Vladimir Davydov Subject: [RFC PATCH 22/23] vinyl: rename vy_task::status to is_failed Date: Sun, 8 Jul 2018 19:48:53 +0300 Message-Id: <1832a457be98c9e1b42ff7576f865d82d750e976.1531065648.git.vdavydov.dev@gmail.com> In-Reply-To: In-Reply-To: References: To: kostja@tarantool.org Cc: tarantool-patches@freelists.org List-ID: vy_task::status stores the return code of the ->execute method. There are only two codes in use: 0 - success and -1 - failure. So let's chage this to a boolean flag. --- src/box/vy_scheduler.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/box/vy_scheduler.c b/src/box/vy_scheduler.c index ac6b1f47..06dbb1f8 100644 --- a/src/box/vy_scheduler.c +++ b/src/box/vy_scheduler.c @@ -126,9 +126,9 @@ struct vy_task { * a worker thread. */ struct fiber *fiber; - /** Return code of ->execute. */ - int status; - /** If ->execute fails, the error is stored here. */ + /** Set if the task failed. */ + bool is_failed; + /** In case of task failure the error is stored here. */ struct diag diag; /** LSM tree this task is for. */ struct vy_lsm *lsm; @@ -1336,10 +1336,10 @@ static int vy_task_f(va_list va) { struct vy_task *task = va_arg(va, struct vy_task *); - task->status = task->ops->execute(task); - if (task->status != 0) { + if (task->ops->execute(task) != 0) { struct diag *diag = diag_get(); assert(!diag_is_empty(diag)); + task->is_failed = true; diag_move(diag, &task->diag); } cmsg_init(&task->cmsg, vy_task_complete_route); @@ -1360,7 +1360,7 @@ vy_task_execute_f(struct cmsg *cmsg) assert(task->fiber == NULL); task->fiber = fiber_new("task", vy_task_f); if (task->fiber == NULL) { - task->status = -1; + task->is_failed = true; diag_move(diag_get(), &task->diag); cmsg_init(&task->cmsg, vy_task_complete_route); cpipe_push(&task->worker->tx_pipe, &task->cmsg); @@ -1526,7 +1526,7 @@ vy_task_complete(struct vy_task *task) } struct diag *diag = &task->diag; - if (task->status != 0) { + if (task->is_failed) { assert(!diag_is_empty(diag)); goto fail; /* ->execute fialed */ } -- 2.11.0