From patchwork Wed Oct 3 11:43:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goffredo Baroncelli X-Patchwork-Id: 1541171 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 6C6E7DFFEE for ; Wed, 3 Oct 2012 11:43:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752564Ab2JCLn3 (ORCPT ); Wed, 3 Oct 2012 07:43:29 -0400 Received: from mail-bk0-f46.google.com ([209.85.214.46]:62763 "EHLO mail-bk0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751753Ab2JCLn1 (ORCPT ); Wed, 3 Oct 2012 07:43:27 -0400 Received: by bkcjk13 with SMTP id jk13so6051886bkc.19 for ; Wed, 03 Oct 2012 04:43:25 -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=4/tz06JuqP5swasIl1xko/olO8faauGB2ag3buEmCHw=; b=LrijJyProktYZNi4u9bZeJgG8nJhgDEEg+He5keBpZ4kkC3DaNZE2pPjNvF4ZP8vvt i42jA2PfGjZMGXnVTNdnzDhxb8GAqf3tBV6XW8lci5UCN7UkUDcOAJgHa+m3FTBcLDC6 5q9sJ7lLqKctlWA7Kbpq3/wi8vkfaaLhjEcVO5zUJZxveiTrNf5AUjWMGThols/551Cb OJxkTnVYqNoWIbckhqiwMbFgMgw1YIsw87HaFVfhN7yaIoHysmL+1FOoIHJeJ3nbNbE0 +/EMuPdOQhBzlBj1wllTjsGKeGBgmNJlAGm4UgTvlR8v1sZYd1dbsqP9CJJipirCYaF6 J3cQ== Received: by 10.204.11.194 with SMTP id u2mr389139bku.41.1349264605552; Wed, 03 Oct 2012 04:43:25 -0700 (PDT) Received: from antares.campus-server.com (antares.campus-server.com. [176.9.97.22]) by mx.google.com with ESMTPS id ia2sm3264906bkc.11.2012.10.03.04.43.25 (version=SSLv3 cipher=OTHER); Wed, 03 Oct 2012 04:43:25 -0700 (PDT) From: Goffredo Baroncelli To: Chris Mason Cc: "linux-btrfs@vger.kernel.org" , Goffredo Baroncelli Subject: [PATCH 1/2] Update btrfs filesystem df command Date: Wed, 3 Oct 2012 13:43:15 +0200 Message-Id: <1349264596-9383-2-git-send-email-kreijack@inwind.it> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1349264596-9383-1-git-send-email-kreijack@inwind.it> References: <1349264596-9383-1-git-send-email-kreijack@inwind.it> Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org 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 | 264 +++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 215 insertions(+), 49 deletions(-) diff --git a/cmds-filesystem.c b/cmds-filesystem.c index b1457de..6c3ebdc 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 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_df(int argc, char **argv) +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; /* fielsystem size == sum of + disk 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,191 @@ 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 ret; + } + + 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, "Chunk-size", + 1+width, "Logical-size", + width, "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+1, 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 [-d][-s][-k] [..]", + "Show space usage information for a mount point(s).", + "", + "-k\tSet KB (1024 bytes) as unit", + "-s\tDon't show the summary section", + "-d\tDon't show the detail section", + 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; + + if (check_argc_min(argc, 2)) + usage(cmd_disk_free_usage); + + for(i=1; i< argc ; i++){ + if(!strcmp(argv[i],"-d")) + flags &= ~DF_SHOW_DETAIL; + else if(!strcmp(argv[i],"-s")) + flags &= ~DF_SHOW_SUMMARY; + else if(!strcmp(argv[i],"-k")) + flags &= ~DF_HUMAN_UNIT; + else{ + 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 +695,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 },