From patchwork Sat Oct 13 17:47:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Goffredo Baroncelli X-Patchwork-Id: 1589231 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 25373E018A for ; Sat, 13 Oct 2012 17:48:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753951Ab2JMRs0 (ORCPT ); Sat, 13 Oct 2012 13:48:26 -0400 Received: from mail-ea0-f174.google.com ([209.85.215.174]:39494 "EHLO mail-ea0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753929Ab2JMRsZ (ORCPT ); Sat, 13 Oct 2012 13:48:25 -0400 Received: by mail-ea0-f174.google.com with SMTP id c13so832598eaa.19 for ; Sat, 13 Oct 2012 10:48:24 -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=Gsfg0633bAs7SH2IBwuFVu2+qNS1qawAMVFqg4NIglo=; b=HL/54oaDkzSxyUWyTgVTOzBx48RgNbok9OAt69e3RjGzXnXRb1xxBb5mEhHGs57QBo C34BPbkz+ef+yAzyEeiSc1jILvQ0JZ/WLRu2jGQxFToJN3SXto/mOqgehzCmJ+e8rxZm kQ06ZKjU05v0YZzbRzmNv9MLQ1ZYJSdXqxsz8VNRFRTpw7gzGLYSmJ+OTzavkCeT66V4 EI7WBkGBSiy/o5jOJT/73hV4RywKrWvDzsBjah3jedXqHeZLWMZGa1ZvO9VS8Kr5IhOY hxEhSUbb38dbFuPkQLfCd9abEk65ud1ihv8y82vRpWDcxDnSRMFCHP6HbB9yRHYMHxRa Hdlg== Received: by 10.14.214.133 with SMTP id c5mr10520488eep.8.1350150504350; Sat, 13 Oct 2012 10:48:24 -0700 (PDT) Received: from venice..bhome (host103-133-static.242-95-b.business.telecomitalia.it. [95.242.133.103]) by mx.google.com with ESMTPS id d44sm17013051eeo.10.2012.10.13.10.48.22 (version=SSLv3 cipher=OTHER); Sat, 13 Oct 2012 10:48:23 -0700 (PDT) From: Goffredo Baroncelli To: Chris Mason Cc: Hugo Mills , Roman Mamedov , =?UTF-8?B?U8OpYmFzdGllbiBNYXVyeQ==?= , Ilya Dryomov , linux-btrfs@vger.kernel.org, Martin Steigerwald , Goffredo Baroncelli Subject: [PATCH 1/2] Update btrfs filesystem df command Date: Sat, 13 Oct 2012 19:47:40 +0200 Message-Id: <1350150461-11099-2-git-send-email-kreijack@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1350150461-11099-1-git-send-email-kreijack@gmail.com> References: <1350150461-11099-1-git-send-email-kreijack@gmail.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 | 308 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 259 insertions(+), 49 deletions(-) diff --git a/cmds-filesystem.c b/cmds-filesystem.c index b1457de..509e393 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,86 @@ 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 **strings_to_free=0; +static int count_string_to_free=0; + +static void add_strings_to_free(char *s) +{ + int size; + + size = sizeof(void*) * ++count_string_to_free; + strings_to_free = realloc( strings_to_free, size); + + /* if we don't have enough memory, we have more serius + problem than that a wrong handling of not enough memory */ + if(!strings_to_free){ + fprintf(stderr, "add_string_to_free(): Not enough memory\n"); + strings_to_free=0; + count_string_to_free=0; + } + + strings_to_free[count_string_to_free-1] = s; +} + +static void free_strings_to_free( ) +{ + int i; + for( i = 0 ; i < count_string_to_free ; i++ ) + free(strings_to_free[i]); + + free(strings_to_free); + + strings_to_free=0; + count_string_to_free=0; +} + +#define DF_SHOW_SUMMARY (1<<1) +#define DF_SHOW_DETAIL (1<<2) +#define DF_HUMAN_UNIT (1<<3) -static int cmd_df(int argc, char **argv) +static char *df_pretty_sizes(u64 size, int mode) +{ + char *s; + + if( mode & DF_HUMAN_UNIT ){ + s = pretty_sizes(size); + if(!s) return NULL; + } else { + s = malloc(20); + if(!s) return NULL; + sprintf(s, "%llu", size/1024); + } + + add_strings_to_free(s); + return s; +} + + +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, width_sl; + 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; + char *rpath; + fd = open_file_or_dir(path); if (fd < 0) { @@ -103,56 +165,204 @@ 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 = 14; + width_sl = 18; + } else { + width = 18; + width_sl = 18; } + + rpath = realpath(path, 0); + printf("Path: %s\n", rpath); + free(rpath); + + if( mode & DF_SHOW_SUMMARY ){ + printf("Summary:\n"); + printf(" Disk_size:\t\t%*s\n", width, + df_pretty_sizes(total_disk, mode)); + printf(" Disk_allocated:\t%*s\n", width, + df_pretty_sizes(total_chunks, mode)); + printf(" Disk_unallocated:\t%*s\n", width, + df_pretty_sizes(total_disk-total_chunks, mode)); + printf(" Logical_size:\t\t%*s\n", width, + df_pretty_sizes(total_used+total_free, mode)); + printf(" Used:\t\t\t%*s\n", width, + df_pretty_sizes(total_used, mode)); + printf(" Free_(Estimated):\t%*s\t(Max: %s, min: %s)\n", + width, + df_pretty_sizes((u64)(K*total_disk-total_used), mode), + df_pretty_sizes(total_disk-total_chunks+total_free, + mode ), + df_pretty_sizes((total_disk-total_chunks)/2+total_free, + mode )); + printf(" 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("Allocated_area:\n"); + printf(" %-12s%-8s%*s%*s%*s\n", + "Type", + "Mode", + width, "Size_(disk)", + width_sl, "Size_(logical)", + 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(" %-12s%-8s%*s%*s%*s\n", + description, + r_mode, + width, + df_pretty_sizes(allocated, mode), + width_sl, + df_pretty_sizes(sargs->spaces[i].total_bytes , + mode), + width, + df_pretty_sizes(sargs->spaces[i].used_bytes, + mode)); + + } + } + free_strings_to_free(); 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, "k"); + 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 +739,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 },