Skip to content

Commit 0b97789

Browse files
sysstatsysstat
committed
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 <[email protected]>
1 parent 9753391 commit 0b97789

File tree

6 files changed

+43
-33
lines changed

6 files changed

+43
-33
lines changed

‎Makefile.in

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ NLSPOT= $(NLSPO:.po=.pot)
163163
% : %.o
164164
$(CC) -o $@ $(CFLAGS) $^ $(LFLAGS)
165165

166-
all: sadc sar sadf iostat mpstat pidstat nfsiostat cifsiostat locales
166+
all: sadc sar sadf iostat mpstat pidstat nfsiostat-sysstat cifsiostat locales
167167

168168
common.o: common.c version.h common.h ioconf.h sysconfig.h
169169

@@ -247,9 +247,9 @@ mpstat.o: mpstat.c mpstat.h version.h common.h rd_stats.h count.h
247247

248248
mpstat: mpstat.o librdstats_light.a libsyscom.a
249249

250-
nfsiostat.o: nfsiostat.c nfsiostat.h count.h version.h common.h
250+
nfsiostat-sysstat.o: nfsiostat-sysstat.c nfsiostat-sysstat.h count.h version.h common.h
251251

252-
nfsiostat: nfsiostat.o librdstats_light.a libsyscom.a
252+
nfsiostat-sysstat: nfsiostat-sysstat.o librdstats_light.a libsyscom.a
253253

254254
cifsiostat.o: cifsiostat.c cifsiostat.h count.h version.h common.h
255255

@@ -291,8 +291,8 @@ ifeq ($(INSTALL_DOC),y)
291291
$(INSTALL_DATA) $(MANGRPARG) man/mpstat.1 $(DESTDIR)$(MAN1_DIR)
292292
rm -f $(DESTDIR)$(MAN1_DIR)/pidstat.1*
293293
$(INSTALL_DATA) $(MANGRPARG) man/pidstat.1 $(DESTDIR)$(MAN1_DIR)
294-
rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat.1*
295-
$(INSTALL_DATA) $(MANGRPARG) man/nfsiostat.1 $(DESTDIR)$(MAN1_DIR)
294+
rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat-sysstat.1*
295+
$(INSTALL_DATA) $(MANGRPARG) man/nfsiostat-sysstat.1 $(DESTDIR)$(MAN1_DIR)
296296
rm -f $(DESTDIR)$(MAN1_DIR)/cifsiostat.1*
297297
$(INSTALL_DATA) $(MANGRPARG) man/cifsiostat.1 $(DESTDIR)$(MAN1_DIR)
298298
ifeq ($(INSTALL_ISAG),y)
@@ -308,7 +308,7 @@ ifeq ($(COMPRESS_MANPG),y)
308308
$(ZIP) $(DESTDIR)$(MAN1_DIR)/iostat.1
309309
$(ZIP) $(DESTDIR)$(MAN1_DIR)/mpstat.1
310310
$(ZIP) $(DESTDIR)$(MAN1_DIR)/pidstat.1
311-
$(ZIP) $(DESTDIR)$(MAN1_DIR)/nfsiostat.1
311+
$(ZIP) $(DESTDIR)$(MAN1_DIR)/nfsiostat-sysstat.1
312312
$(ZIP) $(DESTDIR)$(MAN1_DIR)/cifsiostat.1
313313
ifeq ($(INSTALL_ISAG),y)
314314
$(ZIP) $(DESTDIR)$(MAN1_DIR)/isag.1
@@ -348,7 +348,7 @@ endif
348348
$(INSTALL_BIN) iostat $(DESTDIR)$(BIN_DIR)
349349
$(INSTALL_BIN) mpstat $(DESTDIR)$(BIN_DIR)
350350
$(INSTALL_BIN) pidstat $(DESTDIR)$(BIN_DIR)
351-
$(INSTALL_BIN) nfsiostat $(DESTDIR)$(BIN_DIR)
351+
$(INSTALL_BIN) nfsiostat-sysstat $(DESTDIR)$(BIN_DIR)
352352
$(INSTALL_BIN) cifsiostat $(DESTDIR)$(BIN_DIR)
353353
ifeq ($(INSTALL_ISAG),y)
354354
$(INSTALL_BIN) contrib/isag/isag $(DESTDIR)$(BIN_DIR)
@@ -419,7 +419,7 @@ ifeq ($(INSTALL_DOC),y)
419419
rm -f $(DESTDIR)$(MAN1_DIR)/iostat.1*
420420
rm -f $(DESTDIR)$(MAN1_DIR)/mpstat.1*
421421
rm -f $(DESTDIR)$(MAN1_DIR)/pidstat.1*
422-
rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat.1*
422+
rm -f $(DESTDIR)$(MAN1_DIR)/nfsiostat-sysstat.1*
423423
rm -f $(DESTDIR)$(MAN1_DIR)/cifsiostat.1*
424424
ifeq ($(INSTALL_ISAG),y)
425425
rm -f $(DESTDIR)$(MAN1_DIR)/isag.1
@@ -447,7 +447,7 @@ uninstall_base: uninstall_man uninstall_nls
447447
rm -f $(DESTDIR)$(BIN_DIR)/iostat
448448
rm -f $(DESTDIR)$(BIN_DIR)/mpstat
449449
rm -f $(DESTDIR)$(BIN_DIR)/pidstat
450-
rm -f $(DESTDIR)$(BIN_DIR)/nfsiostat
450+
rm -f $(DESTDIR)$(BIN_DIR)/nfsiostat-sysstat
451451
rm -f $(DESTDIR)$(BIN_DIR)/cifsiostat
452452
ifeq ($(INSTALL_ISAG),y)
453453
rm -f $(DESTDIR)$(BIN_DIR)/isag
@@ -513,7 +513,7 @@ po-files:
513513
endif
514514

