[PATCH 1/2] Update btrfs filesystem df command
From: Goffredo Baroncelli kreij...@inwind.it
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 errno.h
#include uuid/uuid.h
#include ctype.h
+#include sys/vfs.h
#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 path,
- 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(11)
+#define DF_SHOW_DETAIL (12)
+#define DF_HUMAN_UNIT (13)
-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
[PATCH 1/2] Update btrfs filesystem df command
From: Goffredo Baroncelli kreij...@inwind.it
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 | 311 -
1 file changed, 260 insertions(+), 51 deletions(-)
diff --git a/cmds-filesystem.c b/cmds-filesystem.c
index 9c43d35..fceba0e 100644
--- a/cmds-filesystem.c
+++ b/cmds-filesystem.c
@@ -22,6 +22,7 @@
#include errno.h
#include uuid/uuid.h
#include ctype.h
+#include sys/vfs.h
#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 path,
- 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(11)
+#define DF_SHOW_DETAIL (12)
+#define DF_HUMAN_UNIT (13)
+
+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_df(int argc, char **argv)
+static int _cmd_disk_free(char *path, int mode)
{
struct btrfs_ioctl_space_args *sargs, *sargs_orig;
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) {
@@ -102,65 +164,212 @@ static int cmd_df(int argc, char **argv)
ret = ioctl(fd, BTRFS_IOC_SPACE_INFO, sargs);
e = errno;
+ close(fd);
+
if (ret) {
fprintf(stderr, ERROR: couldn't get space info on '%s' - %s\n,
path, strerror(e));
- close(fd);
free(sargs);
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));
+ 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
[PATCH 1/2] Update btrfs filesystem df command
From: Goffredo Baroncelli kreij...@inwind.it
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 errno.h
#include uuid/uuid.h
#include ctype.h
+#include sys/vfs.h
#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 path,
- 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(11)
+#define DF_SHOW_DETAIL (12)
+#define DF_HUMAN_UNIT (13)
+
+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;
+
[PATCH 1/2] Update btrfs filesystem df command
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 errno.h
#include uuid/uuid.h
#include ctype.h
+#include sys/vfs.h
#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 path,
- 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(11)
+#define DF_SHOW_DETAIL (12)
+#define DF_HUMAN_UNIT (13)
+
+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 {
+
Re: [PATCH 1/2] Update btrfs filesystem df command
On Wed, Oct 03, 2012 at 01:43:15PM +0200, Goffredo Baroncelli wrote:
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
(snipped)
+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;
+ }
Is there any reason getopt(), or better yet, getopt_long() won't work?
+
+ }
+
+ 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 },
If this command is going to replace df, you should change the function
name back to cmd_df.
Thanks,
Ilya
--
To unsubscribe from this list: send the line unsubscribe linux-btrfs in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] Update btrfs filesystem df command
On 10/03/2012 05:02 PM, Ilya Dryomov wrote:
+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;
+ }
Is there any reason getopt(), or better yet, getopt_long() won't work?
I re-changed idea: I will use getopt()
--
To unsubscribe from this list: send the line unsubscribe linux-btrfs in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] Update btrfs filesystem df command
On Wed, Oct 03, 2012 at 06:34:38PM +0200, Goffredo Baroncelli wrote:
On 10/03/2012 05:02 PM, Ilya Dryomov wrote:
On Wed, Oct 03, 2012 at 01:43:15PM +0200, Goffredo Baroncelli wrote:
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
(snipped)
+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;
+ }
Is there any reason getopt(), or better yet, getopt_long() won't work?
In the beginning there were also the switches +d, +s, +k, then I
dropped them. So I leaved this style. The code is simple enough to
not justify a change.
It's not a matter of style. It is generally expected that several short
options can be specified after one dash. Further, if somebody else were
to add an option with an optional parameter, they'd have to spend time
rewriting your stuff.
In addition to that, other parts of progs already use getopt() in
similar situations. One example would be the scrub subgroup: scrub
commands are equally simple (a few short switches, no parameters), and
yet getopt() is used.
+
+ }
+
+ 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 },
If this command is going to replace df, you should change the function
name back to cmd_df.
I was never convinced to use 'df'. At the beginning when I wrote the
first parser of btrfs, was suggested (not by me) to use long
command and allow the parser to match a contracted command until
there was any ambiguity. I suggested to use disk-free, but everybody
were confortable with df.. so I leaved it as official name. But I
prefer for the internal code a more verbose name.
Well, all your patch is doing is extending the functionality of an
existing command. The official name for that command is df, and you
are not changing its name. Why change the name of an existing function?
Thanks,
Ilya
--
To unsubscribe from this list: send the line unsubscribe linux-btrfs in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/2] Update btrfs filesystem df command
From: Goffredo Baroncelli kreij...@inwind.it
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 | 284 -
1 file changed, 235 insertions(+), 49 deletions(-)
diff --git a/cmds-filesystem.c b/cmds-filesystem.c
index b1457de..2701904 100644
--- a/cmds-filesystem.c
+++ b/cmds-filesystem.c
@@ -22,6 +22,7 @@
#include errno.h
#include uuid/uuid.h
#include ctype.h
+#include sys/vfs.h
#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 path,
- 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(11)
+#define DF_SHOW_DETAIL (12)
+#define DF_HUMAN_UNIT (13)
+
+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;/* 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,211 @@ 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;
+
Re: [PATCH 1/2] Update btrfs filesystem df command
Hi,
On 10/03/2012 07:20 PM, Ilya Dryomov wrote:
filesystem_cmd_group_usage, NULL, {
- { df, cmd_df, cmd_df_usage, NULL, 0 },
+ { df, cmd_disk_free, cmd_disk_free_usage, NULL, 0 },
If this command is going to replace df, you should change the function
name back to cmd_df.
I was never convinced to use 'df'. At the beginning when I wrote the
first parser of btrfs, was suggested (not by me) to use long
command and allow the parser to match a contracted command until
there was any ambiguity. I suggested to use disk-free, but everybody
were confortable with df.. so I leaved it as official name. But I
prefer for the internal code a more verbose name.
Well, all your patch is doing is extending the functionality of an
existing command. The official name for that command is df, and you
are not changing its name.
I would like change the name of the command from df to disk-free.
Unfortunately (for me) Chris ask to leaved the old name...
Why change the name of an existing function?
Strictly speaking, I never changed the name of the function. At the
beginning I added another command (who was named disk-usage), then Chris
asked to replace df with the new one. So I removed the old one.
Seeing the patch it seems that I changed the name, but the truth is that
I added a new one then removed the old one. Due to how the patch is
generated it seems another thing.
But this doesn't change too much.
The point is that the function name doesn't match the command name. It
is not the single case: look at the function cmd_send_start()
(associated to the send command), cmd_defrag() )associated to the
command defragment)
BR
G.Baroncelli
Thanks,
Ilya
--
To unsubscribe from this list: send the line unsubscribe linux-btrfs in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] Update btrfs filesystem df command
On Wed, Oct 03, 2012 at 07:22:31PM +0200, Goffredo Baroncelli wrote:
From: Goffredo Baroncelli kreij...@inwind.it
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 | 284
-
1 file changed, 235 insertions(+), 49 deletions(-)
diff --git a/cmds-filesystem.c b/cmds-filesystem.c
index b1457de..2701904 100644
--- a/cmds-filesystem.c
+++ b/cmds-filesystem.c
@@ -22,6 +22,7 @@
#include errno.h
#include uuid/uuid.h
#include ctype.h
+#include sys/vfs.h
#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 path,
- 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 (11)
+#define DF_SHOW_DETAIL (12)
+#define DF_HUMAN_UNIT(13)
+
+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;/* 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,211 @@ 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);
-
Re: [PATCH 1/2] Update btrfs filesystem df command
On Wed, Oct 03, 2012 at 11:34:00PM +0300, Ilya Dryomov wrote:
On Wed, Oct 03, 2012 at 07:22:31PM +0200, Goffredo Baroncelli wrote:
[snip]
+static const char * const cmd_disk_free_usage[] = {
+ btrfs filesystem df [-d|-s][-k] path [path..],
+ Show space usage information for a mount point(s).,
+ ,
+ -k\tSet KB (1024 bytes) as unit,
+ -s\tShow the summary section only,
+ -d\tShow the detail section only,
+ 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){
+ charc = getopt(argc, argv, dsk);
+ if(c0)
+ break;
+ switch(c){
+ case 'd':
+ flags = ~DF_SHOW_SUMMARY;
+ break;
+ case 's':
+ flags = ~DF_SHOW_DETAIL;
+ break;
+ case 'k':
+ flags = ~DF_HUMAN_UNIT;
+ break;
+ default:
+ usage(cmd_disk_free_usage);
+ }
+ }
+
+ if( !(flags (DF_SHOW_SUMMARY|DF_SHOW_DETAIL)) ){
+ fprintf(stderr, btrfs filesystem df: it is not possible to
specify -s AND -d\n);
This doesn't look right at all. You are adding two switches and
specifying both of them is an error? A little too much for a command
whose job is to do some basic math and pretty-print the result.
How about displaying just the summary by default and then adding a
*single* switch (-v or whatever) for summary+details?
I'd prefer to see both sections by default. The reason for this is
that without both sections, people tend to get confused because they
don't know they're looking at half the story (e.g. some numbers change
twice as fast as they think they should).
I think supplying both options should probably show both sections
again, and make it not an error to do so, but I'm happy either way.
Hugo.
--
=== Hugo Mills: hugo@... carfax.org.uk | darksatanic.net | lug.org.uk ===
PGP key: 515C238D from wwwkeys.eu.pgp.net or http://www.carfax.org.uk
--- He's a nutcase, you know. There's no getting away from it -- ---
he'll end up with a knighthood
signature.asc
Description: Digital signature
Re: [PATCH 1/2] Update btrfs filesystem df command
On 10/03/2012 10:38 PM, Hugo Mills wrote:
+ if( !(flags (DF_SHOW_SUMMARY|DF_SHOW_DETAIL)) ){
+ fprintf(stderr, btrfs filesystem df: it is not possible to
specify -s AND -d\n);
This doesn't look right at all. You are adding two switches and
specifying both of them is an error? A little too much for a command
whose job is to do some basic math and pretty-print the result.
How about displaying just the summary by default and then adding a
*single* switch (-v or whatever) for summary+details?
I'd prefer to see both sections by default. The reason for this is
that without both sections, people tend to get confused because they
don't know they're looking at half the story (e.g. some numbers change
twice as fast as they think they should).
I agree with Hugo. As default both the section should be showed.
I think supplying both options should probably show both sections
again, and make it not an error to do so, but I'm happy either way.
Because the default is to show both the sections, passing a switch means
hide the other section. So passing both the switches means: hide both
the sections...
This is the reason of the check.
I am thinking to remove both the switches... But today is too late...
Now I am seeing a reply by Ilya which reached this same conclusion...
But today is still to late. Tomorrow I will rearrange the patch...
Hugo.
Goffredp
--
To unsubscribe from this list: send the line unsubscribe linux-btrfs in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
