Skip to content

Commit

Permalink
htop: Autospec creation for update from version 3.0.2 to version 3.0.3
Browse files Browse the repository at this point in the history
Adam Saponara (2):
      Highlight new and old processes (#74)
      Address items from review

Bart Joy (1):
      Add screen shot of htop to readme

Benny Baumann (100):
      Barely ever seen any 1000 digit PIDs …
      Properly close pipe handles when work is done
      Avoid hardcoding of buffer size
      Enhance highlighting of semi-large and large numbers
      Fix minor regression in number highlighting
      Update battery API to use NAN on error
      Update IO rate display to use NAN on error
      Properly query sysconf settting and use NAN if unavailable
      Use threshold for display of guest/steal/irq meters
      Update CPU freq display to use NAN on error
      Update delay accounting to use NAN on error
      Add -Wfloat-equal to default build flags
      Use return value of CLAMP function
      Reimplement xAsnprintf and xSnprintf as type-safe functions
      Cleanse xStrdup mess
      Fix FreeBSD compile issue
      Sort headers/includes
      Enable NULL pointer checks via compiler if supported
      Use memmove for Vector_take
      Replace copy loop by memmove in Vector_insert
      Handle parsing envID & VPid from process status file
      Some more locations for ARRAYSIZE
      Add conf*/ and callgrind.out.* to list of ignored files
      Centralise fault handling
      Keep building on errors
      Move xAsprintf, xSnprintf and xStrdup to StringUtils.h
      Rename StringUtils.[ch] to XUtils.[ch]
      Combine XAlloc.[ch] into XUtils.[ch]
      Release old memory on error
      Fix misaligned access inside taskstats structure
      Fix various file descriptor leaks
      Ensure full initialization of all fields
      Provide basic configuration for IWYU
      Make all required includes explicit
      Refactor code for reading process environment from procfs
      Refactor LinuxProcessList_readSmapsFile to work line-oriented
      Documentation on the repository style guide
      Remove unnecessary trailing semicolon on macros
      Remove accidental syntax collision
      Convert addattrstr to static inline function
      Spacing after keywords (#define)
      Spacing after keywords (while)
      Spacing after keywords (if)
      Spacing after keywords (for)
      Fix indentation to 3 spaces
      Make scope of match macro symmetric
      Whitespace and indentation issues
      Spacing around operators
      Embracing branches
      Wrap inline structure definitions
      Avoid RichString_beginAllocated being ammendable
      Shorten initializer
      Integrate NAN check into assignment
      Remove unnecessary braces
      Add compat wrapper for readlinkat
      Split platform dependent parts for file locks screen
      Split data array for file lock information into separate fields
      Avoid calling Object_isA from inside Vector_isConsistent
      Remove unnecessary parens
      Fix build for custom make targets
      Fix NULL pointer dereference on kstat_lookup failure
      Reduce scope of totaltime
      No need to check for change when no action is required
      Simplify code flow by inlining declarations where they are used
      Reduce scope of local variables
      Reduce scope of cached values
      Compatibility function for faccessat
      Add heuristic for space-separated cmdline
      Reduce visual noise to when comm and cmdline actually disagree on the program basename
      Minor indentation fix
      Make kernel thread display for COMM/EXE columns less visible and more consistent
      Refactor command string creation
      Group the "Merge Command" related options visually
      Include comm before cmdline if exe could not be read, but comm mismatches basename from cmdline
      Only calculate M_LRS size every 5 seconds
      Hardcode actual conversions to read the maps file data
      Roll our own strtoull implementation specialized to handle the parsing requirements
      Distinguish display of no permissions for reading M_LRS
      Randomly refresh M_LRS calculation, but latest after 2s
      Make casing of N/A consistent (majority was N/A)
      Use 'N/A' instead of 'no perm' for more consistency
      Include documentation for COMM and EXE
      Typo fix in docs
      Implement Hashtable_clear to empty an existing Hashtable
      Use common values for initial size estimates for Hashtables
      Code style cleanup and documentation/comments
      Reorder field initialization to group fields by task
      Avoid useless search for pid 0
      Avoid expensive build of tree when not using it
      Some minor spelling issues
      Minor code streamlining
      Common order for ESC/q/F10
      Reduce code duplication
      Use common handling for scrolling
      Some visual code cleanup
      Handle 'q' as quit if first character
      Allow to pass '/' for item search
      Document implicit incremental search
      Some minor additions to the changelog
      Initialize buffer for retrieved path

Christian Goettsche (4):
      FreeBSD: rework tty process column
      FreeBSD: implement Platform_getDiskIO()
      IWYU update (FreeBSD)
      FreeBSD: fix crash on empty environment

Christian Göttsche (217):
      Avoid potential buffer overflow in LinuxProcessList_readStatFile
      Check for fdopen failure in OpenFilesScreen_getProcessData
      Use PROCDIR throughout instead of /proc on Linux
      autotools: enable warnings and cleanup
      Reorder check to avoid crash on invalid process field setting
      Add Linux process column for context switches
      Avoid unsigned integer overflow
      Allow third party sigsegv handler
      Avoid modifying optarg
      Call character checking function with unsigned char
      Free movingBar memory on exit
      Fix memory leak in actionSetAffinity()
      Add script to run htop under valgrind
      Drop unused variable
      Convert short version option to capital V
      Sort option in help message
      Add some default compiler warnings
      Refactor __attribute__ usage
      Use strict function prototypes
      Avoid checking of undefined macros
      Mark noreturn functions
      Resolve unused variable on FreeBSD
      Fail travis CI on compiler warnings
      Add format attribute
      Fix memory leak on cgroup read failure
      Use checked allocation wrappers
      Avoid arithmetic on booleans
      Drop dead code after break
      Drop dead process fields
      Avoid unsigned integer overflow
      Make --enable-hwloc and --enable-linux-affinity mutual exclusive
      Add DeepCode inline suppression
      Add DeepCode inline suppression
      Read CPU frequency from sysfs by default
      Drop unused macros
      Include prototype in Battery implementation
      Drop unnecessary usage of comma operator
      Avoid bad function cast warning
      Avoid warning about unreachable break statement
      Do not drop qualifier in cast
      Add -Wmissing-prototypes compiler warning
      Drop redundant casts to the same type
      Covert Meter attributes to file-local constant arrays
      Drop redundant return statements
      Drop redundant declarations
      InfoScreen: update content on resize
      Adjust colors
      Add security attribute process column
      Add DiskIOMeter for IO read/write usage
      Add --enable-debug configure option to enable asserts
      Resolve DEBUG compilation issues
      Add clang analyzer CI job
      Introduce ARRAYSIZE
      Assert that low value is lower than the high value in CLAMP
      Merge identical declarations
      Mark argument in Object_isA const
      Mention platform for platform specific configure options
      DateMeter followup
      Handle Panel_getSelected() returning NULL
      Enable -Wcast-qual compiler warning
      Enclose CLAMP macro arguments in parentheses
      Drop redundant cast to same type
      Simplify statm parsing and document unused fields
      Mark Object classes and Object class fields const
      Mark Object instances const
      Mark process argument of Process_isThread const
      Makefile sort correction
      Mark Object pointer to _display function const
      OpenFilesScreen update
      Compress size of default FunctionBar
      Add key to pause process list updates
      Read CPU count every cycle to avoid issues when HT/SMT mode changes
      Meter: use explicit type for drawData
      CPUMeter: avoid crashes and leaks in case the CPU count changes
      Settings: do not save initial cpu count
      Mark remaining classes const
      Enclose macro argument in parentheses
      Misc CRT cleanup
      Do not hard-code line numbers in help screen building code
      Mark search parameter in Vector_indexOf const
      Keep building on errors
      Mark Vector parameter const for non-modifying functions
      Automatically detect if backtrace(3) needs -lexecinfo
      Misc conversion fixes
      Add SELinuxMeter
      Do not use extra starttime process field on Linux
      Refactor generating starttime string into Process class
      Misc Vector updates
      Generalize Meter value colors for IO
      Add NetworkIOMeter
      Allow low and high value of CLAMP to be equal
      Cache PAGE_SIZE
      Continue to update generic data in paused mode
      Assert allocating non-zero size memory
      XUtils string related updates
      Drop tabs in source indentions
      update Github CI
      IWYU update
      Increase print buffer in NetworkIOMeter_display
      Drop unnecessary cast
      Fix wrong strncmp replacement
      Drop unused Platform functions Platform_setTasksValues
      Mark user field of Process const
      Improve handling of no data in Disk and Network IO Meters
      Hold only a const version of the ProcessList in Meters
      Mark process parameter of Process_writeField consistently const
      Hold only a const version of Settings in Process
      Hold only a const version of Settings in ProcessList
      Drop duplicate and always true condition
      Drop unneeded variablw initialization and reduce scope
      Avoid some unnecessary casts and mark some not changing variables const
      Drop always true condition
      Drop duplicate assignment
      Unify function argument names
      Enclose macro arguments in parentheses
      Implement RichString_setLen as function
      Implement IncSet_filter as function
      Implement LinuxProcess_effectiveIOPriority as function
      Implement Process_isUserlandThread as function
      Implement Process_getParentPid and Process_isChildOf as functions
      Simplify RichString_begin
      Small ListItem update
      Add HTOP_$platform defines to config.h header
      FreeBSD: Platform update
      FreeBSD: update ProcessList
      FreeBSD: update Process
      Add compat wrapper for fstatat
      Use integer type for item count instead of char
      Add SystemdMeter
      Enclose macro arguments in parentheses
      Handle data wraparounds in IO Meters
      Assert Vector_get returns an object
      Fixup of SystemdMeter merge
      Introduce spaceship comparison for Processes
      Use uid_t type for Process_getuid
      Mark ProcessList_keyAt argument const
      Mark local functions static
      Drop hideThreads Setting
      Early skip non-directories when searching for process information
      Use spaceship comparison for TTYs
      Show CPU temperature in CPU meter
      Add process column for normalized CPU usage
      Hashtable update
      Hashtable: use dynamic growth and use primes as size
      Silence theoretical memory leak
      Use 0 as no-match value for sortkey
      DarwinProcess: mark local function static and sort includes
      DarwinProcessList: mark local functions static and sort includes
      Align command line argument descriptions in help output
      Spelling corrections
      IWYU update (Linux)
      fix indent
      LinuxProcess: mark LinuxProcess_printDelay static
      Rename virtual memory column from M_SIZE to M_VIRT
      Simplify page size related calculations
      Object: assert callbacks exists
      LinuxProcessList: skip parsing threads if the kind of thread is disabled
      Linux: fix display of new thread for one cycle when hidden
      DarwinProcessList: retry getting list of all processes on ENOMEM
      LinuxProcessList: fix misspelling
      LinuxProcess_adjustTime: simplify by not using double
      Fix file descriptor leak in LinuxProcessList_readCmdlineFile after xread failure
      ProcessLocksScreen_draw: use Process_getCommand instead of raw comm
      Improve Fahrenheit temperature configuration text
      Unify naming of first argument of Platform_getBattery
      LinuxProcessList: fix misspelling
      Fully support non-ascii characters in Meter-Bar
      Add support to change numeric options in settings screen
      Drop cgroup conditional
      Drop taskstats conditional
      Track file descriptors in valgrind script
      LinuxProcessList_recurseProcTree: compute time only once and mark parent const
      Fix crash when getCommandStr not overloaded for a platform process
      configure: create typedefs for fixed-sized integers if needed
      IOPriorityPanel: drop unnecessary buffer size decrement
      LinuxProcessList: use openat instead of building path strings
      Add compat mode for systems without openat(2)
      configure: do not check functions we are using unconditionally
      Update even more snprintfs
      Hide process selection on ESC
      Typo
      Linux: fix process parsing for hidden pid directories
      Print G in gigabyte color
      Use enum element name instead of magic number
      Compare indices not index with pair
      Drop redundant return statements
      Merge identical conditional branches
      Add cast to unsigned char to avoid signed char misuse
      Use String_eq for readability and consistency
      Meter: document MeterClass string fields
      PressureStallMeter: improve display strings
      Add xReadfile wrapper for reading small to medium size files
      Dynamically load libsensors at runtime
      Set locale only once and do not override it later
      Add Linux cwd process column
      Silence possible NULL dereference
      Linux: avoid float division by 0 after system sleep
      ci: use correct configure flags for sensors
      ci: use clang-11
      Fix sensors configure argument
      Convert personal copyright authorship to team
      Resolve conversion from ssize_t to int for readlink return value
      Resolve conversion from int to short
      Resolve conversion from int to unsigned and back
      Resolve conversion from int to char
      Hide degree character without wide ncurses support
      RichString: avoid signed integer misuse
      Meter: fix bar coloring without wide ncurses support
      LinuxProcessList: add underscore suffix for raw struct name
      DragonFlyBSDProcessList: fix missing type
      IWYU update
      Remove unused function Header_readMeterName
      Use size_t as len type for xSnprintf
      Use size_t as len type for Meter_UpdateValues
      Use size_t as type for buffer length in Process
      Introduce METER_BUFFER_CHECK and METER_BUFFER_APPEND_CHR to cleanup writing to bar buffers
      OpenBSD update

Christian Hesse (1):
      align cpu id to right

Daniel Lange (16):
      Update README with correct tarball locations, ncurses hints and support / bug reporting pointers.
      Update creation date to 2004 (thanks rubyFeedback)
      Update copyright statement
      Update License consistently to GPLv2 as per COPYING file
      Add Copyright statement to --help (needed as it has the license info)
      Set a -dev version to bug reports show a useful version and not the last release
      Remove duplicate test for NUL
      Apply patch from BenBE as per htop-dev/htop#241 (comment)
      Fix whitespace before comma in the new color definitions
      hwloc = (portable) HardWare LOCality, not related to lock
      Add debug state to the configure report (thanks @BenBE for the idea)
      Move treeView setting to make status bar item correct when using --sort-key, patch from @cgzones
      Fix reading of device nodes > 2 chars from memory maps
      Replace more snprintfs, reduce buffer sizes to what is printed
      Update AUTHORS file with htop-dev team
      Update htop logo, provide .svg file as well

Erdem Ersoy (1):
      Fix segmentation fault when column name is NULL.

Fynn Wulf (3):
      Fix Hashtable_put to allow storing the same pointer
      Implement screen for active file locks
      Calculate library size (M_LRS column) from maps file

Jan Palus (1):
      Parse POWER_SUPPLY_CAPACITY

Maxim Zhiburt (2):
      Implement sorting in tree mode
      Fix issue with inconsistent displayTreeSet

Michael F. Schönitzer (5):
      Change option '-m' to '-M' for consistency of cli
      Document field M_SWAP in man page
      Document M_PSS and M_PSSWP in man page
      Consistent wording/formatting of field descriptions
      Add a date and datetime meter (#159)

Michael Witten (1):
      Process.{h,c}: Use integer types that are more portable

Murloc Knight (1):
      Zram Meter feature

Narendran Gopalakrishnan (4):
      Improving Command display/sort
      Cleanup some documentation
      Include merge status with column title when enabled
      Assume full basename matches COMM when matching full COMM buffer

Nathan Scott (13):
      Merge individual Battery.[ch] files into Platform.[ch]
      Merge individual Battery.[ch] files into Platform.[ch]
      Add missing OpenBSD battery function declaration
      Minor cleanups to platform-specific init and done
      Add whitespace to improve Linux Platform_init readability
      Consistent ordering of function declarations for FreeBSD
      Drop unneeded parameters to the ScreenManager constructor
      Drop unused global ProcessList memory fields
      Tweak style guide wording around single code statements
      Update docs/styleguide.md
      Fix a little typo (spelling) in the styleguide
      Update changelog for upcoming 3.0.3 release, annotate rc1
      Bump version number for 3.0.3 release

Ross Williams (2):
      Add process environment for FreeBSD
      Simplify environment-reading code

Stephen Gregoratto (1):
      configure.ac: axe python check

Zev Weiss (1):
      Number CPUs from zero by default.

ckath (1):
      minor typo in Vector.c

laydervus (1):
      Option to set initial filter

multi (4):
      Linux: consider the ZFS ARC to be cache.
      CPUMeter: refactor common CPU meter rendering code.
      Add missing 4-column CPU meters to non-Linux platforms.
      CPUMeter: add octuple-column CPU meters.

ryenus (4):
      show selected command wrapped in a separate window
      command screen: fill current line when scanning
      limit max screen title length to window width
      use 'w' for command wrapping as 'M' is already used

senjan (2):
      htop crashes on Solaris 11.4 due to missing ZFS ARC kstats
      htop shows no used memory in Solaris zone

srajmane (1):
      s390x support for travis
  • Loading branch information
phmccarty authored and clrpackages committed Dec 9, 2020
1 parent 58cf5ee commit bd1c8a5
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PKG_NAME := htop
URL = https://github.com/htop-dev/htop/archive/3.0.2/htop-3.0.2.tar.gz
URL = https://github.com/htop-dev/htop/archive/3.0.3/htop-3.0.3.tar.gz
ARCHIVES =

include ../common/Makefile.common
2 changes: 1 addition & 1 deletion buildreq_cache
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
3.0.2
3.0.3
ncurses-dev
6 changes: 5 additions & 1 deletion configure_misses
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Configure miss: whether sys/types.h defines makedev
Configure miss: library containing devstat_checkversion
Configure miss: addnwstr in -lncursesw6
Configure miss: ncursesw/curses.h usability
Configure miss: ncursesw/curses.h presence
Expand All @@ -8,4 +9,7 @@ Configure miss: ncurses/ncurses.h presence
Configure miss: ncurses/ncurses.h
Configure miss: ncurses/curses.h usability
Configure miss: ncurses/curses.h presence
Configure miss: ncurses/curses.h
Configure miss: ncurses/curses.h
Configure miss: sensors/sensors.h usability
Configure miss: sensors/sensors.h presence
Configure miss: sensors/sensors.h
19 changes: 10 additions & 9 deletions htop.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# Generated by: autospec.py
#
Name : htop
Version : 3.0.2
Release : 29
URL : https://github.com/htop-dev/htop/archive/3.0.2/htop-3.0.2.tar.gz
Source0 : https://github.com/htop-dev/htop/archive/3.0.2/htop-3.0.2.tar.gz
Version : 3.0.3
Release : 30
URL : https://github.com/htop-dev/htop/archive/3.0.3/htop-3.0.3.tar.gz
Source0 : https://github.com/htop-dev/htop/archive/3.0.3/htop-3.0.3.tar.gz
Summary : Interactive process viewer
Group : Development/Tools
License : GPL-2.0
Expand Down Expand Up @@ -56,16 +56,16 @@ man components for the htop package.


%prep
%setup -q -n htop-3.0.2
cd %{_builddir}/htop-3.0.2
%setup -q -n htop-3.0.3
cd %{_builddir}/htop-3.0.3
%patch1 -p1

%build
export http_proxy=http://127.0.0.1:9/
export https_proxy=http://127.0.0.1:9/
export no_proxy=localhost,127.0.0.1,0.0.0.0
export LANG=C.UTF-8
export SOURCE_DATE_EPOCH=1600143755
export SOURCE_DATE_EPOCH=1607363110
export GCC_IGNORE_WERROR=1
export AR=gcc-ar
export RANLIB=gcc-ranlib
Expand All @@ -88,10 +88,10 @@ export no_proxy=localhost,127.0.0.1,0.0.0.0
make %{?_smp_mflags} check

%install
export SOURCE_DATE_EPOCH=1600143755
export SOURCE_DATE_EPOCH=1607363110
rm -rf %{buildroot}
mkdir -p %{buildroot}/usr/share/package-licenses/htop
cp %{_builddir}/htop-3.0.2/COPYING %{buildroot}/usr/share/package-licenses/htop/044462b5c756fee77f267e633f57ce4acfa778e4
cp %{_builddir}/htop-3.0.3/COPYING %{buildroot}/usr/share/package-licenses/htop/044462b5c756fee77f267e633f57ce4acfa778e4
%make_install
## install_append content
ln -s htop %{buildroot}/usr/bin/top
Expand All @@ -108,6 +108,7 @@ ln -s htop %{buildroot}/usr/bin/top
%files data
%defattr(-,root,root,-)
/usr/share/applications/htop.desktop
/usr/share/icons/hicolor/scalable/apps/htop.svg
/usr/share/pixmaps/htop.png

%files license
Expand Down
2 changes: 1 addition & 1 deletion options.conf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = htop
url = https://github.com/htop-dev/htop/archive/3.0.2/htop-3.0.2.tar.gz
url = https://github.com/htop-dev/htop/archive/3.0.3/htop-3.0.3.tar.gz
archives =
giturl = https://github.com/htop-dev/htop.git
domain =
Expand Down
2 changes: 1 addition & 1 deletion release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
29
30
2 changes: 1 addition & 1 deletion upstream
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0605fc7e409a30f386421747cfee5e61a1b5e955/htop-3.0.2.tar.gz
79dfa7ac63cfeb650c0fbb1f3833ed12c9c52d44/htop-3.0.3.tar.gz
1 change: 1 addition & 0 deletions used_libs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
libc.so.6
libdl.so.2
libm.so.6
libncursesw.so.6
libnl-3.so.200
Expand Down
2 changes: 1 addition & 1 deletion versions
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.2
3.0.3

0 comments on commit bd1c8a5

Please sign in to comment.