Commit Graph

573 Commits

Author SHA1 Message Date
Tobias Tschinkowitz c1f79d741a corrected calculation for swap on openbsd
The swapctl(2) function fills the swapent struct with 512KB blocks.
As we want to display in GB, i just modified the calculation for this to
get the expected output.
2018-05-16 19:17:49 +02:00
Tobias Tschinkowitz 82eb6e3832 consistent calculation of ram_* on openbsd 2018-05-16 12:24:43 +02:00
Aaron Marcher ca02afb1d9 Add he4d to LICENSE 2018-05-16 08:13:09 +02:00
Tobias Tschinkowitz 0f9a1a8367 updated ram_total and ram_free (obsd) 2018-05-16 08:08:48 +02:00
Aaron Marcher 6464cea333 Cast CPU percentage to int and fix indenation 2018-05-14 20:54:48 +02:00
Josuah Demangeon 7e29da026b fflush(stdout) to print line by line if stdout is not a tty
To reproduce the issue:
	$ slstatus -s | tee

then it would print only when the stdout buffer is full, by block
of multiple lines.

fflush() makes sure the line is printed at every loop iteration
2018-05-08 15:18:32 +02:00
Aaron Marcher 0f7a34fa31 Add josuah to LICENSE 2018-05-08 15:06:55 +02:00
Josuah Demangeon ea2e2bd004 include <sys/time.h> before <sys/sensors.h> for time struct timeval
sys/sensors.h has two structs struct timeval: sensor and ksensor:

	struct sensor {
		...
		struct timeval tv;		/* sensor value last change time */
		...
	};
2018-05-08 15:05:29 +02:00
Aaron Marcher 666f285201 Only variable declarations at top of block 2018-05-07 15:57:32 +02:00
Aaron Marcher 6123f482e3 Fix indents (spaces for alignment) 2018-05-07 13:48:43 +02:00
Aaron Marcher 6c6c144be6 wifi_perc: Simplify 2018-05-07 12:25:34 +02:00
Aaron Marcher 0a287616b2 num_files: Variable declarations at top of block 2018-05-07 12:17:13 +02:00
Aaron Marcher dcffaeaf57 Fix disk_perc by casting it to int 2018-05-07 12:14:46 +02:00
Aaron Marcher 4fc4983502 disk_perc: Simplify 2018-05-07 11:44:15 +02:00
Aaron Marcher b3330d849d cpu: Simplify functions 2018-05-07 11:39:59 +02:00
Aaron Marcher 16a97fbca1 Unify header includes
- Sort Alphabetically
- Same indentation for preprocessor clauses
2018-05-07 11:21:59 +02:00
Aaron Marcher fbbe300f4d entropy: Small fix 2018-05-06 23:09:36 +02:00
Aaron Marcher fd14804d6f entropy: Port to OpenBSD
OpenBSD's entropy design is superior to Linux.
2018-05-06 22:54:32 +02:00
Aaron Marcher 62563a5a0d datetime: Add <stdio.h> for fprintf 2018-05-06 22:41:56 +02:00
Aaron Marcher 932f65c373 datetime: Add error message 2018-05-06 22:38:29 +02:00
Aaron Marcher ee5ec75621 Fix coding style
- Use block for single statement ifs
- Keep lines to reasonable length (current debate as to reasonable)
- When functions return -1 for error test against 0 not -1
- Do not indent cases another level
- Do not test against NULL and 0 explicitly
- Use tabs for indentation, use spaces for alignment
2018-05-06 22:28:56 +02:00
Aaron Marcher 66a7fb16fc Remove cpu_iowait
The third value from load_avg (idle) gives us almost the same
information as cpu_iowait. Plus OpenBSD does not offer an iowait value
as Linux and thus the corresponding function would not be portable.
2018-05-06 21:11:50 +02:00
Aaron Marcher 235fa3c306 cpu_perc: Documentation and readbility improvements 2018-05-06 21:10:02 +02:00
Aaron Marcher 2b82bf0248 cpu_perc: Port to OpenBSD
In OpenBSD the CPU usage in percent is now computed using KERN_CPTIME
sysctl.
2018-05-06 17:48:37 +02:00
Aaron Marcher efb41724b5 swap_*: Port to OpenBSD 2018-05-06 01:20:46 +02:00
Aaron Marcher 417f473fe2 battery: Remove full indicator
It does not respect charging thresholds and it is not trivial to
implement the indicator in OpenBSD.
2018-05-04 18:04:53 +02:00
Aaron Marcher 699f6734d9 wifi_perc: Fix file descriptor leak 2018-05-02 19:41:53 +02:00
Aaron Marcher af3cdfbbc8 Add examples to config.def.h 2018-05-02 12:30:16 +02:00
Aaron Marcher 54ebd0dabe uptime: Add missing brace 2018-05-02 12:08:54 +02:00
parazyd 34010907a6 volume: Cast SOUND_MIXER_READ_DEVMASK to int to avoid warning. 2018-05-02 11:49:15 +02:00
Aaron Marcher f7a6d6c8f7 wifi: Various cleanups 2018-05-02 08:49:06 +02:00
Aaron Marcher 709549b4bd user: Only declare variables in the beginning 2018-05-02 08:42:55 +02:00
Aaron Marcher e43c3a16f0 uptime: Simplifiy and clean up 2018-05-02 08:41:06 +02:00
Aaron Marcher f007007156 run_command: Clean up 2018-05-02 08:29:36 +02:00
Aaron Marcher 7c11f890a5 keyboard_indicators: Clean up opening display 2018-05-02 08:26:23 +02:00
Aaron Marcher b2b6eb638e ip: Sort headers alphabetically 2018-05-02 08:21:32 +02:00
Aaron Marcher 2bd581a47b battery_state: Unify unknown state with "?" symbol 2018-05-02 08:16:21 +02:00
Aaron Marcher f5f3808f36 Update README todo 2018-05-01 21:05:50 +02:00
Aaron Marcher 4f5ac5d9fe Remove battery_power for various reasons
- Battery power cannot be easily gatherable via apm(4)
- IMHO it does not represent essential information
2018-05-01 21:01:25 +02:00
Laslo Hunhold 24b663d657 Tweak build system a little bit
Be consistent with brackets and add a comment for OpenBSD to make it
clearer what the actual intent of the uncommented line is.

