Rename nfsiostat command to nfsiostat-sysstat

nfsiostat was added to the sysstat package in 2010, but such a command
has already existed in the nfs-utils package since 2008.
So to avoid confusion, rename nfsiostat to nfsiostat-sysstat and
indicate it is now obsolete.
The nfsiostat command from the sysstat package will be removed in a
future version since we don't need two similar commands.

Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>

diff --git a/Makefile.in b/Makefile.in
index 7c46a1e8b38f6d96750f69262cc089e732181caa..e1be1e95af5c568941772952d277095529f9d86f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -163,7 +163,7 @@ NLSPOT= $(NLSPO:.po=.pot)
 % : %.o
        $(CC) -o $@ $(CFLAGS) $^ $(LFLAGS)
 
-all: sadc sar sadf iostat mpstat pidstat nfsiostat cifsiostat locales
+all: sadc sar sadf iostat mpstat pidstat nfsiostat-sysstat cifsiostat locales
 
 common.o: common.c version.h common.h ioconf.h sysconfig.h
 
@@ -247,9 +247,9 @@ mpstat.o: mpstat.c mpstat.h version.h common.h rd_stats.h count.h
 
 mpstat: mpstat.o librdstats_light.a libsyscom.a
 
-nfsiostat.o: nfsiostat.c nfsiostat.h count.h version.h common.h
+nfsiostat-sysstat.o: nfsiostat-sysstat.c nfsiostat-sysstat.h count.h version.h common.h
 
-nfsiostat: nfsiostat.o librdstats_light.a libsyscom.a
+nfsiostat-sysstat: nfsiostat-sysstat.o librdstats_light.a libsyscom.a
 
 cifsiostat.o: cifsiostat.c cifsiostat.h count.h version.h common.h
 
@@ -291,8 +291,8 @@ ifeq ($(INSTALL_DOC),y)
        $(INSTALL_DATA) $(MANGRPARG) man/mpstat.1 $(DESTDIR)$(MAN1_DIR)
        rm -f $(DESTDIR)$(MAN1_DIR)/pidstat.1*
        $(INSTALL_DATA) $(MANGRPARG) man/pidstat.1 $(DESTDIR)$(MAN1_DIR)
-       rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat.1*
-       $(INSTALL_DATA) $(MANGRPARG) man/nfsiostat.1 $(DESTDIR)$(MAN1_DIR)
+       rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat-sysstat.1*
+       $(INSTALL_DATA) $(MANGRPARG) man/nfsiostat-sysstat.1 $(DESTDIR)$(MAN1_DIR)
        rm -f $(DESTDIR)$(MAN1_DIR)/cifsiostat.1*
        $(INSTALL_DATA) $(MANGRPARG) man/cifsiostat.1 $(DESTDIR)$(MAN1_DIR)
 ifeq ($(INSTALL_ISAG),y)
@@ -308,7 +308,7 @@ ifeq ($(COMPRESS_MANPG),y)
        $(ZIP) $(DESTDIR)$(MAN1_DIR)/iostat.1
        $(ZIP) $(DESTDIR)$(MAN1_DIR)/mpstat.1
        $(ZIP) $(DESTDIR)$(MAN1_DIR)/pidstat.1
-       $(ZIP) $(DESTDIR)$(MAN1_DIR)/nfsiostat.1
+       $(ZIP) $(DESTDIR)$(MAN1_DIR)/nfsiostat-sysstat.1
        $(ZIP) $(DESTDIR)$(MAN1_DIR)/cifsiostat.1
 ifeq ($(INSTALL_ISAG),y)
        $(ZIP) $(DESTDIR)$(MAN1_DIR)/isag.1
@@ -348,7 +348,7 @@ endif
        $(INSTALL_BIN) iostat $(DESTDIR)$(BIN_DIR)
        $(INSTALL_BIN) mpstat $(DESTDIR)$(BIN_DIR)
        $(INSTALL_BIN) pidstat $(DESTDIR)$(BIN_DIR)
