078e9a1cc9
We reuse the task_position enum and task_ctx struct of the original progress indicator, adding more values and fields for our needs. Then add hooks in all steps of the check to properly record progress. Here's how the output looks like on a 22 Tb 5-disk RAID1 FS: Opening filesystem to check... Checking filesystem on /dev/mapper/luks-ST10000VN0004-XXXXXXXX UUID: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx [1/7] checking extents (0:20:21 elapsed, 950958 items checked) [2/7] checking root items (0:01:29 elapsed, 15121 items checked) [3/7] checking free space cache (0:00:11 elapsed, 4928 items checked) [4/7] checking fs roots (0:51:31 elapsed, 600892 items checked) [5/7] checking csums (0:14:35 elapsed, 754522 items checked) [6/7] checking root refs (0:00:00 elapsed, 232 items checked) [7/7] checking quota groups skipped (not enabled on this FS) found 5286458060800 bytes used, no error found Signed-off-by: Stéphane Lesimple <stephane_btrfs@lesimple.fr> Signed-off-by: David Sterba <dsterba@suse.com>
150 lines
3 KiB
C
150 lines
3 KiB
C
/*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public
|
|
* License v2 as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public
|
|
* License along with this program; if not, write to the
|
|
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
* Boston, MA 021110-1307, USA.
|
|
*/
|
|
|
|
#include <pthread.h>
|
|
#include <sys/timerfd.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <time.h>
|
|
|
|
#include "task-utils.h"
|
|
|
|
struct task_info *task_init(void *(*threadfn)(void *), int (*postfn)(void *),
|
|
void *thread_private)
|
|
{
|
|
struct task_info *info = calloc(1, sizeof(struct task_info));
|
|
|
|
if (!info)
|
|
return NULL;
|
|
|
|
info->private_data = thread_private;
|
|
info->threadfn = threadfn;
|
|
info->postfn = postfn;
|
|
|
|
return info;
|
|
}
|
|
|
|
int task_start(struct task_info *info, time_t *start_time, u64 *item_count)
|
|
{
|
|
int ret;
|
|
|
|
if (!info)
|
|
return -1;
|
|
|
|
if (!info->threadfn)
|
|
return -1;
|
|
|
|
if (start_time)
|
|
*start_time = time(NULL);
|
|
if (item_count)
|
|
*item_count = 0;
|
|
|
|
ret = pthread_create(&info->id, NULL, info->threadfn,
|
|
info->private_data);
|
|
|
|
if (ret)
|
|
info->id = 0;
|
|
|
|
return ret;
|
|
}
|
|
|
|
void task_stop(struct task_info *info)
|
|
{
|
|
if (!info)
|
|
return;
|
|
|
|
if (info->id > 0) {
|
|
pthread_cancel(info->id);
|
|
pthread_join(info->id, NULL);
|
|
info->id = 0;
|
|
}
|
|
|
|
if (info->periodic.timer_fd) {
|
|
close(info->periodic.timer_fd);
|
|
info->periodic.timer_fd = 0;
|
|
}
|
|
|
|
if (info->postfn)
|
|
info->postfn(info->private_data);
|
|
}
|
|
|
|
void task_deinit(struct task_info *info)
|
|
{
|
|
if (!info)
|
|
return;
|
|
|
|
free(info);
|
|
}
|
|
|
|
int task_period_start(struct task_info *info, unsigned int period_ms)
|
|
{
|
|
unsigned int ns;
|
|
unsigned int sec;
|
|
struct itimerspec itval;
|
|
|
|
if (!info)
|
|
return -1;
|
|
|
|
info->periodic.timer_fd = timerfd_create(CLOCK_MONOTONIC, 0);
|
|
if (info->periodic.timer_fd == -1) {
|
|
info->periodic.timer_fd = 0;
|
|
return info->periodic.timer_fd;
|
|
}
|
|
|
|
info->periodic.wakeups_missed = 0;
|
|
|
|
sec = period_ms / 1000;
|
|
ns = (period_ms - (sec * 1000)) * 1000 * 1000;
|
|
itval.it_interval.tv_sec = sec;
|
|
itval.it_interval.tv_nsec = ns;
|
|
itval.it_value.tv_sec = sec;
|
|
itval.it_value.tv_nsec = ns;
|
|
|
|
return timerfd_settime(info->periodic.timer_fd, 0, &itval, NULL);
|
|
};
|
|
|
|
void task_period_wait(struct task_info *info)
|
|
{
|
|
unsigned long long missed;
|
|
int ret;
|
|
|
|
if (!info)
|
|
return;
|
|
|
|
if (info->periodic.timer_fd == 0)
|
|
return;
|
|
|
|
ret = read(info->periodic.timer_fd, &missed, sizeof (missed));
|
|
if (ret == -1)
|
|
return;
|
|
|
|
if (missed > 0)
|
|
info->periodic.wakeups_missed += (missed - 1);
|
|
}
|
|
|
|
void task_period_stop(struct task_info *info)
|
|
{
|
|
if (!info)
|
|
return;
|
|
|
|
if (info->periodic.timer_fd) {
|
|
timerfd_settime(info->periodic.timer_fd, 0, NULL, NULL);
|
|
close(info->periodic.timer_fd);
|
|
info->periodic.timer_fd = -1;
|
|
}
|
|
}
|