In the Makefile, add a dependency of slstatus.o from config.mk.
2018-05-01 20:53:27 +02:00
Aaron Marcher 41deabf2ec battery_perc: Port to OpenBSD 2018-05-01 20:45:29 +02:00
Laslo Hunhold 19343ff343 components/swap.c | move duplicated code to separate function 2018-05-01 20:24:13 +02:00
Laslo Hunhold 9750a3d731 Use indentation to increase readability
Granted, this style is definitely not common, but for the short
utility-functions of this program it's just the right choice. This
provides great flexibility, such that in the long run, it will be
possible to also share code between the OS-implementations.

This also keeps the state-keeping at a minimum and makes it clearer
which functions are implemented on which OS without having to jiggle
around with too many files in the process.
2018-05-01 19:43:49 +02:00
Laslo Hunhold 42edfea89a Revert component-split
this reverts the commits from 92ab9ef52e up to
d42870d6ca.

After heavy consideration, the component split has more disadvantages
than advantages, especially given there will be utility-functions
sharing quite a lot of code that would then need to be duplicated, as it
does not fit into the util.c due to its speciality.

One big advantage of the component-wise build is readability, and
without doubt, this was achieved here. This point will be addressed
with a different approach that will be visible in the upcoming commits.

One big disadvantage of the component build is the fact that it
introduces state to the build process which is not necessary. Before its
introduction, the only influencing factors where the system-defines
__linux__ and __OpenBSD__. With the components, we are also relying on
the output of uname(1).
Additionally, if the os.mk is not present, make gives the output

     $ make
     Makefile:5: os.mk: No such file or directory
     make: *** No rule to make target 'os.mk'.  Stop.

This could easily be fixed by providing some sort of meta-rule for this
file, however, it indicates the problem we have here, and this entire
statefulness will heavily complicate packaging of this tool and makes
the build process much more complex than it actually has to be.
2018-05-01 19:43:34 +02:00
Quentin Rameau d42870d6ca Makefile: add distclean target 2018-04-30 16:27:07 +02:00
Quentin Rameau 2ea3d46f13 Makefile: move OS-specific libs to configure script 2018-04-30 16:27:07 +02:00
Quentin Rameau 95665e437b Makefile: separate default flags from user flags 2018-04-30 16:27:07 +02:00
Aaron Marcher 085431b282 Update LICENSE for Quentin Rameau 2018-04-30 15:44:41 +02:00
Quentin Rameau 97ff66522c wifi: OS split 2018-04-30 15:42:16 +02:00
Quentin Rameau 19f3c8f545 uptime: OS split 2018-04-30 15:42:08 +02:00