515515
clean:
516-
rm -f sadc sar sadf iostat mpstat pidstat nfsiostat cifsiostat *.o *.a core TAGS
516+
rm -f sadc sar sadf iostat mpstat pidstat nfsiostat-sysstat cifsiostat *.o *.a core TAGS
517517
find nls -name "*.gmo" -exec rm -f {} \;
518518

519519
almost-distclean: clean nls/sysstat.pot
@@ -522,7 +522,7 @@ almost-distclean: clean nls/sysstat.pot
522522
rm -f cron/sysstat.cron.hourly cron/sysstat.crond.sample cron/sysstat.crond.sample.in
523523
rm -f contrib/isag/isag
524524
rm -f man/sa1.8 man/sa2.8 man/sadc.8 man/sadf.1 man/sar.1 man/iostat.1 man/sysstat.5
525-
rm -f man/cifsiostat.1 man/nfsiostat.1
525+
rm -f man/cifsiostat.1 man/nfsiostat-sysstat.1
526526
rm -f *.log config.status
527527
rm -rf autom4te.cache
528528
rm -f *.save *.old .*.swp data

‎configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5432,7 +5432,7 @@ ac_config_files="$ac_config_files man/iostat.1:man/iostat.in"
54325432
# File must be renamed
54335433
ac_config_files="$ac_config_files man/cifsiostat.1:man/cifsiostat.in"
54345434
# File must be renamed
5435-
ac_config_files="$ac_config_files man/nfsiostat.1:man/nfsiostat.in"
5435+
ac_config_files="$ac_config_files man/nfsiostat-sysstat.1:man/nfsiostat-sysstat.in"
54365436
# File must be renamed
54375437
ac_config_files="$ac_config_files contrib/isag/isag"
54385438
# Permissions must be changed
@@ -6165,7 +6165,7 @@ do
61656165
"man/sysstat.5") CONFIG_FILES="$CONFIG_FILES man/sysstat.5:man/sysstat.in" ;;
61666166
"man/iostat.1") CONFIG_FILES="$CONFIG_FILES man/iostat.1:man/iostat.in" ;;
61676167
"man/cifsiostat.1") CONFIG_FILES="$CONFIG_FILES man/cifsiostat.1:man/cifsiostat.in" ;;
6168-
"man/nfsiostat.1") CONFIG_FILES="$CONFIG_FILES man/nfsiostat.1:man/nfsiostat.in" ;;
6168+
"man/nfsiostat-sysstat.1") CONFIG_FILES="$CONFIG_FILES man/nfsiostat-sysstat.1:man/nfsiostat-sysstat.in" ;;
61696169
"contrib/isag/isag") CONFIG_FILES="$CONFIG_FILES contrib/isag/isag" ;;
61706170
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
61716171

‎configure.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ AC_CONFIG_FILES([man/sar.1:man/sar.in]) # File must be renamed
608608
AC_CONFIG_FILES([man/sysstat.5:man/sysstat.in]) # File must be renamed
609609
AC_CONFIG_FILES([man/iostat.1:man/iostat.in]) # File must be renamed
610610
AC_CONFIG_FILES([man/cifsiostat.1:man/cifsiostat.in]) # File must be renamed
611-
AC_CONFIG_FILES([man/nfsiostat.1:man/nfsiostat.in]) # File must be renamed
611+
AC_CONFIG_FILES([man/nfsiostat-sysstat.1:man/nfsiostat-sysstat.in]) # File must be renamed
612612
AC_CONFIG_FILES([contrib/isag/isag], [chmod +x contrib/isag/isag]) # Permissions must be changed
613613

614614
AC_OUTPUT(Makefile)