-       $(INSTALL_BIN) nfsiostat $(DESTDIR)$(BIN_DIR)
+       $(INSTALL_BIN) nfsiostat-sysstat $(DESTDIR)$(BIN_DIR)
        $(INSTALL_BIN) cifsiostat $(DESTDIR)$(BIN_DIR)
 ifeq ($(INSTALL_ISAG),y)
        $(INSTALL_BIN) contrib/isag/isag $(DESTDIR)$(BIN_DIR)
@@ -419,7 +419,7 @@ ifeq ($(INSTALL_DOC),y)
        rm -f $(DESTDIR)$(MAN1_DIR)/iostat.1*
        rm -f $(DESTDIR)$(MAN1_DIR)/mpstat.1*
        rm -f $(DESTDIR)$(MAN1_DIR)/pidstat.1*
-       rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat.1*
+       rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat-sysstat.1*
        rm -f $(DESTDIR)$(MAN1_DIR)/cifsiostat.1*
 ifeq ($(INSTALL_ISAG),y)
        rm -f $(DESTDIR)$(MAN1_DIR)/isag.1
@@ -447,7 +447,7 @@ uninstall_base: uninstall_man uninstall_nls
        rm -f $(DESTDIR)$(BIN_DIR)/iostat
        rm -f $(DESTDIR)$(BIN_DIR)/mpstat
        rm -f $(DESTDIR)$(BIN_DIR)/pidstat
-       rm -f $(DESTDIR)$(BIN_DIR)/nfsiostat
+       rm -f $(DESTDIR)$(BIN_DIR)/nfsiostat-sysstat
        rm -f $(DESTDIR)$(BIN_DIR)/cifsiostat
 ifeq ($(INSTALL_ISAG),y)
        rm -f $(DESTDIR)$(BIN_DIR)/isag
@@ -513,7 +513,7 @@ po-files:
 endif
 
 clean:
-       rm -f sadc sar sadf iostat mpstat pidstat nfsiostat cifsiostat *.o *.a core TAGS
+       rm -f sadc sar sadf iostat mpstat pidstat nfsiostat-sysstat cifsiostat *.o *.a core TAGS
        find nls -name "*.gmo" -exec rm -f {} \;
 
 almost-distclean: clean nls/sysstat.pot
@@ -522,7 +522,7 @@ almost-distclean: clean nls/sysstat.pot
        rm -f cron/sysstat.cron.hourly cron/sysstat.crond.sample cron/sysstat.crond.sample.in
        rm -f contrib/isag/isag
        rm -f man/sa1.8 man/sa2.8 man/sadc.8 man/sadf.1 man/sar.1 man/iostat.1 man/sysstat.5
-       rm -f man/cifsiostat.1 man/nfsiostat.1
+       rm -f man/cifsiostat.1 man/nfsiostat-sysstat.1
        rm -f *.log config.status
        rm -rf autom4te.cache
        rm -f *.save *.old .*.swp data

diff --git a/configure b/configure
index 3e095282c4af799e8cbaa65fa713171f2e0a092c..8d3c19fcf19d1d48585dcbd970fe39110c47de14 100755 (executable)
--- a/configure
+++ b/configure
@@ -5432,7 +5432,7 @@ ac_config_files="$ac_config_files man/iostat.1:man/iostat.in"
        # File must be renamed
 ac_config_files="$ac_config_files man/cifsiostat.1:man/cifsiostat.in"
        # File must be renamed
-ac_config_files="$ac_config_files man/nfsiostat.1:man/nfsiostat.in"
+ac_config_files="$ac_config_files man/nfsiostat-sysstat.1:man/nfsiostat-sysstat.in"
        # File must be renamed
 ac_config_files="$ac_config_files contrib/isag/isag"
  # Permissions must be changed
@@ -6165,7 +6165,7 @@ do
     "man/sysstat.5") CONFIG_FILES="$CONFIG_FILES man/sysstat.5:man/sysstat.in" ;;
     "man/iostat.1") CONFIG_FILES="$CONFIG_FILES man/iostat.1:man/iostat.in" ;;
     "man/cifsiostat.1") CONFIG_FILES="$CONFIG_FILES man/cifsiostat.1:man/cifsiostat.in" ;;
