From patchwork Thu Oct 4 17:27:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goffredo Baroncelli X-Patchwork-Id: 1547241 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id A120740D7F for ; Thu, 4 Oct 2012 17:28:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932112Ab2JDR2J (ORCPT ); Thu, 4 Oct 2012 13:28:09 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:53785 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756196Ab2JDR2G (ORCPT ); Thu, 4 Oct 2012 13:28:06 -0400 Received: by mail-bk0-f46.google.com with SMTP id jk13so464308bkc.19 for ; Thu, 04 Oct 2012 10:28:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=I15+BhaoMnr5OYqpSe9pEB+KD2EZfbrDI95dUf7Q6XA=; b=fXr/UuJzAAiaYlSWjUrLTEXTq6f/lulk/4E6Xob30ugxUtJCa0deVfPtTR3xc+fpCl SMeYx7AfeIcnJX7D6QSxL0XwKzQTtSbyuRFlgiNeCVa9KfD09VxUSIutC4JprUlBEEgO 8dDhyBx6l/wR5rLzIx9AnpWxN46n25DfCD+WaqOffpAClGyA/Q7MaOI6QiD7JOxsSF8f Y1/9J04ULkuMCE9zlcx8a1QnyyEY/ujAgu4YyloM0vQljuYogPQh80EnGDto1fSGrOX4 4nFXV8M8NJUw3Z/EFT2BRIOuWOtq/F4tmzChdSTqrPcJnv6DK2EiYoelx5R7O7jt8NDL yKjg== Received: by 10.204.9.9 with SMTP id j9mr2000704bkj.12.1349371685080; Thu, 04 Oct 2012 10:28:05 -0700 (PDT) Received: from venice..bhome (host158-224-dynamic.53-79-r.retail.telecomitalia.it. [79.53.224.158]) by mx.google.com with ESMTPS id t27sm6256418bkv.10.2012.10.04.10.28.03 (version=SSLv3 cipher=OTHER); Thu, 04 Oct 2012 10:28:04 -0700 (PDT) From: Goffredo Baroncelli To: Chris Mason Cc: Hugo Mills , Roman Mamedov , =?UTF-8?B?U8OpYmFzdGllbiBNYXVyeQ==?= , Ilya Dryomov , linux-btrfs@vger.kernel.org, Goffredo Baroncelli Subject: [PATCH 1/2] Update btrfs filesystem df command Date: Thu, 4 Oct 2012 19:27:58 +0200 Message-Id: <1349371679-10775-2-git-send-email-kreijack@inwind.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1349371679-10775-1-git-send-email-kreijack@inwind.com> References: <1349371679-10775-1-git-send-email-kreijack@inwind.com> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org From: Goffredo Baroncelli The command btrfs filesystem df is used to query the status of the chunks, how many space on the disk(s) are used by the chunks, how many space are available in the chunks, and an estimation of the free space of the filesystem. --- cmds-filesystem.c | 270 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 221 insertions(+), 49 deletions(-) diff --git a/cmds-filesystem.c b/cmds-filesystem.c index b1457de..2e2b4b6 100644 --- a/cmds-filesystem.c +++ b/cmds-filesystem.c @@ -22,6 +22,7 @@ #include #include #include +#include #include "kerncompat.h" #include "ctree.h" @@ -39,25 +40,55 @@ static const char * const filesystem_cmd_group_usage[] = { NULL }; -static const char * const cmd_df_usage[] = { - "btrfs filesystem df ", - "Show space usage information for a mount point", - NULL -}; +static u64 disk_size( char *path){ + struct statfs sfs; + + if( statfs(path, &sfs) < 0 ) + return 0; + else + return sfs.f_bsize * sfs.f_blocks; -static int cmd_df(int argc, char **argv) +} + +static void print_string(char *s, int w) +{ + int i; + + printf("%s", s); + for( i = strlen(s) ; i < w ; i++ ) + putchar(' '); +} + +#define DF_SHOW_SUMMARY (1<<1) +#define DF_SHOW_DETAIL (1<<2) +#define DF_HUMAN_UNIT (1<<3) + +static void pretty_sizes_r(u64 size, int w, int mode) +{ + if( mode & DF_HUMAN_UNIT ){ + char *s = pretty_sizes(size); + printf("%*s", w, s); + free(s); + } else { + printf("%*llu", w, size/1024); + + } +} + +static int _cmd_disk_free(char *path, int mode) { struct btrfs_ioctl_space_args *sargs; u64 count = 0, i; int ret; int fd; - int e; - char *path; - - if (check_argc_exact(argc, 2)) - usage(cmd_df_usage); - - path = argv[1]; + int e, width; + u64 total_disk; /* filesystem size == sum of + disks sizes */ + u64 total_chunks; /* sum of chunks sizes on disk(s) */ + u64 total_used; /* logical space used */ + u64 total_free; /* logical space un-used */ + double K; + fd = open_file_or_dir(path); if (fd < 0) { @@ -103,56 +134,197 @@ static int cmd_df(int argc, char **argv) return ret; } - for (i = 0; i < sargs->total_spaces; i++) { - char description[80]; - char *total_bytes; - char *used_bytes; - int written = 0; - u64 flags = sargs->spaces[i].flags; + total_disk = disk_size(path); + e = errno; + if( total_disk == 0 ){ + fprintf(stderr, "ERROR: couldn't get space info on '%s' - %s\n", + path, strerror(e)); + close(fd); + free(sargs); + return 19; + } + + total_chunks = total_used = total_free = 0; - memset(description, 0, 80); + for (i = 0; i < sargs->total_spaces; i++) { + int ratio=1; + u64 allocated; - if (flags & BTRFS_BLOCK_GROUP_DATA) { - if (flags & BTRFS_BLOCK_GROUP_METADATA) { - snprintf(description, 14, "%s", - "Data+Metadata"); - written += 13; - } else { - snprintf(description, 5, "%s", "Data"); - written += 4; - } - } else if (flags & BTRFS_BLOCK_GROUP_SYSTEM) { - snprintf(description, 7, "%s", "System"); - written += 6; - } else if (flags & BTRFS_BLOCK_GROUP_METADATA) { - snprintf(description, 9, "%s", "Metadata"); - written += 8; - } + u64 flags = sargs->spaces[i].flags; if (flags & BTRFS_BLOCK_GROUP_RAID0) { - snprintf(description+written, 8, "%s", ", RAID0"); - written += 7; + ratio=1; } else if (flags & BTRFS_BLOCK_GROUP_RAID1) { - snprintf(description+written, 8, "%s", ", RAID1"); - written += 7; + ratio=2; } else if (flags & BTRFS_BLOCK_GROUP_DUP) { - snprintf(description+written, 6, "%s", ", DUP"); - written += 5; + ratio=2; } else if (flags & BTRFS_BLOCK_GROUP_RAID10) { - snprintf(description+written, 9, "%s", ", RAID10"); - written += 8; + ratio=2; + } else { + ratio=1; } - total_bytes = pretty_sizes(sargs->spaces[i].total_bytes); - used_bytes = pretty_sizes(sargs->spaces[i].used_bytes); - printf("%s: total=%s, used=%s\n", description, total_bytes, - used_bytes); + allocated = sargs->spaces[i].total_bytes * ratio; + + total_chunks += allocated; + total_used += sargs->spaces[i].used_bytes; + total_free += (sargs->spaces[i].total_bytes - + sargs->spaces[i].used_bytes); + + } + K = ((double)total_used + (double)total_free) / + (double)total_chunks; + + if( mode & DF_HUMAN_UNIT ) + width = 12; + else + width = 18; + + printf("Path: %s\n", path); + if( mode & DF_SHOW_SUMMARY ){ + printf("Summary:\n"); + printf(" Disk_size:\t\t"); + pretty_sizes_r(total_disk, width, mode); + printf("\n Disk_allocated:\t"); + pretty_sizes_r(total_chunks, width, mode); + printf("\n Disk_unallocated:\t"); + pretty_sizes_r(total_disk-total_chunks, width, mode); + printf("\n Logical_size:\t\t"); + pretty_sizes_r(total_used+total_free, width, mode); + printf("\n Used:\t\t\t"); + pretty_sizes_r(total_used, width, mode); + printf("\n Free_(Estimated):\t"); + pretty_sizes_r((u64)(K*total_disk-total_used), width, mode); + printf("\t(Max: "); + pretty_sizes_r(total_disk-total_chunks+total_free, + 0, mode ); + printf(", Min: "); + pretty_sizes_r((total_disk-total_chunks)/2+total_free, + 0, mode ); + printf(")\n Data_to_disk_ratio:\t%*.0f %%\n", + width-2, K*100); + } + + if( ( mode & DF_SHOW_DETAIL ) && ( mode & DF_SHOW_SUMMARY ) ) + printf("\n"); + + if( mode & DF_SHOW_DETAIL ){ + /* Remember: the terminals have maximum 80 columns + do not believe to who says otherwise */ + printf("Details:\n"); + printf(" %-12s%-8s%*s%*s%*s\n", + "Chunk_type", + "Mode", + width, "Size_(disk)", + width+3, "Size_(logical)", + width-3, "Used" + ); + + for (i = 0; i < sargs->total_spaces; i++) { + char *description=""; + int ratio=1; + char *r_mode; + u64 allocated; + + u64 flags = sargs->spaces[i].flags; + + if (flags & BTRFS_BLOCK_GROUP_DATA) { + if (flags & BTRFS_BLOCK_GROUP_METADATA){ + description = "Data+M.data"; + } else { + description = "Data"; + } + } else if (flags & BTRFS_BLOCK_GROUP_SYSTEM) { + description = "System"; + } else if (flags & BTRFS_BLOCK_GROUP_METADATA) { + description = "Metadata"; + } + + if (flags & BTRFS_BLOCK_GROUP_RAID0) { + r_mode = "RAID0"; + ratio=1; + } else if (flags & BTRFS_BLOCK_GROUP_RAID1) { + r_mode = "RAID1"; + ratio=2; + } else if (flags & BTRFS_BLOCK_GROUP_DUP) { + r_mode = "DUP"; + ratio=2; + } else if (flags & BTRFS_BLOCK_GROUP_RAID10) { + r_mode = "RAID10"; + ratio=2; + } else { + r_mode = "Single"; + ratio=1; + } + + allocated = sargs->spaces[i].total_bytes * ratio; + + printf(" "); + print_string(description,12); + print_string(r_mode, 8); + pretty_sizes_r(allocated, width, mode); + pretty_sizes_r(sargs->spaces[i].total_bytes , + width, mode); + + pretty_sizes_r(sargs->spaces[i].used_bytes, + width, mode); + printf("\n"); + + } } free(sargs); return 0; } +static const char * const cmd_disk_free_usage[] = { + "btrfs filesystem df [-k] [..]", + "Show space usage information for a mount point(s).", + "", + "-k\tSet KB (1024 bytes) as unit", + NULL +}; + +static int cmd_disk_free(int argc, char **argv) +{ + + int flags=DF_SHOW_SUMMARY|DF_SHOW_DETAIL|DF_HUMAN_UNIT; + int i, more_than_one=0; + + optind = 1; + while(1){ + char c = getopt(argc, argv, "dsk"); + if(c<0) + break; + switch(c){ + case 'k': + flags &= ~DF_HUMAN_UNIT; + break; + default: + usage(cmd_disk_free_usage); + } + } + + if (check_argc_min(argc - optind, 1)){ + usage(cmd_disk_free_usage); + return 21; + } + + for(i=optind; i< argc ; i++){ + int r; + if(more_than_one) + printf("\n"); + r = _cmd_disk_free(argv[i], flags); + if( r ) return r; + more_than_one=1; + + } + + return 0; +} + + + static int uuid_search(struct btrfs_fs_devices *fs_devices, char *search) { char uuidbuf[37]; @@ -529,7 +701,7 @@ static int cmd_label(int argc, char **argv) const struct cmd_group filesystem_cmd_group = { filesystem_cmd_group_usage, NULL, { - { "df", cmd_df, cmd_df_usage, NULL, 0 }, + { "df", cmd_disk_free, cmd_disk_free_usage, NULL, 0 }, { "show", cmd_show, cmd_show_usage, NULL, 0 }, { "sync", cmd_sync, cmd_sync_usage, NULL, 0 }, { "defragment", cmd_defrag, cmd_defrag_usage, NULL, 0 },