‎man/nfsiostat.in renamed to ‎man/nfsiostat-sysstat.in

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
.TH NFSIOSTAT 1 "JULY 2012" Linux "Linux User's Manual" -*- nroff -*-
1+
.TH NFSIOSTAT-SYSSTAT 1 "JANUARY 2014" Linux "Linux User's Manual" -*- nroff -*-
22
.SH NAME
3-
nfsiostat \- Report input/output statistics for network filesystems (NFS).
3+
nfsiostat-sysstat (the nfsiostat command from the sysstat package) \- Report input/output statistics for network filesystems (NFS).
44
.SH SYNOPSIS
55
.ie 'yes'@WITH_DEBUG@' \{
6-
.B nfsiostat [ -h ] [ -k | -m ] [ -t ] [ -V ] [ --debuginfo ] [
6+
.B nfsiostat-sysstat [ -h ] [ -k | -m ] [ -t ] [ -V ] [ --debuginfo ] [
77
.I interval
88
.B [
99
.I count
1010
.B ] ]
1111
.\}
1212
.el \{
13-
.B nfsiostat [ -h ] [ -k | -m ] [ -t ] [ -V ] [
13+
.B nfsiostat-sysstat [ -h ] [ -k | -m ] [ -t ] [ -V ] [
1414
.I interval
1515
.B [
1616
.I count
1717
.B ] ]
1818
.\}
1919
.SH DESCRIPTION
2020
The
21-
.B nfsiostat
21+
.B nfsiostat-sysstat
2222
command displays statistics about read and write operations
2323
on NFS filesystems.
2424

@@ -45,7 +45,7 @@ seconds apart. If the
4545
parameter is specified without the
4646
.I count
4747
parameter, the
48-
.B nfsiostat
48+
.B nfsiostat-sysstat
4949
command generates reports continuously.
5050

5151
.SH REPORT
@@ -134,15 +134,15 @@ Print version number then exit.
134134

135135
.SH ENVIRONMENT
136136
The
137-
.B nfsiostat
137+
.B nfsiostat-sysstat
138138
command takes into account the following environment variables:
139139

140140
.IP S_TIME_FORMAT
141141
If this variable exists and its value is
142142
.BR ISO
143143
then the current locale will be ignored when printing the date in the report
144144
header. The
145-
.B nfsiostat
145+
.B nfsiostat-sysstat
146146
command will use the ISO 8601 format (YYYY-MM-DD) instead.
147147
The timestamp displayed with option -t will also be compliant with ISO 8601
148148
format.
@@ -154,22 +154,32 @@ of the default 1K blocks.
154154
.SH BUG
155155
.I /proc
156156
filesystem must be mounted for
157-
.B nfsiostat
157+
.B nfsiostat-sysstat
158158
to work.
159159

160160
.SH FILE
161161
.I /proc/self/mountstats
162162
contains statistics for network filesystems.
163-
.SH AUTHORS
163+
164+
.SH WARNING
165+
The nfsiostat
166+
command from the sysstat package (nfsiostat-sysstat) is now obsolete and is no longer maintained.
167+
It will be removed in a future sysstat version.
168+
Please use now the
169+
.B nfsiostat
170+
command from the
171+
.I nfs-utils
172+
package.
173+
174+
.SH AUTHOR
164175
Written by Ivana Varekova (varekova <at> redhat.com)
165176

166-
Maintained by Sebastien Godard (sysstat <at> orange.fr)
167177
.SH SEE ALSO
178+
.BR nfsiostat (8),
168179
.BR sar (1),
169180
.BR pidstat (1),
170181
.BR mpstat (1),
171182
.BR vmstat (8),
172183
.BR iostat (1),
173184
.BR cifsiostat (1)
174185

175-
.I http://pagesperso-orange.fr/sebastien.godard/

‎nfsiostat.c renamed to ‎nfsiostat-sysstat.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* nfsiostat: Report NFS I/O statistics
2+
* nfsiostat-sysstat: Report NFS I/O statistics
33
* Copyright (C) 2010 Red Hat, Inc. All Rights Reserved
44
* Written by Ivana Varekova <[email protected]>
55
*
@@ -28,7 +28,7 @@
2828
#include <sys/utsname.h>
2929

3030
#include "version.h"
31-
#include "nfsiostat.h"
31+
#include "nfsiostat-sysstat.h"
3232
#include "count.h"
3333
#include "common.h"
3434

@@ -622,7 +622,7 @@ void rw_io_stat_loop(long int count, struct tm *rectime)
622622

623623
/*
624624
***************************************************************************
625-
* Main entry to the nfsiostat program.
625+
* Main entry to the nfsiostat-sysstat program.
626626
***************************************************************************
627627
*/
628628
int main(int argc, char **argv)

‎nfsiostat.h renamed to ‎nfsiostat-sysstat.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
2-
* nfsiostat: Report NFS I/O statistics
2+
* nfsiostat-sysstat: Report NFS I/O statistics
33
* Copyright (C) 2010 Red Hat, Inc. All Rights Reserved
44
* Written by Ivana Varekova <[email protected]>
55
*/
66

7-
#ifndef _NFSIOSTAT_H
8-
#define _NFSIOSTAT_H
7+
#ifndef _NFSIOSTAT_SYSSTAT_H
8+
#define _NFSIOSTAT_SYSSTAT_H
99

1010
#include "common.h"
1111

@@ -54,4 +54,4 @@ struct io_hdr_stats {
5454

5555
#define IO_HDR_STATS_SIZE (sizeof(struct io_hdr_stats))
5656

57-
#endif /* _NFSIOSTAT_H */
57+
#endif /* _NFSIOSTAT_SYSSTAT_H */

0 commit comments

Comments
 (0)