-    "man/nfsiostat.1") CONFIG_FILES="$CONFIG_FILES man/nfsiostat.1:man/nfsiostat.in" ;;
+    "man/nfsiostat-sysstat.1") CONFIG_FILES="$CONFIG_FILES man/nfsiostat-sysstat.1:man/nfsiostat-sysstat.in" ;;
     "contrib/isag/isag") CONFIG_FILES="$CONFIG_FILES contrib/isag/isag" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 

diff --git a/configure.in b/configure.in
index 1755dff01102d4ef0a5b4e83a7cba84a00998283..8031942561ade6d1ec56fc3231026cfea2ecd4f1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -608,7 +608,7 @@ AC_CONFIG_FILES([man/sar.1:man/sar.in])             # File must be renamed
 AC_CONFIG_FILES([man/sysstat.5:man/sysstat.in])        # File must be renamed
 AC_CONFIG_FILES([man/iostat.1:man/iostat.in])  # File must be renamed
 AC_CONFIG_FILES([man/cifsiostat.1:man/cifsiostat.in])  # File must be renamed
-AC_CONFIG_FILES([man/nfsiostat.1:man/nfsiostat.in])    # File must be renamed
+AC_CONFIG_FILES([man/nfsiostat-sysstat.1:man/nfsiostat-sysstat.in])    # File must be renamed
 AC_CONFIG_FILES([contrib/isag/isag], [chmod +x contrib/isag/isag]) # Permissions must be changed
 
 AC_OUTPUT(Makefile)

diff --git a/man/nfsiostat.in b/man/nfsiostat-sysstat.in
similarity index 84%
rename from man/nfsiostat.in
rename to man/nfsiostat-sysstat.in
index ea5ad7c21a9bb2a40f844a0da54a6c1f881d8d66..c8a4ed7f8996e64d6822f61a6e4a14a028870fee 100644 (file)
--- a/man/nfsiostat.in
+++ b/man/nfsiostat-sysstat.in
@@ -1,16 +1,16 @@
-.TH NFSIOSTAT 1 "JULY 2012" Linux "Linux User's Manual" -*- nroff -*-
+.TH NFSIOSTAT-SYSSTAT 1 "JANUARY 2014" Linux "Linux User's Manual" -*- nroff -*-
 .SH NAME
-nfsiostat \- Report input/output statistics for network filesystems (NFS).
+nfsiostat-sysstat (the nfsiostat command from the sysstat package) \- Report input/output statistics for network filesystems (NFS).
 .SH SYNOPSIS
 .ie 'yes'@WITH_DEBUG@' \{
