1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-14 23:46:10 +00:00
freebsd-ports/sysutils/xperfmon/files/patch-ab
Joerg Wunsch aadef3786f Update of xperfmon++ from Lars. The previous port didn't work with
2.2 (says Lars).  I have now also moved freebsd_system.c out into a
files subdirectory, it used to be created in its entirety by patch-aa
before which makes maintenance fairly uncomfortable.

I have now verified that it builds and works with FreeBSD 2.1.x
(freefall -- it is really funny to watch it there, the disk transfers
and interrupts remain in the red zone all the time ;-), 3.0-current
(thud), and 2.2.

Submitted by:	Lars_Koeller@odie.physik2.Uni-Rostock.DE
OKed by:	asami
1997-03-15 10:36:08 +00:00

251 lines
8.3 KiB
Plaintext

diff -c -N ../xperfmon++/Imakefile ./Imakefile
*** ../xperfmon++/Imakefile Wed Jul 27 22:29:29 1994
--- ./Imakefile Fri Mar 14 13:29:51 1997
***************
*** 17,31 ****
SYS_MODULE= sgi_system
#endif
! EXTRA_LIBRARIES = $(SUNFLAGS) $(MIPSFLAGS) $(SGIFLAGS)
INSTPGMFLAGS = $(INSTKMEMFLAGS)
! LOCAL_LIBRARIES = $(XAWLIB) $(XTOOLLIB) $(XMULIB) $(XLIB)
INCLUDES = -I. -I$(TOOLKITSRC) -I$(TOP) -I$(TOP)/X11
! # INCLUDES = -I. -I$(TOOLKITSRC) -I$(TOP) -I$(TOP)/X11 -I/usr/include/bsd
! CDEBUGFLAGS = -O
! SRCS = TimeChart.c StripChart.c misc.c $(SYS_MODULE).c xperfmon.c nfs.c
! OBJS = TimeChart.o StripChart.o misc.o $(SYS_MODULE).o xperfmon.o nfs.o
ComplexProgramTarget(xperfmon++)
--- 17,38 ----
SYS_MODULE= sgi_system
#endif
! #if defined (FreeBSDArchitecture)
! FreeBSDFLAGS= -lkvm
! SYS_MODULE= freebsd_system
! CC= gcc
! EXTRA_DEFINES= -DHAVE_SYS_PARAM_H
! #endif
!
! EXTRA_LIBRARIES = $(SUNFLAGS) $(MIPSFLAGS) $(SGIFLAGS) $(FreeBSDFLAGS)
INSTPGMFLAGS = $(INSTKMEMFLAGS)
! LOCAL_LIBRARIES = -lXaw -lXt -lXmu -lX11
INCLUDES = -I. -I$(TOOLKITSRC) -I$(TOP) -I$(TOP)/X11
! # SRCS = TimeChart.c StripChart.c misc.c $(SYS_MODULE).c xperfmon.c nfs.c
! # OBJS = TimeChart.o StripChart.o misc.o $(SYS_MODULE).o xperfmon.o nfs.o
! SRCS = TimeChart.c StripChart.c misc.c $(SYS_MODULE).c xperfmon.c
! OBJS = TimeChart.o StripChart.o misc.o $(SYS_MODULE).o xperfmon.o
ComplexProgramTarget(xperfmon++)
diff -c -N ../xperfmon++/README ./README
*** ../xperfmon++/README Wed Jul 27 22:29:30 1994
--- ./README Fri Mar 14 13:59:13 1997
***************
*** 18,20 ****
--- 18,61 ----
Research Center, rsmith@proteus.arc.nasa.gov. Imake will build for correct
O/S if x11r5 is fully installed in all the right places.
+ 3-15-95 Completely new port of systemdependent file (freebsd_system.c) for FreeBSD-2.X
+ by Lars Köller @University of Rostock, Germany.
+ E-Mail: <lars.koeller@odie.physik2.uni-rostock.de>
+
+ 8-16-95 Quick and dirty workaround of -geometry option bug.
+ But there are still some side effects when changing the geometry.
+ Fix memory leak in freebsd_system.c
+ by Lars Köller @University of Rostock, Germany.
+ E-Mail: <lars.koeller@odie.physik2.uni-rostock.de>
+
+ 30-10-95 Change 'Free Mem' graph to 'Free Swap' cause the FreeBSD memory system
+ tries to minimize the free unused amount of memory.
+ Include basic support for FreeBSD > 2.1.
+ Number of interrupts now independent from 'Update Intervall'
+ by Lars Köller @University of Rostock, Germany.
+ E-Mail: <Lars_Koeller@odie.physik2.uni-rostock.de>
+
+ 11-12-95 Fix -geometry bug! Now there is only a MIN_WIDTH of 185 pixels, and the
+ MIN_HEIGTH is calculates dynamically depending on the number of active
+ graphs. FreeBSD-2.X only:
+ Change 'Free Swap' graph from absolut into percent values.
+ All graphs shoud be independent of the 'Update Intervall'.
+ Modify graph labels and add unit of each graph.
+ by Lars Köller @University of Rostock, Germany.
+ E-Mail: <Lars_Koeller@odie.physik2.uni-rostock.de>
+
+ 5-4-96 Fix some event problems that consumes a lot of cpu power after resizing
+ (mwm) or restart of an window manager. Make xperfmon compile with
+ FreeBSD-current (2.2, changes in get_swapspace)
+ by Lars Köller @University of Rostock, Germany.
+ E-Mail: <Lars_Koeller@odie.physik2.uni-rostock.de>
+
+ 3-14-97 Fix some problems with changed structures in 3.0,
+ clean up the FreeBSD version numbers #if's.
+ Now xperfmon++ should compile from FreeBSD-2.0 up to 3.0-current
+ by Lars Köller @University of Rostock, Germany.
+ E-Mail: <Lars_Koeller@odie.physik2.uni-rostock.de>
+ Jörg Wunsch, FreeBSD core team menber, Germany
+ E-Mail: <joerg_wunsch@uriah.heep.sax.de>
+ <joerg@FreeBSD.ORG>
+
diff -c -N ../xperfmon++/XPerfmon++.ad ./XPerfmon++.ad
*** ../xperfmon++/XPerfmon++.ad Wed Jul 27 22:29:32 1994
--- ./XPerfmon++.ad Tue Dec 5 09:32:54 1995
***************
*** 4,27 ****
! commented out, the "NFS Server" graph background will be the application
! default color, unless some other resource file has specified it.
! *PerfChart.highAlarm: 99998
*perfChartIdle.lowWarn: 10
*perfChartIdle.lowAlarm: 5
! *perfChartUser.highAlarm: 90
! *perfChartUser.highWarn: 75
! *perfChartSystem.highAlarm: 90
! *perfChartSystem.highWarn: 75
! *perfChartFree.lowWarn: 2000
! *perfChartFree.lowAlarm: 1000
! *perfChartDisk.highWarn: 25
! *perfChartDisk.highAlarm: 50
! *perfChartIntrpts.highWarn: 500
! *perfChartIntrpts.highAlarm: 750
! *perfChartInput.highWarn: 300
! *perfChartInput.highAlarm: 500
! *perfChartOutput.highWarn: 300
! *perfChartOutput.highAlarm: 500
*perfChartCollision.highWarn: 20
*perfChartCollision.highAlarm: 50
! *perfChartNFSClient.highWarn: 200
! *perfChartNFSClient.highAlarm: 400
*font: 6x13
--- 4,40 ----
! commented out, the "NFS Server" graph background will be the application
! default color, unless some other resource file has specified it.
! *PerfChart.highAlarm: 99998
+ *perfChartUser.highAlarm: 95
+ *perfChartUser.highWarn: 75
+
+ *perfChartSystem.highAlarm: 40
+ *perfChartSystem.highWarn: 25
+
*perfChartIdle.lowWarn: 10
*perfChartIdle.lowAlarm: 5
!
! *perfChartSwap.lowWarn: 10
! *perfChartSwap.lowAlarm: 3
!
! *perfChartDisk.highWarn: 50
! *perfChartDisk.highAlarm: 100
!
! *perfChartIntrpts.highWarn: 400
! *perfChartIntrpts.highAlarm: 600
!
! *perfChartInput.highWarn: 500
! *perfChartInput.highAlarm: 1000
!
! *perfChartOutput.highWarn: 500
! *perfChartOutput.highAlarm: 1000
!
*perfChartCollision.highWarn: 20
*perfChartCollision.highAlarm: 50
!
! *perfChartNFSClient.highWarn: 100
! *perfChartNFSClient.highAlarm: 200
!
! *perfChartNFSServer.highWarn: 100
! *perfChartNFSServer.highAlarm: 200
*font: 6x13
+
diff -c -N ../xperfmon++/xperfmon++.man ./xperfmon++.man
*** ../xperfmon++/xperfmon++.man Wed Jul 27 22:29:39 1994
--- ./xperfmon++.man Fri Mar 14 14:02:29 1997
***************
*** 94,101 ****
.B \-idlecpu | \+idlecpu
Graph \fIIdle\fP CPU Percentage.
.TP 26
! .B \-freemem | \+freemem
! Graph \fIFree Memory\fP.
.TP 26
.B \-diskxfr | \+diskxfr
Graph \fIDisk Transfers\fP per interval period.
--- 94,101 ----
.B \-idlecpu | \+idlecpu
Graph \fIIdle\fP CPU Percentage.
.TP 26
! .B \-free{mem/swap} | \+free{mem/swap}
! Graph \fIFree Memory/Swap (Operating system dependent, swap for FreeBSD in %)\fP.
.TP 26
.B \-diskxfr | \+diskxfr
Graph \fIDisk Transfers\fP per interval period.
***************
*** 176,183 ****
.B idle
Set \fIlimit\fP value for Idle CPU Percentage.
.TP 12
! .B mem
! Set \fIlimit\fP value for Free Memory.
.TP 12
.B disk
Set \fIlimit\fP value for Disk Transfers.
--- 176,183 ----
.B idle
Set \fIlimit\fP value for Idle CPU Percentage.
.TP 12
! .B mem/swap
! Set \fIlimit\fP value for Free Memory/Swap (OS dependent, swap for FreeBSD).
.TP 12
.B disk
Set \fIlimit\fP value for Disk Transfers.
***************
*** 313,320 ****
.B System
Set System CPU Percentage resource.
.TP 16
! .B Free
! Set Free Memory resource.
.TP 16
.B Disk
Set Disk Transfer count resource.
--- 313,320 ----
.B System
Set System CPU Percentage resource.
.TP 16
! .B Free/Swap
! Set Free Memory/Swap resource.
.TP 16
.B Disk
Set Disk Transfer count resource.
***************
*** 395,398 ****
--- 395,421 ----
glad to incorporate the modifications into this master copy. Send me your changes via E-Mail at the
above address.
.PP
+ .I xperfmon++ V1.2 for FreeBSD
+ was written by Lars Koeller with a lot of helpful notes by Joerg Wunsch.
+ .PP
+ .I xperfmon++ V1.31 for FreeBSD
+ close some memory leaks, fix geometry (resize) bug, display free swap
+ without resizing of graph in percent.
+ .PP
+ .I xperfmon++ V1.33 for FreeBSD
+ contains some fixes due to event problems and compiles fine under
+ FreeBSD 2.2 (changes in get_swapspace).
+ Now the -geometry switch works well!
+ Please E-Mail any bugs or comments with the subject
+ "xperfmon++: ..." to Lars_Koeller@odie.physik2.uni-rostock.de.
+ .PP
+ .I xperfmon++ V1.40 for FreeBSD
+ contains some fixes due to changes in the networking structs and
+ cleans up the FreeBSD version number #if's. Now it should compile fine
+ from FreeBSD 2.0 up to FreeBSD-3.0-current.
+ Please E-Mail any bugs or comments with the subject
+ "xperfmon++: ..." to Lars_Koeller@odie.physik2.uni-rostock.de.
+ .PP
Enjoy!
+
+