-.B nfsiostat [ -h ] [ -k | -m ] [ -t ] [ -V ] [ --debuginfo ] [
+.B nfsiostat-sysstat [ -h ] [ -k | -m ] [ -t ] [ -V ] [ --debuginfo ] [
 .I interval
 .B [
 .I count
 .B ] ]
 .\}
 .el \{
-.B nfsiostat [ -h ] [ -k | -m ] [ -t ] [ -V ] [
+.B nfsiostat-sysstat [ -h ] [ -k | -m ] [ -t ] [ -V ] [
 .I interval
 .B [
 .I count
@@ -18,7 +18,7 @@ nfsiostat \- Report input/output statistics for network filesystems (NFS).
 .\}
 .SH DESCRIPTION
 The
-.B nfsiostat
+.B nfsiostat-sysstat
 command displays statistics about read and write operations
 on NFS filesystems.
 
@@ -45,7 +45,7 @@ seconds apart. If the
 parameter is specified without the
 .I count
 parameter, the
-.B nfsiostat
+.B nfsiostat-sysstat
 command generates reports continuously.
 
 .SH REPORT
@@ -134,7 +134,7 @@ Print version number then exit.
 
 .SH ENVIRONMENT
 The
-.B nfsiostat
+.B nfsiostat-sysstat
 command takes into account the following environment variables:
 
 .IP S_TIME_FORMAT
@@ -142,7 +142,7 @@ If this variable exists and its value is
 .BR ISO
 then the current locale will be ignored when printing the date in the report
 header. The
-.B nfsiostat
+.B nfsiostat-sysstat
 command will use the ISO 8601 format (YYYY-MM-DD) instead.
 The timestamp displayed with option -t will also be compliant with ISO 8601
 format.
@@ -154,17 +154,28 @@ of the default 1K blocks.
 .SH BUG
 .I /proc
 filesystem must be mounted for
-.B nfsiostat
+.B nfsiostat-sysstat
 to work.
 
 .SH FILE
 .I /proc/self/mountstats
 contains statistics for network filesystems.
-.SH AUTHORS
+
+.SH WARNING
+The nfsiostat
+command from the sysstat package (nfsiostat-sysstat) is now obsolete and is no longer maintained.
+It will be removed in a future sysstat version.
+Please use now the
+.B nfsiostat
+command from the
+.I nfs-utils
+package. 
+
+.SH AUTHOR
 Written by Ivana Varekova (varekova <at> redhat.com)
 
-Maintained by Sebastien Godard (sysstat <at> orange.fr)
 .SH SEE ALSO
+.BR nfsiostat (8),
 .BR sar (1),
 .BR pidstat (1),
 .BR mpstat (1),
@@ -172,4 +183,3 @@ Maintained by Sebastien Godard (sysstat <at> orange.fr)
 .BR iostat (1),
 .BR cifsiostat (1)
 
-.I http://pagesperso-orange.fr/sebastien.godard/

diff --git a/nfsiostat.c b/nfsiostat-sysstat.c
similarity index 99%
rename from nfsiostat.c
rename to nfsiostat-sysstat.c
index 6e62465235718ae3af9455df00cd79b246540624..f5f1ab8c04a48b413ab94ed0f8ad41c5f4c32de1 100644 (file)
--- a/nfsiostat.c
+++ b/nfsiostat-sysstat.c
@@ -1,5 +1,5 @@
 /*
- * nfsiostat: Report NFS I/O statistics
+ * nfsiostat-sysstat: Report NFS I/O statistics
  * Copyright (C) 2010 Red Hat, Inc. All Rights Reserved
  * Written by Ivana Varekova <varekova@redhat.com>
  *
@@ -28,7 +28,7 @@
 #include <sys/utsname.h>
 
 #include "version.h"
-#include "nfsiostat.h"
+#include "nfsiostat-sysstat.h"
 #include "count.h"
 #include "common.h"
 
@@ -622,7 +622,7 @@ void rw_io_stat_loop(long int count, struct tm *rectime)
 
 /*
  ***************************************************************************
- * Main entry to the nfsiostat program.
+ * Main entry to the nfsiostat-sysstat program.
  ***************************************************************************
  */
 int main(int argc, char **argv)

diff --git a/nfsiostat.h b/nfsiostat-sysstat.h
similarity index 92%
rename from nfsiostat.h
rename to nfsiostat-sysstat.h
index e2324e52e35153a5b60de9a10bd9b0844e457243..129b6be1aa721308679c2c203cdc361612143a11 100644 (file)
--- a/nfsiostat.h
+++ b/nfsiostat-sysstat.h
@@ -1,11 +1,11 @@
 /*
- * nfsiostat: Report NFS I/O statistics
+ * nfsiostat-sysstat: Report NFS I/O statistics
  * Copyright (C) 2010 Red Hat, Inc. All Rights Reserved
  * Written by Ivana Varekova <varekova@redhat.com>
  */
 
-#ifndef _NFSIOSTAT_H
-#define _NFSIOSTAT_H
+#ifndef _NFSIOSTAT_SYSSTAT_H
+#define _NFSIOSTAT_SYSSTAT_H
 
 #include "common.h"
 
@@ -54,4 +54,4 @@ struct io_hdr_stats {
 
 #define IO_HDR_STATS_SIZE      (sizeof(struct io_hdr_stats))
 
-#endif  /* _NFSIOSTAT_H */
+#endif  /* _NFSIOSTAT_SYSSTAT_H */